* Update to magicpoint-1.0.6a.

* Split out xmindpath into a separate package (x11/xmindpath).

5 files changed, 81 insertions, 36 deletions

diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index ff59f63113d..9da7bd19282 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,35 +1,45 @@
-# $NetBSD: Makefile,v 1.11 1999/07/01 14:19:32 mrg Exp $
+# $NetBSD: Makefile,v 1.12 1999/10/28 04:14:02 jlam Exp $
 
-DISTNAME=		magicpoint-1.05a
+DISTNAME=		magicpoint-1.06a
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://ftp.mew.org/pub/MagicPoint/
 
 MAINTAINER=		itojun@itojun.org
 HOMEPAGE=		http://www.Mew.org/mgp/
 
-DEPENDS=		freetype-1.1:${.CURDIR}/../../graphics/freetype
+DEPENDS=		freetype-*:../../graphics/freetype
 
-CONFLICTS=		mgp-* magicpoint-1.04a
+CONFLICTS=		mgp-*
 
 GNU_CONFIGURE=		yes
 USE_IMAKE=		yes
-CONFIGURE_ARGS=		--disable-vflib --enable-freetype-charset16
+CONFIGURE_ARGS=		--disable-vflib --enable-freetype-charset16 \
+			--enable-locale
+MAKE_ENV+=		LOCAL_LDFLAGS="${LDFLAGS}"
 
-post-configure:
-	(cd ${WRKSRC}/contrib/xmindpath; env LDFLAGS="${LDFLAGS}" \
-		./configure --prefix=${PREFIX} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include)
+# We need to perform the steps normally done by ``xmkmf -a'' since some
+# files need to be created before ``make depend''.
+#
+XMKMF=			xmkmf
 
-post-build:
-	(cd ${WRKSRC}/contrib/xmindpath; make)
+post-configure:
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ctlwords.h
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} grammar.c
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} scanner.c
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tokdefs.h
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} Makefiles
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} includes
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
 
 post-install:
