3 files changed, 49 insertions, 27 deletions

diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index de7d72f7a919..a5cebb5eaa42 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -7,11 +7,11 @@
 # "?=" and "+=" are for localized (i.e. Japanese) version
 
 PORTNAME=	magicpoint
-PORTVERSION=	1.06a
+PORTVERSION=	1.07a
 CATEGORIES+=	misc
 MASTER_SITES=	ftp://ftp.mew.org/pub/MagicPoint/
 
-MAINTAINER?=	itojun@itojun.org
+MAINTAINER?=	mita@jp.FreeBSD.org
 
 LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype
 
@@ -28,18 +28,17 @@ post-build:
 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 \
+	README.lang RELNOTES SYNTAX TODO.jp USAGE USAGE.jp
+SAMPLES=	README README.jp cloud.jpg dad.eps dad.jpg 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 \
+		gradation.mgp mgp-old1.jpg mgp-old2.jpg mgp-old3.jpg \
+		mgp1.jpg mgp2.jpg mgp3.jpg mgp3.xbm mgprc-sample \
 		multilingual.mgp sample-fr.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
+		sendmail6-jp.mgp sendmail6.mgp tutorial-jp.mgp \
+		tutorial.mgp v6-jp.mgp v6.mgp v6header.eps v6header.jpg
+EMACS_LISPS=	mgp-mode.el mgp-el/COPYING mgp-el/README \
+		mgp-el/mgp.el mgp-el/mgp.sty mgp-el/sample.tex
+SAMPLE_SCRIPTS=	eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl
 
 # NOTE: there are some discussions/twists in gzip'ing xmindpath.1.
 post-install:
@@ -54,6 +53,14 @@ post-install:
 	for i in $(SAMPLES); do \
 		${INSTALL_DATA} ${WRKSRC}/sample/$$i ${PREFIX}/share/doc/mgp/sample; \
 	done
+	${MKDIR} ${PREFIX}/share/doc/mgp/emacs-lisp/mgp-el
+	for i in $(EMACS_LISPS); do \
+		${INSTALL_DATA} ${WRKSRC}/contrib/$$i ${PREFIX}/share/doc/mgp/emacs-lisp/$$i; \
+	done
+	${MKDIR} ${PREFIX}/share/doc/mgp/scripts
+	for i in $(SAMPLE_SCRIPTS); do \
+		${INSTALL_SCRIPT} ${WRKSRC}/contrib/$$i ${PREFIX}/share/doc/mgp/scripts/$$i; \
+	done
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/magicpoint/distinfo b/misc/magicpoint/distinfo
index 24ea04f70df2..c585ce2538a7 100644
--- a/misc/magicpoint/distinfo
+++ b/misc/magicpoint/distinfo
@@ -1 +1 @@
-MD5 (magicpoint-1.06a.tar.gz) = edc2e5eb350abe01a99eb344f72719b5
+MD5 (magicpoint-1.07a.tar.gz) = 11a5d1a56de56ba8a334b3f14e0f6f50
diff --git a/misc/magicpoint/pkg-plist b/misc/magicpoint/pkg-plist
index 5c1b8ce92301..e25be8d6be88 100644
--- a/misc/magicpoint/pkg-plist
+++ b/misc/magicpoint/pkg-plist
@@ -2,38 +2,40 @@ bin/mgp
 bin/mgp2ps
 bin/mgpembed
 bin/mgpnet
-bin/xmindpath
 bin/xwintoppm
+bin/xmindpath
 lib/X11/mgp/default.mgp
-lib/X11/mgp/mgp1.gif
-lib/X11/mgp/mgp2.gif
-lib/X11/mgp/mgp3.gif
+lib/X11/mgp/mgp1.jpg
+lib/X11/mgp/mgp2.jpg
+lib/X11/mgp/mgp3.jpg
 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/README.lang
+share/doc/mgp/RELNOTES
 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/cloud.gif
+share/doc/mgp/sample/cloud.jpg
 share/doc/mgp/sample/dad.eps
-share/doc/mgp/sample/dad.gif
+share/doc/mgp/sample/dad.jpg
 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
-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/mgp-old1.jpg
+share/doc/mgp/sample/mgp-old2.jpg
+share/doc/mgp/sample/mgp-old3.jpg
+share/doc/mgp/sample/mgp1.jpg
+share/doc/mgp/sample/mgp2.jpg
+share/doc/mgp/sample/mgp3.jpg
 share/doc/mgp/sample/mgp3.xbm
 share/doc/mgp/sample/mgprc-sample
 share/doc/mgp/sample/multilingual.mgp
@@ -47,7 +49,20 @@ 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
-@dirrm lib/X11/mgp
+share/doc/mgp/sample/v6header.jpg
+share/doc/mgp/emacs-lisp/mgp-el/COPYING
+share/doc/mgp/emacs-lisp/mgp-el/README
+share/doc/mgp/emacs-lisp/mgp-el/mgp.el
+share/doc/mgp/emacs-lisp/mgp-el/mgp.sty
+share/doc/mgp/emacs-lisp/mgp-el/sample.tex
+share/doc/mgp/emacs-lisp/mgp-mode.el
+share/doc/mgp/scripts/eqn2eps.sh
+share/doc/mgp/scripts/tex2eps.sh
+share/doc/mgp/scripts/mgp2html.pl
+share/doc/mgp/scripts/mgp2latex.pl
+@dirrm share/doc/mgp/emacs-lisp/mgp-el
+@dirrm share/doc/mgp/emacs-lisp
+@dirrm share/doc/mgp/scripts
 @dirrm share/doc/mgp/sample
 @dirrm share/doc/mgp
+@dirrm lib/X11/mgp