Index: graphics/magicpoint/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/graphics/magicpoint/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- graphics/magicpoint/Makefile	19 Feb 2011 10:03:18 -0000	1.69
+++ graphics/magicpoint/Makefile	10 Mar 2011 09:41:50 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2011/02/19 10:03:18 markd Exp $
 
 DISTNAME=		magicpoint-1.13a
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
 
@@ -40,6 +40,7 @@
 			sample-jp-xft.mgp sample-jp.mgp sample.mgp \
 			sendmail6-jp.mgp sendmail6.mgp tutorial-jp.mgp \
 			tutorial.mgp v6-jp.mgp v6.mgp v6header.eps v6header.jpg
+ELISP=			mgp-mode-cd mgp-mode20 mgp-mode
 
 # We need to perform the steps normally done by ``xmkmf -a'' since some
 # files need to be created before ``make depend''.
@@ -50,6 +51,14 @@
 			Makefiles includes depend
 
 .include "options.mk"
+.if !empty(MGP_EL)
+ELISPDIR=		${EMACS_LISPPREFIX}/mgp
+INSTALLATION_DIRS+=	${ELISPDIR}
+USE_TOOLS+=		gzip
+# Double quote is necessary to include option: "gzip -nf 9"
+#ONFIGURE_ENV+=		mgp_cv_path_gzip="${GZIP_CMD}"
+CONFIGURE_ENV+=		mgp_cv_path_gzip=${TOOLS_PATH.gzip}
+.endif
 
 SUBST_CLASSES+=		conf
 SUBST_FILES.conf+=	sample/default.mgp
@@ -71,6 +80,15 @@
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${DESTDIR}${PREFIX}/${EGDIR}
 .endfor
+.if !empty(MGP_EL)
+.for f in ${ELISP}
+	(cd ${WRKSRC}/contrib/; \
+	emacs -batch -f batch-byte-compile ${f}.el; \
+	${GZIP_CMD} ${f}.el; \
+	${INSTALL_DATA} ${f}.elc ${f}.el.gz ${DESTDIR}${ELISPDIR} ; \
+	)
+.endfor
+.endif
 
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
Index: graphics/magicpoint/PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/graphics/magicpoint/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- graphics/magicpoint/PLIST	14 Jun 2009 17:59:23 -0000	1.4
+++ graphics/magicpoint/PLIST	10 Mar 2011 08:14:17 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:23 joerg Exp $
+@comment $NetBSD$
 bin/mgp
 bin/mgp2ps
 bin/mgpembed
@@ -23,6 +23,12 @@
 share/doc/mgp/SYNTAX
 share/doc/mgp/USAGE
 share/doc/mgp/USAGE.jp
+${PLIST.elisp}${EMACS_LISPPREFIX}/mgp/mgp-mode-cd.el.gz
+${PLIST.elisp}${EMACS_LISPPREFIX}/mgp/mgp-mode-cd.elc
+${PLIST.elisp}${EMACS_LISPPREFIX}/mgp/mgp-mode.el.gz
+${PLIST.elisp}${EMACS_LISPPREFIX}/mgp/mgp-mode.elc
+${PLIST.elisp}${EMACS_LISPPREFIX}/mgp/mgp-mode20.el.gz
+${PLIST.elisp}${EMACS_LISPPREFIX}/mgp/mgp-mode20.elc
 share/examples/mgp/README
 share/examples/mgp/README.jp
 share/examples/mgp/cloud.jpg
@@ -44,8 +50,8 @@
 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-jp-xft.mgp
+share/examples/mgp/sample-jp.mgp
 share/examples/mgp/sample.mgp
 share/examples/mgp/sendmail6-jp.mgp
 share/examples/mgp/sendmail6.mgp
Index: graphics/magicpoint/options.mk
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/graphics/magicpoint/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- graphics/magicpoint/options.mk	10 Sep 2008 13:32:47 -0000	1.1
+++ graphics/magicpoint/options.mk	10 Mar 2011 08:09:21 -0000
@@ -1,9 +1,10 @@
 # $NetBSD: options.mk,v 1.1 2008/09/10 13:32:47 taca Exp $
 
 .include "../../mk/bsd.prefs.mk"
+PLIST_VARS+=	elisp
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.magicpoint
-PKG_SUPPORTED_OPTIONS=	freetype vflib xft2
+PKG_SUPPORTED_OPTIONS=	freetype vflib xft2 elisp
 PKG_SUGGESTED_OPTIONS=	xft2
 
 .include "../../mk/bsd.options.mk"
@@ -37,6 +38,12 @@
 CONFIGURE_ARGS+=	--disable-xft2
 .endif
 
+.if !empty(PKG_OPTIONS:Melisp)
+MGP_EL=		yes
+.include "../../editors/emacs/buildlink3.mk"
+PLIST.elisp=	yes
+.endif
+
 .include "../../graphics/imlib/buildlink3.mk"
 
 
@@ -46,3 +53,4 @@
 MGP_VFONT?=	% %
 MGP_TFONT?=	% %
 MGP_XFONT?=	% %
+MGP_EL?=	# empty