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
This commit is contained in:
jcs 2005-03-01 18:19:52 +00:00
parent 7d1be9c589
commit b3719fff03
4 changed files with 27 additions and 32 deletions

View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.36 2005/02/25 13:34:37 alek Exp $
# $OpenBSD: Makefile,v 1.37 2005/03/01 18:19:52 jcs Exp $
COMMENT= "X11-based presentation tool"
DISTNAME= magicpoint-1.11b
PKGNAME= ${DISTNAME}p0
DISTNAME= magicpoint-1.09a
# hack
PKGNAME= magicpoint-1.11bp1
CATEGORIES= misc productivity
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/
HOMEPAGE= http://www.mew.org/mgp/
HOMEPAGE= http://member.wide.ad.jp/wg/mgp/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -33,9 +34,6 @@ CONFIGURE_ARGS+= --enable-freetype-charset16
NO_REGRESS= Yes
pre-patch:
perl -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/image/new.c
post-configure:
@cd ${WRKSRC}/contrib/xmindpath && \
./configure --prefix='$${DESTDIR}${PREFIX}'
@ -45,7 +43,7 @@ post-build:
@cd ${WRKSRC}/contrib/xwintoppm && ${XMKMF}
DOCS= COPYRIGHT COPYRIGHT.jp FAQ README README.fonts README.fonts.jp \
README.lang README.xft SYNTAX USAGE USAGE.jp
README.lang SYNTAX TODO.jp USAGE USAGE.jp
SAMPLES= README README.jp cloud.jpg dad.eps dad.jpg default.mgp \
embed-jp.mgp embed.mgp gradation-jp.mgp \
gradation.mgp mgp-old1.jpg mgp-old2.jpg mgp-old3.jpg \
@ -71,9 +69,7 @@ post-install:
${PREFIX}/share/mgp/emacs; \
done
${INSTALL_SCRIPT} ${WRKSRC}/contrib/eqn2eps.sh \
${PREFIX}/bin/eqn2eps
${INSTALL_SCRIPT} ${WRKSRC}/contrib/latex2eps.sh \
${PREFIX}/bin/latex2eps
${PREFIX}/bin/eqn2eps
${INSTALL_SCRIPT} ${WRKSRC}/contrib/mgp2html.pl \
${PREFIX}/bin/mgp2html
${INSTALL_SCRIPT} ${WRKSRC}/contrib/mgp2latex.pl \

View File

@ -1,4 +1,4 @@
MD5 (magicpoint-1.11b.tar.gz) = 2b627f17443842eb5009304864577a4c
RMD160 (magicpoint-1.11b.tar.gz) = 788acfde864e3a2e5d66af947a733aa6cea5a8c9
SHA1 (magicpoint-1.11b.tar.gz) = f6f447c669bf92cac83ec6e1d718845cbd186f8f
SIZE (magicpoint-1.11b.tar.gz) = 871618
MD5 (magicpoint-1.09a.tar.gz) = 4fc48bd292a7c8b1aab656bf2f0af47d
RMD160 (magicpoint-1.09a.tar.gz) = 2ee96eed9c9e31d6c599447d421ae319483c3617
SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f
SIZE (magicpoint-1.09a.tar.gz) = 816234

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2005/02/25 13:34:38 alek Exp $
--- configure.in.orig Wed Aug 4 18:23:35 2004
+++ configure.in Fri Feb 25 14:22:41 2005
@@ -117,6 +117,8 @@ if test "$mgp_use_freetype" = "yes"; the
$OpenBSD: patch-configure_in,v 1.3 2005/03/01 18:19:52 jcs Exp $
--- configure.in.orig Tue May 22 01:09:42 2001
+++ configure.in Tue Mar 1 12:11:33 2005
@@ -103,6 +103,8 @@
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,16 +10,16 @@ $OpenBSD: patch-configure_in,v 1.2 2005/02/25 13:34:38 alek Exp $
fi
if test "$ac_cv_ft_lib" != "no" -a "$ac_cv_ft_include" != "no"; then
LIBS="-L$ac_cv_ft_lib $LIBS"
@@ -131,7 +133,7 @@ if test "$mgp_use_freetype" = "yes"; the
AC_MSG_RESULT($ac_cv_ft_lib and $ac_cv_ft_include)
@@ -118,7 +120,7 @@
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)
@@ -301,7 +303,7 @@ for i in /usr/pkg /usr/local /usr; do
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)
@@ -274,7 +276,7 @@
else
break;
fi

View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.9 2004/11/26 03:42:15 kevlo Exp $
@comment $OpenBSD: PLIST,v 1.10 2005/03/01 18:19:52 jcs Exp $
bin/eqn2eps
bin/latex2eps
bin/mgp
bin/mgp2html
bin/mgp2latex
@ -29,8 +28,8 @@ share/doc/mgp/README
share/doc/mgp/README.fonts
share/doc/mgp/README.fonts.jp
share/doc/mgp/README.lang
share/doc/mgp/README.xft
share/doc/mgp/SYNTAX
share/doc/mgp/TODO.jp
share/doc/mgp/USAGE
share/doc/mgp/USAGE.jp
share/doc/mgp/sample/