-	(cd ${WRKSRC}/contrib/xmindpath; make install)
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgp
+	cd ${WRKSRC}; \
+	${INSTALL_DATA} COPYRIGHT COPYRIGHT.jp FAQ \
+		README README.fonts README.fonts.jp README.lang \
+		SYNTAX USAGE USAGE.jp ${PREFIX}/share/doc/mgp
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mgp
-	${INSTALL_DATA} ${WRKSRC}/sample/README* ${PREFIX}/share/examples/mgp
-	${INSTALL_DATA} ${WRKSRC}/sample/*.gif ${PREFIX}/share/examples/mgp
-	${INSTALL_DATA} ${WRKSRC}/sample/*.eps ${PREFIX}/share/examples/mgp
-	${INSTALL_DATA} ${WRKSRC}/sample/*.mgp ${PREFIX}/share/examples/mgp
-	${INSTALL_DATA} ${WRKSRC}/sample/mgprc-sample ${PREFIX}/share/examples/mgp
+	cd ${WRKSRC}/sample; \
+	${INSTALL_DATA} README* *.gif *.eps *.mgp *.xbm mgprc-sample \
+		${PREFIX}/share/examples/mgp
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/magicpoint/files/md5 b/graphics/magicpoint/files/md5
index 5c0ba44ca8a..32dd921bc3c 100644
--- a/graphics/magicpoint/files/md5
+++ b/graphics/magicpoint/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/06/17 08:00:31 itojun Exp $
+$NetBSD: md5,v 1.4 1999/10/28 04:14:03 jlam Exp $
 
-MD5 (magicpoint-1.05a.tar.gz) = 325e61a87e2154d6811cf1d796f137fa
+MD5 (magicpoint-1.06a.tar.gz) = edc2e5eb350abe01a99eb344f72719b5
diff --git a/graphics/magicpoint/files/patch-sum b/graphics/magicpoint/files/patch-sum
new file mode 100644
index 00000000000..e4036e676c1
--- /dev/null
+++ b/graphics/magicpoint/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 1999/10/28 04:14:03 jlam Exp $
+
+MD5 (patch-aa) = 35ddc30d3a0865d25ff8e2f170188be8
diff --git a/graphics/magicpoint/patches/patch-aa b/graphics/magicpoint/patches/patch-aa
new file mode 100644
index 00000000000..116a9988257
--- /dev/null
+++ b/graphics/magicpoint/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 1999/10/28 04:14:03 jlam Exp $
+
+--- configure.orig	Tue Jun  8 16:00:39 1999
++++ configure	Wed Oct 27 23:11:00 1999
+@@ -1060,7 +1060,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lttf  $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1066 "configure"
+ #include "confdefs.h"
+@@ -1094,7 +1094,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lttf $LIBS"
++  LIBS="-lttf -lintl $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
diff --git a/graphics/magicpoint/pkg/PLIST b/graphics/magicpoint/pkg/PLIST
index 5c2605cc53c..0bd3a0dcd92 100644
--- a/graphics/magicpoint/pkg/PLIST
+++ b/graphics/magicpoint/pkg/PLIST
@@ -1,38 +1,38 @@
-@comment $NetBSD: PLIST,v 1.6 1999/06/17 08:00:31 itojun Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/10/28 04:14:03 jlam Exp $
 bin/mgp
 bin/mgp2ps
-bin/mgpnet
 bin/mgpembed
+bin/mgpnet
 bin/xwintoppm
-bin/xmindpath
 lib/X11/mgp/default.mgp
 lib/X11/mgp/mgp1.gif
 lib/X11/mgp/mgp2.gif
 lib/X11/mgp/mgp3.gif
 man/cat1/mgp.0
 man/cat1/mgp2ps.0
+man/cat1/mgpembed.0
 man/cat1/mgpnet.0
 man/cat1/xwintoppm.0
-man/cat1/mgpembed.0
-man/man1/xmindpath.1
+share/doc/mgp/COPYRIGHT
+share/doc/mgp/COPYRIGHT.jp
+share/doc/mgp/FAQ
+share/doc/mgp/README
+share/doc/mgp/README.fonts
+share/doc/mgp/README.fonts.jp
+share/doc/mgp/README.lang
+share/doc/mgp/SYNTAX
+share/doc/mgp/USAGE
+share/doc/mgp/USAGE.jp
 share/examples/mgp/README
 share/examples/mgp/README.jp
-share/examples/mgp/mgprc-sample
-share/examples/mgp/dns-jp.mgp
-share/examples/mgp/embed-jp.mgp
-share/examples/mgp/embed.mgp
-share/examples/mgp/gradation-jp.mgp
-share/examples/mgp/multilingual.mgp
-share/examples/mgp/sample-fr.mgp
-share/examples/mgp/sample-jp.mgp
-share/examples/mgp/sendmail6-jp.mgp
-share/examples/mgp/sendmail6.mgp
-share/examples/mgp/tutorial-jp.mgp
-share/examples/mgp/v6-jp.mgp
 share/examples/mgp/cloud.gif
 share/examples/mgp/dad.eps
 share/examples/mgp/dad.gif
 share/examples/mgp/default.mgp
+share/examples/mgp/dns-jp.mgp
+share/examples/mgp/embed-jp.mgp
+share/examples/mgp/embed.mgp
+share/examples/mgp/gradation-jp.mgp
 share/examples/mgp/gradation.mgp
 share/examples/mgp/mgp-old1.gif
 share/examples/mgp/mgp-old2.gif
@@ -40,10 +40,20 @@ share/examples/mgp/mgp-old3.gif
 share/examples/mgp/mgp1.gif
 share/examples/mgp/mgp2.gif
 share/examples/mgp/mgp3.gif
+share/examples/mgp/mgp3.xbm
+share/examples/mgp/mgprc-sample
+share/examples/mgp/multilingual.mgp
+share/examples/mgp/sample-fr.mgp
+share/examples/mgp/sample-jp.mgp
 share/examples/mgp/sample.mgp
+share/examples/mgp/sendmail6-jp.mgp
+share/examples/mgp/sendmail6.mgp
+share/examples/mgp/tutorial-jp.mgp
 share/examples/mgp/tutorial.mgp
+share/examples/mgp/v6-jp.mgp
 share/examples/mgp/v6.mgp
 share/examples/mgp/v6header.eps
 share/examples/mgp/v6header.gif
 @dirrm share/examples/mgp
+@dirrm share/doc/mgp
 @dirrm lib/X11/mgp