The following patch updates magicpoint to version 1.13a. Please test.
Also, the update requires patches/patch-{draw,parse,tfont}_c to be
removed.
--
Aaron W. Hsu <[email protected]> | <http://www.sacrideo.us>
"Government is the great fiction, through which everybody endeavors to
live at the expense of everybody else." -- Frederic Bastiat
+++++++++++++++ ((lambda (x) (x x)) (lambda (x) (x x))) ++++++++++++++
Index: misc/magicpoint/Makefile
===================================================================
RCS file: /cvs/ports/misc/magicpoint/Makefile,v
retrieving revision 1.48
diff -u misc/magicpoint/Makefile
--- misc/magicpoint/Makefile 18 Feb 2009 08:15:50 -0000 1.48
+++ misc/magicpoint/Makefile 22 May 2009 15:12:57 -0000
@@ -2,9 +2,9 @@
COMMENT= X11-based presentation tool
-DISTNAME= magicpoint-1.09a
+DISTNAME= magicpoint-1.13a
# hack
-PKGNAME= magicpoint-1.11bp8
+PKGNAME= magicpoint-1.13a
CATEGORIES= misc productivity
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
@@ -15,21 +15,21 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c ICE jpeg lcms m SM util \
- Xt Xau Xdmcp Xmu Xext X11 Xtst z
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xrender Xt Xtst c
+WANTLIB += expat fontconfig freetype m util z jpeg lcms
-# plus sign is for localized (i.e. Japanese) version
-LIB_DEPENDS+= ttf.>=1::print/freetype \
- png.>=2::graphics/png \
- mng::graphics/libmng \
- ungif.>=5::graphics/libungif
-RUN_DEPENDS+= ::graphics/netpbm \
- ::print/ghostscript/gnu-fonts
+LIB_DEPENDS+= ttf.>=1::print/freetype \
+ png.>=2::graphics/png \
+ mng::graphics/libmng \
+ ungif.>=5::graphics/libungif
+RUN_DEPENDS+= ::graphics/netpbm \
+ ::print/ghostscript/gnu-fonts
+
+# plus sign is for localized (i.e. Japanese) version
MODULES= devel/gettext
USE_X11= Yes
-AUTOCONF_VERSION=2.13
CONFIGURE_STYLE=autoconf gnu imake no-autoheader
CONFIGURE_ARGS= --disable-vflib
CONFIGURE_ARGS+= --enable-gif
Index: misc/magicpoint/distinfo
===================================================================
RCS file: /cvs/ports/misc/magicpoint/distinfo,v
retrieving revision 1.5
diff -u misc/magicpoint/distinfo
--- misc/magicpoint/distinfo 5 Apr 2007 17:41:07 -0000 1.5
+++ misc/magicpoint/distinfo 22 May 2009 15:12:57 -0000
@@ -1,5 +1,5 @@
-MD5 (magicpoint-1.09a.tar.gz) = T8SL0pKnyLGqtla/Lwr0fQ==
-RMD160 (magicpoint-1.09a.tar.gz) = Lulu7ZyeMdbFmUR9QhrjGUg8Nhc=
-SHA1 (magicpoint-1.09a.tar.gz) = KQP3xCow1Vhnf8GpNgf+f8jB/A8=
-SHA256 (magicpoint-1.09a.tar.gz) = woQZdNFfyvvJXlIiqnHiv+VIeFqgiRsewzMB27pjfww=
-SIZE (magicpoint-1.09a.tar.gz) = 816234
+MD5 (magicpoint-1.13a.tar.gz) = 68QDmClW6RirMnxUqQtE4A==
+RMD160 (magicpoint-1.13a.tar.gz) = Bn197juQ7DVJddmtTqDA30jMoZE=
+SHA1 (magicpoint-1.13a.tar.gz) = K8ZirQpILUJXh2YlihQ7BqRxiuM=
+SHA256 (magicpoint-1.13a.tar.gz) = IF5nUuPLAkvM4Fg7Q9r8m4lJDAAW2qkdJIaJHtzyz8E=
+SIZE (magicpoint-1.13a.tar.gz) = 890670
Index: misc/magicpoint/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/misc/magicpoint/patches/patch-configure_in,v
retrieving revision 1.5
diff -u misc/magicpoint/patches/patch-configure_in
--- misc/magicpoint/patches/patch-configure_in 3 Nov 2005 14:46:01 -0000
1.5
+++ misc/magicpoint/patches/patch-configure_in 22 May 2009 15:12:57 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.5 2005/11/03 14:46:01 espie Exp $
---- configure.in.orig Tue May 22 08:09:42 2001
-+++ configure.in Thu Nov 3 15:00:38 2005
-@@ -103,6 +103,8 @@ if test "$mgp_use_freetype" = "yes"; the
+--- configure.in.orig Fri Dec 28 15:31:26 2007
++++ configure.in Thu Apr 23 12:54:58 2009
+@@ -125,6 +125,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"
@@ -10,25 +10,16 @@
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"; the
+@@ -139,7 +141,7 @@ if test "$mgp_use_freetype" = "yes"; then
+ AC_MSG_RESULT($ac_cv_ft_lib and $ac_cv_ft_include)
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)
-@@ -244,7 +246,7 @@ if test "$mgp_use_freetype" = "yes"; the
- fi
-
- for i in /usr/pkg /usr/local /usr; do
-- if test -f $i/include/png.h; then
-+ if test -f $i/include/libpng/png.h; then
- if test -f $i/lib/libpng.a ; then
- DEPLIBS="$DEPLIBS $i/lib/libpng.a"
- elif test -f $i/lib/libpng.so ; then
-@@ -253,7 +255,7 @@ for i in /usr/pkg /usr/local /usr; do
+ 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)
+@@ -287,7 +289,7 @@ for i in $SEARCHPATH /usr/pkg /usr/local /usr; do
break;
fi
LIBS="$LIBS -L$i/lib"
@@ -37,7 +28,7 @@
AC_CHECK_LIB(png, png_read_image,
[LIBS="$LIBS -lpng"
AC_DEFINE(USE_PNG)],
-@@ -274,7 +276,7 @@ for i in /usr/pkg /usr/local /usr; do
+@@ -309,7 +311,7 @@ for i in /usr/pkg /usr/local /usr; do
else
break;
fi
@@ -45,4 +36,4 @@
+ LIBS="$LIBS -L$i/lib -ljpeg -llcms"
OPTFLAGS="$OPTFLAGS -I$i/include"
AC_CHECK_LIB(mng, mng_initialize,
- [LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
+ [LIBS="$LIBS -lmng"
Index: misc/magicpoint/patches/patch-grammar_y
===================================================================
RCS file: /cvs/ports/misc/magicpoint/patches/patch-grammar_y,v
retrieving revision 1.1
diff -u misc/magicpoint/patches/patch-grammar_y
--- misc/magicpoint/patches/patch-grammar_y 5 Nov 2005 09:28:42 -0000
1.1
+++ misc/magicpoint/patches/patch-grammar_y 22 May 2009 15:12:57 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-grammar_y,v 1.1 2005/11/05 09:28:42 espie Exp $
---- grammar.y.orig Sat Nov 5 10:10:34 2005
-+++ grammar.y Sat Nov 5 10:15:31 2005
+--- grammar.y.orig Fri Jan 18 12:43:20 2008
++++ grammar.y Thu Apr 23 12:52:58 2009
@@ -145,6 +145,7 @@ gen_double_int(op, v)
return ct;
}
@@ -17,7 +17,7 @@
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);
@@ -25,7 +25,7 @@
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: misc/magicpoint/patches/patch-mgp_h
===================================================================
RCS file: /cvs/ports/misc/magicpoint/patches/patch-mgp_h,v
retrieving revision 1.1
diff -u misc/magicpoint/patches/patch-mgp_h
--- misc/magicpoint/patches/patch-mgp_h 5 Nov 2005 09:28:42 -0000 1.1
+++ misc/magicpoint/patches/patch-mgp_h 22 May 2009 15:12:57 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-mgp_h,v 1.1 2005/11/05 09:28:42 espie Exp $
---- 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 {
+--- mgp.h.orig Fri Jan 18 12:43:20 2008
++++ mgp.h Thu Apr 23 12:52:58 2009
+@@ -310,6 +310,7 @@ struct ctrl {
u_char ct_flag;
u_int ct_page;
struct ctrl *ct_next;
@@ -9,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: misc/magicpoint/pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/magicpoint/pkg/PLIST,v
retrieving revision 1.10
diff -u misc/magicpoint/pkg/PLIST
--- misc/magicpoint/pkg/PLIST 1 Mar 2005 18:19:52 -0000 1.10
+++ misc/magicpoint/pkg/PLIST 22 May 2009 15:12:57 -0000
@@ -1,14 +1,14 @@
@comment $OpenBSD: PLIST,v 1.10 2005/03/01 18:19:52 jcs Exp $
bin/eqn2eps
-bin/mgp
+...@bin bin/mgp
bin/mgp2html
bin/mgp2latex
-bin/mgp2ps
+...@bin bin/mgp2ps
bin/mgpembed
bin/mgpnet
bin/tex2eps
-bin/xmindpath
-bin/xwintoppm
+...@bin bin/xmindpath
+...@bin bin/xwintoppm
lib/X11/mgp/
lib/X11/mgp/default.mgp
lib/X11/mgp/mgp1.jpg
