UPDATE: magicpoint-1.13a

Simple update magicpoint to 1.13a. Why do I care here? I want to get rid
of print/freetype (1.x). I see there is a history:

https://marc.info/?l=openbsd-ports&m=166566857215866&w=2
----------------------------
revision 1.37
date: 2005/03/01 18:19:52; author: jcs; state: Exp; lines: +8 -12;
revert to magicpoint-1.09a and merge in newer infrastructure
changes, newer 1.11 versions are busted

call it magicpoint-1.11bp1 as a temporary hack

requested by deraadt and henning
----------------------------

Is that still a show stopper? Can anyone test the version?

Cheers Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/magicpoint/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 12 Jan 2023 13:17:19 -0000 1.68
+++ Makefile 29 Aug 2023 18:31:37 -0000
@@ -1,37 +1,45 @@
COMMENT= X11-based presentation tool

-DISTNAME= magicpoint-1.09a
-REVISION= 4
+DISTNAME= magicpoint-1.13a
EPOCH= 0
+
CATEGORIES= misc productivity
+
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/

HOMEPAGE= http://member.wide.ad.jp/wg/mgp/

PERMIT_PACKAGE= Yes

-WANTLIB= ICE SM X11 Xau Xdmcp Xext Xmu Xt Xtst c gif iconv intl m mng
-WANTLIB+= png ttf util
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xt Xtst c gif iconv
+WANTLIB += m mng png util
+
+RUN_DEPENDS+= devel/gettext,-runtime \

# plus sign is for localized (i.e. Japanese) version
-LIB_DEPENDS+= devel/gettext,-runtime \
- print/freetype \
- graphics/png \
+LIB_DEPENDS+= graphics/png \
graphics/libmng \
graphics/giflib
+
RUN_DEPENDS+= graphics/netpbm \
print/ghostscript/gnu-fonts

-AUTOCONF_VERSION=2.13
# XXX while autoconf will append gnu in CONFIGURE_STYLE, we explicitely
# set it anyway because order matters
CONFIGURE_STYLE=autoconf gnu imake no-autoheader
-CONFIGURE_ARGS= --disable-vflib
-CONFIGURE_ARGS+= --enable-gif
-CONFIGURE_ARGS+= --enable-freetype-charset16
+
+AUTOCONF_VERSION=2.13
+
+CONFIGURE_ARGS= --disable-vflib \
+ --enable-gif \
+ --enable-locale \
+ --disable-freetype

NO_TEST= Yes

+pre-patch:
+ perl -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/image/new.c
+
post-configure:
@cd ${WRKSRC}/contrib/xmindpath && \
ac_cv_path_install='install -c' \
@@ -76,5 +84,5 @@ post-install:
${PREFIX}/bin/mgp2latex
${INSTALL_SCRIPT} ${WRKSRC}/contrib/tex2eps.sh \
${PREFIX}/bin/tex2eps
-
+
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/magicpoint/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:14:31 -0000 1.6
+++ distinfo 29 Aug 2023 18:31:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (magicpoint-1.09a.tar.gz) = woQZdNFfyvvJXlIiqnHiv+VIeFqgiRsewzMB27pjfww=
-SIZE (magicpoint-1.09a.tar.gz) = 816234
+SHA256 (magicpoint-1.13a.tar.gz) = IF5nUuPLAkvM4Fg7Q9r8m4lJDAAW2qkdJIaJHtzyz8E=
+SIZE (magicpoint-1.13a.tar.gz) = 890670
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 11 Mar 2022 19:38:12 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
---- configure.in.orig Tue May 22 02:09:42 2001
-+++ configure.in Tue Jun 4 11:22:03 2013
-@@ -103,6 +103,8 @@ if test "$mgp_use_freetype" = "yes"; then
- ac_cv_ft_include="$dir/include"
- elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then
- ac_cv_ft_include="$dir/include/freetype"
-+ elif test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then
-+ ac_cv_ft_include="$dir/include/freetype1/freetype"
- fi
- if test "$ac_cv_ft_lib" != "no" -a "$ac_cv_ft_include" != "no"; then
- LIBS="-L$ac_cv_ft_lib $LIBS"
-@@ -118,7 +120,7 @@ if test "$mgp_use_freetype" = "yes"; then
- fi
- fi
- if test "$mgp_use_freetype" = "yes"; then
-- LIBS="-L$ac_cv_ft_lib $LIBS"
-+ LIBS="-L$ac_cv_ft_lib $LIBS -liconv"
- OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS"
- DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS"
- AC_CHECK_LIB(intl, dgettext)
-@@ -257,7 +259,7 @@ for i in /usr/pkg /usr/local /usr; do
- AC_CHECK_LIB(png, png_read_image,
- [LIBS="$LIBS -lpng"
- AC_DEFINE(USE_PNG)],
-- [AC_CHECK_LIB(png, png_set_gray_1_2_4_to_8,
-+ [AC_CHECK_LIB(png, png_set_expand_gray_1_2_4_to_8,
- [LIBS="$LIBS -lpng -lz"
- AC_DEFINE(USE_PNG)],
- [], [-lz])])
Index: patches/patch-draw_c
===================================================================
RCS file: patches/patch-draw_c
diff -N patches/patch-draw_c
--- patches/patch-draw_c 11 Mar 2022 19:38:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- draw.c.orig Thu Nov 3 15:24:04 2005
-+++ draw.c Thu Nov 3 15:38:39 2005
-@@ -1893,9 +1893,16 @@ obj_draw(state, target, xpos, ypos)
-