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) - #endif /* FREETYPE */ - } - if (obj != NULL) { /* VFONT exist */ -+ int pad; -+ if (depth <= 8) { -+ pad = 8; -+ } else if (depth <=16) { -+ pad = 16; -+ } else pad = 32; -+ - xim = XCreateImage(display, visual, depth, ZPixmap, - 0, NULL, width, height, -- 8 << (depth - 1) / 8, 0); -+ pad, 0); - xim->data = malloc(xim->bytes_per_line * height); - if (COMPLEX_BGIMAGE) { - u_int bw, bh, bx, by, ox, oy; Index: patches/patch-grammar_y =================================================================== RCS file: /cvs/ports/misc/magicpoint/patches/patch-grammar_y,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-grammar_y --- patches/patch-grammar_y 11 Mar 2022 19:38:12 -0000 1.3 +++ patches/patch-grammar_y 29 Aug 2023 18:31:37 -0000 @@ -26,7 +26,7 @@ Index: grammar.y return ct; } -@@ -190,6 +192,7 @@ gen_str(op, str) +@@ -226,6 +228,7 @@ gen_str(op, str) return ct; } ct->ctc_value = strdup(str); @@ -34,7 +34,7 @@ Index: grammar.y return ct; } -@@ -207,6 +210,7 @@ gen_str2(op, str1, str2) +@@ -243,6 +246,7 @@ gen_str2(op, str1, str2) } ct->ctc2_value1 = strdup(str1); ct->ctc2_value2 = strdup(str2); Index: patches/patch-image_misc_c =================================================================== RCS file: /cvs/ports/misc/magicpoint/patches/patch-image_misc_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-image_misc_c --- patches/patch-image_misc_c 11 Mar 2022 19:38:12 -0000 1.2 +++ patches/patch-image_misc_c 29 Aug 2023 18:31:37 -0000 @@ -1,12 +1,13 @@ For abort() declaration. ---- image/misc.c.orig Thu Nov 20 01:06:46 2014 -+++ image/misc.c Thu Nov 20 01:06:59 2014 -@@ -12,6 +12,7 @@ +Index: image/misc.c +--- image/misc.c.orig ++++ image/misc.c +@@ -12,7 +12,6 @@ #include "xloadimage.h" #include "patchlevel" #include <signal.h> -+#include <stdlib.h> +-#include <stdlib.h> extern int _Xdebug; extern Display *display; Index: patches/patch-image_new_c =================================================================== RCS file: patches/patch-image_new_c diff -N patches/patch-image_new_c --- patches/patch-image_new_c 11 Mar 2022 19:38:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -Replace the malloc.h header with stdlib.h. - ---- image/new.c.orig Thu Nov 20 01:05:26 2014 -+++ image/new.c Thu Nov 20 01:05:51 2014 -@@ -11,7 +11,7 @@ - #include "copyright.h" - #include "image.h" - --#include <malloc.h> -+#include <stdlib.h> - - extern int _Xdebug; - extern void memoryExhausted(void); Index: patches/patch-image_rlelib_c =================================================================== RCS file: patches/patch-image_rlelib_c diff -N patches/patch-image_rlelib_c --- patches/patch-image_rlelib_c 11 Mar 2022 19:38:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- image/rlelib.c.orig Fri Apr 28 11:54:42 2017 -+++ image/rlelib.c Fri Apr 28 11:55:44 2017 -@@ -12,7 +12,6 @@ - - #include <stdio.h> - #include <math.h> --#include <varargs.h> - #include <ctype.h> - - #include "image.h" /* need ZFILE definition */ Index: patches/patch-mgp_c =================================================================== RCS file: /cvs/ports/misc/magicpoint/patches/patch-mgp_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-mgp_c --- patches/patch-mgp_c 12 Jan 2023 13:17:20 -0000 1.1 +++ patches/patch-mgp_c 29 Aug 2023 18:31:37 -0000 @@ -3,9 +3,9 @@ Fix with clang 15: invalid pointer to in Index: mgp.c --- mgp.c.orig +++ mgp.c -@@ -448,16 +448,16 @@ genhtml(start_page) +@@ -506,16 +506,16 @@ genhtml(start_page) char *childdebug; - char convdb[][3][16] = {{ "jpg", "cjpeg", "djpeg" }, + char *convdb[][3] = {{ "jpg", "cjpeg", "djpeg" }, { "png", "pnmtopng", "pngtopnm" }, - { NULL, NULL, NULL }}; + { "", "", "" }}; @@ -21,5 +21,5 @@ Index: mgp.c - if (*convdb[inum] == NULL) { + if (**convdb[inum] == '\0') { fprintf(stderr, "unknwon image type %s.\n", htmlimage); - cleanup(-1); - } + /* print out valid image types */ + fprintf(stderr, "Valid image types: "); Index: patches/patch-mgp_h =================================================================== RCS file: /cvs/ports/misc/magicpoint/patches/patch-mgp_h,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-mgp_h --- patches/patch-mgp_h 11 Mar 2022 19:38:12 -0000 1.2 +++ patches/patch-mgp_h 29 Aug 2023 18:31:37 -0000 @@ -1,6 +1,7 @@ ---- mgp.h.orig Sat Nov 5 10:09:50 2005 -+++ mgp.h Sat Nov 5 10:15:33 2005 -@@ -276,6 +276,7 @@ struct ctrl { +Index: mgp.h +--- mgp.h.orig ++++ mgp.h +@@ -310,6 +310,7 @@ struct ctrl { u_char ct_flag; u_int ct_page; struct ctrl *ct_next; @@ -8,7 +9,7 @@ union { struct ctrl_double ctrl_double; struct ctrl_int ctrl_int; -@@ -291,6 +292,12 @@ struct ctrl { +@@ -327,6 +328,12 @@ struct ctrl { struct ctrl_pcache ctrl_pcache; } ct_val; }; Index: patches/patch-mng_c =================================================================== RCS file: /cvs/ports/misc/magicpoint/patches/patch-mng_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-mng_c --- patches/patch-mng_c 11 Mar 2022 19:38:12 -0000 1.2 +++ patches/patch-mng_c 29 Aug 2023 18:31:37 -0000 @@ -1,8 +1,9 @@ ---- mng.c.orig Fri Apr 28 11:52:25 2017 -+++ mng.c Fri Apr 28 11:53:19 2017 -@@ -43,6 +43,8 @@ typedef struct { - mng_uint32 delay; /* ticks to wait before resuming decode */ - } mngstuff; +Index: mng.c +--- mng.c.orig ++++ mng.c +@@ -45,6 +45,8 @@ typedef struct { + + void mng_window_setup __P((mngstuff *mymng, int x, int y, int width, int height)); +void mng_window_setup(mngstuff *, int, int, int, int); + Index: patches/patch-parse_c =================================================================== RCS file: patches/patch-parse_c diff -N patches/patch-parse_c --- patches/patch-parse_c 11 Mar 2022 19:38:12 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ ---- parse.c.orig Mon Sep 17 08:48:30 2001 -+++ parse.c Thu Jul 7 08:59:48 2011 -@@ -355,14 +355,17 @@ read_file(fp, filename, page, line, preamble) - - case CTL_TAB: - { -- int i = root->cti_value - 1; -- if (i < 0) { -- fprintf(stderr, "%s:%d: " -- "invalid tab index %d\n", -- filename, lineno, root->cti_value); -- exit(-1); -- } -- if (i >= MAXTAB) { /*XXX*/ -+ int i; -+ -+ if (root->ct_type == CTL_INT) { -+ i = root->cti_value - 1; -+ if (i < 0) { -+ fprintf(stderr, "%s:%d: " -+ "invalid tab index %d\n", -+ filename, lineno, root->cti_value); -+ exit(-1); -+ } -+ } else { - /* must be a string */ - /* find a free entry */ - for (i = MAXTAB ; i < MAXTAB + MAXSTYLE ; i++) { Index: patches/patch-tfont_c =================================================================== RCS file: patches/patch-tfont_c diff -N patches/patch-tfont_c --- patches/patch-tfont_c 11 Mar 2022 19:38:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- tfont.c.orig Wed Feb 11 15:48:33 2009 -+++ tfont.c Wed Feb 11 15:52:30 2009 -@@ -597,8 +597,14 @@ CharToUnicode(code, registry) - if (mgp_charset) - regid = get_regid(mgp_charset) -1; - } -+#ifdef FREETYPE_CHARSET16 -+ if (unicode_map[code]) -+ code = unicode_map[code]; -+#else - if (latin_unicode_map[regid][code]) - code = latin_unicode_map[regid][code]; -+#endif -+ - } - #endif -
