magicpoint original distribution is updated to 1.04a.

NOTE: there's one twist in post-install (manpage gzipping).
could anybody improve this?

4 files changed, 52 insertions, 16 deletions

diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index d4946de447b9..89184f516f9a 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	magicpoint (with vflib)
-# Version required:	1.03a
+# Version required:	1.04a
 # Date created:		25 Dec 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.2 1998/02/17 12:58:43 itojun Exp $
+# $Id: Makefile,v 1.3 1998/04/07 22:44:46 itojun Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 LIB_DEPENDS=	VFlib:${PORTSDIR}/japanese/vflib
 
-PKGNAME=	ja-magicpoint-1.03a
+PKGNAME=	ja-magicpoint-1.04a
 
 .include <${.CURDIR}/../../misc/magicpoint/Makefile>
 
@@ -22,4 +22,5 @@ CATEGORIES=	japanese misc
 
 MAINTAINER=	itojun@itojun.org
 
-CONFIGURE_ARGS=	#intentionally empty
+# dirty, but this is required for version independent-ness
+CONFIGURE_ARGS=	--with-vfontcap=`echo ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1`
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index c7e23824c892..2b61c0bf644d 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -1,29 +1,54 @@
 # New ports collection makefile for:	magicpoint
-# Version required:	1.03a
+# Version required:	1.04a
 # Date created:		24 December 1997
 # Whom:			itojun@itojun.org
 #
-# $Id: Makefile,v 1.2 1998/02/17 12:58:54 itojun Exp $
+# $Id: Makefile,v 1.3 1998/04/07 22:43:37 itojun Exp $
 #
 
-DISTNAME=	mgp-1.03a
-PKGNAME?=	magicpoint-1.03a
+DISTNAME=	magicpoint-1.04a
+# question is for localized (i.e. Japanese) version
+PKGNAME?=	magicpoint-1.04a
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.mew.org/pub/MagicPoint/
 
 MAINTAINER=	itojun@itojun.org
 
+# plus sign is for localized (i.e. Japanese) version
+LIB_DEPENDS+=	ttf:${PORTSDIR}/print/freetype
+
 USE_IMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-vflib
 
-DOCS=	COPYRIGHT COPYRIGHT.jp README SYNTAX TODO.jp USAGE USAGE.jp
+post-configure:
+	(cd ${WRKSRC}/contrib/xmindpath; ./configure --prefix=${X11BASE})
+
+post-build:
+	(cd ${WRKSRC}/contrib/xmindpath; make)
+
+MAN1=	mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1
+
+DOCS=	COPYRIGHT COPYRIGHT.jp README README.fonts README.fonts.jp \
+	SYNTAX TODO.jp USAGE USAGE.jp
 SAMPLES=	README README.jp ascii.mgp cloud.gif dad.eps dad.gif dns.mgp \
 		default.mgp gradation.mgp mgp-old1.gif mgp-old2.gif \
 		mgp-old3.gif mgp1.gif mgp2.gif mgp3.gif sample.mgp \
 		tutorial.mgp v6.mgp v6header.eps v6header.gif
+SAMPLES=	README README.jp cloud.gif dad.eps dad.gif default.mgp \
+		dns-jp.mgp embed-jp.mgp embed.mgp gradation-jp.mgp \
+		gradation.mgp mgp-old1.gif mgp-old2.gif mgp-old3.gif \
+		mgp1.gif mgp2.gif mgp3.gif mgp3.xbm mgprc-sample \
+		multilingual.mgp sample-jp.mgp sample.mgp sendmail6-jp.mgp \
+		sendmail6.mgp tutorial-jp.mgp tutorial.mgp v6-jp.mgp \
+		v6.mgp v6header.eps v6header.gif
 
 post-install:
+	(cd ${WRKSRC}/contrib/xmindpath; make install)
+.if ${MANCOMPRESSED} == yes
+	# why do we need this?
+	${GZIP_CMD} ${PREFIX}/man/man1/xmindpath.1
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mgp
 	for i in $(DOCS); do \
diff --git a/misc/magicpoint/distinfo b/misc/magicpoint/distinfo
index 14b9d59a5d8c..9da47ba475da 100644
--- a/misc/magicpoint/distinfo
+++ b/misc/magicpoint/distinfo
@@ -1 +1 @@
-MD5 (mgp-1.03a.tar.gz) = 9288ce0288929eac2a4ffb481a701bb4
+MD5 (magicpoint-1.04a.tar.gz) = afc4029060759b6be53c5114f73e6a3a
diff --git a/misc/magicpoint/pkg-plist b/misc/magicpoint/pkg-plist
index e2e76fd65aa8..861f32f72646 100644
--- a/misc/magicpoint/pkg-plist
+++ b/misc/magicpoint/pkg-plist
@@ -1,6 +1,8 @@
 bin/mgp
 bin/mgp2ps
+bin/mgpembed
 bin/mgpnet
+bin/xmindpath
 bin/xwintoppm
 lib/X11/mgp/default.mgp
 lib/X11/mgp/mgp1.gif
@@ -9,18 +11,22 @@ lib/X11/mgp/mgp3.gif
 share/doc/mgp/COPYRIGHT
 share/doc/mgp/COPYRIGHT.jp
 share/doc/mgp/README
+share/doc/mgp/README.fonts
+share/doc/mgp/README.fonts.jp
 share/doc/mgp/SYNTAX
 share/doc/mgp/TODO.jp
 share/doc/mgp/USAGE
 share/doc/mgp/USAGE.jp
 share/doc/mgp/sample/README
 share/doc/mgp/sample/README.jp
-share/doc/mgp/sample/ascii.mgp
 share/doc/mgp/sample/cloud.gif
 share/doc/mgp/sample/dad.eps
 share/doc/mgp/sample/dad.gif
-share/doc/mgp/sample/dns.mgp
 share/doc/mgp/sample/default.mgp
+share/doc/mgp/sample/dns-jp.mgp
+share/doc/mgp/sample/embed-jp.mgp
+share/doc/mgp/sample/embed.mgp
+share/doc/mgp/sample/gradation-jp.mgp
 share/doc/mgp/sample/gradation.mgp
 share/doc/mgp/sample/mgp-old1.gif
 share/doc/mgp/sample/mgp-old2.gif
@@ -28,15 +34,19 @@ share/doc/mgp/sample/mgp-old3.gif
 share/doc/mgp/sample/mgp1.gif
 share/doc/mgp/sample/mgp2.gif
 share/doc/mgp/sample/mgp3.gif
+share/doc/mgp/sample/mgp3.xbm
+share/doc/mgp/sample/mgprc-sample
+share/doc/mgp/sample/multilingual.mgp
+share/doc/mgp/sample/sample-jp.mgp
 share/doc/mgp/sample/sample.mgp
+share/doc/mgp/sample/sendmail6-jp.mgp
+share/doc/mgp/sample/sendmail6.mgp
+share/doc/mgp/sample/tutorial-jp.mgp
 share/doc/mgp/sample/tutorial.mgp
+share/doc/mgp/sample/v6-jp.mgp
 share/doc/mgp/sample/v6.mgp
 share/doc/mgp/sample/v6header.eps
 share/doc/mgp/sample/v6header.gif
-man/man1/mgp.1.gz
-man/man1/mgp2ps.1.gz
-man/man1/mgpnet.1.gz
-man/man1/xwintoppm.1.gz
 @dirrm lib/X11/mgp
 @dirrm share/doc/mgp/sample
 @dirrm share/doc/mgp