Changed a lookup port for XEmacs to XEmacs's package style

5 files changed, 94 insertions, 47 deletions

diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index 825eb9f9fc35..2440ef06218a 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -20,20 +20,26 @@ FILESDIR=	${.CURDIR}/../lookup-mule/files
 PKGDIR=		${.CURDIR}/../lookup-mule/pkg
 PLIST=		${.CURDIR}/pkg/PLIST
 PATCHDIR=	${.CURDIR}/patches
-ELISPDIR?=	${PREFIX}/share/emacs/site-lisp/lookup
-PORTINFODIR?=	${PREFIX}/info
 EMACS?=		mule
 
 .if (${EMACS} == "xemacs")
-BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs
+BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs \
+		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages
+EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
+ELISPDIR=	${EMACSDIR}/lisp/lookup
+PORTINFODIR=	${EMACSDIR}/info
+MANIFEST=	MANIFEST.lookup
 DO_MAKEINFO=	${SETENV} LANG=ja_JP.EUC xemacs -no-site-file -no-init-file \
-		-batch lookup.texi -e texinfo-format-buffer -f save-buffer; \
+		-batch -l texinfmt -f batch-texinfo-format lookup.texi; \
 		${ECHO} "INFO-DIR-SECTION The Emacs editor and associated tools" >> lookup.info; \
 		${ECHO} "START-INFO-DIR-ENTRY" >> lookup.info; \
 		${ECHO} "* Lookup: (lookup).             Lookup, a Search Interface." >> lookup.info; \
 		${ECHO} "END-INFO-DIR-ENTRY" >> lookup.info
 .else
 DO_MAKEINFO=	makeinfo --no-split --no-validate lookup.texi
+EMACSDIR=	${PREFIX}/share/emacs/site-lisp
+ELISPDIR=	${EMACSDIR}/lookup
+PORTINFODIR=	${PREFIX}/info
 .endif
 
 do-build:
@@ -45,7 +51,7 @@ do-build:
 	)
 
 do-install:
-	${MKDIR} ${ELISPDIR}
+	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
@@ -54,4 +60,15 @@ do-install:
 	install-info ${PORTINFODIR}/lookup.info ${PORTINFODIR}/dir
 	${SED} -e 's,%%ELISPDIR%%,${ELISPDIR},' ${FILESDIR}/lookup-startup.el.tmpl > ${ELISPDIR}/../lookup-startup.el
 
+.if (${EMACS} == "xemacs")
+post-install:
+	${RM} -f ${WRKDIR}/${MANIFEST}
+	emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
+	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
+		${SED} -e "s;^${EMACSDIR}/;;" > ${WRKDIR}/${MANIFEST}
+	${MKDIR} ${EMACSDIR}/pkginfo
+	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+		${EMACSDIR}/pkginfo/
+.endif
+
 .include <bsd.port.mk>
diff --git a/japanese/lookup-mule/Makefile b/japanese/lookup-mule/Makefile
index 825eb9f9fc35..2440ef06218a 100644
--- a/japanese/lookup-mule/Makefile
+++ b/japanese/lookup-mule/Makefile
@@ -20,20 +20,26 @@ FILESDIR=	${.CURDIR}/../lookup-mule/files
 PKGDIR=		${.CURDIR}/../lookup-mule/pkg
 PLIST=		${.CURDIR}/pkg/PLIST
 PATCHDIR=	${.CURDIR}/patches
-ELISPDIR?=	${PREFIX}/share/emacs/site-lisp/lookup
-PORTINFODIR?=	${PREFIX}/info
 EMACS?=		mule
 
 .if (${EMACS} == "xemacs")
-BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs
+BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs \
+		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages
+EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
+ELISPDIR=	${EMACSDIR}/lisp/lookup
+PORTINFODIR=	${EMACSDIR}/info
+MANIFEST=	MANIFEST.lookup
 DO_MAKEINFO=	${SETENV} LANG=ja_JP.EUC xemacs -no-site-file -no-init-file \
-		-batch lookup.texi -e texinfo-format-buffer -f save-buffer; \
+		-batch -l texinfmt -f batch-texinfo-format lookup.texi; \
 		${ECHO} "INFO-DIR-SECTION The Emacs editor and associated tools" >> lookup.info; \
 		${ECHO} "START-INFO-DIR-ENTRY" >> lookup.info; \
 		${ECHO} "* Lookup: (lookup).             Lookup, a Search Interface." >> lookup.info; \
 		${ECHO} "END-INFO-DIR-ENTRY" >> lookup.info
 .else
 DO_MAKEINFO=	makeinfo --no-split --no-validate lookup.texi
+EMACSDIR=	${PREFIX}/share/emacs/site-lisp
+ELISPDIR=	${EMACSDIR}/lookup
+PORTINFODIR=	${PREFIX}/info
 .endif
 
 do-build:
@@ -45,7 +51,7 @@ do-build:
 	)
 
 do-install:
-	${MKDIR} ${ELISPDIR}
+	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
@@ -54,4 +60,15 @@ do-install:
 	install-info ${PORTINFODIR}/lookup.info ${PORTINFODIR}/dir
 	${SED} -e 's,%%ELISPDIR%%,${ELISPDIR},' ${FILESDIR}/lookup-startup.el.tmpl > ${ELISPDIR}/../lookup-startup.el
 
+.if (${EMACS} == "xemacs")
+post-install:
+	${RM} -f ${WRKDIR}/${MANIFEST}
+	emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
+	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
+		${SED} -e "s;^${EMACSDIR}/;;" > ${WRKDIR}/${MANIFEST}
+	${MKDIR} ${EMACSDIR}/pkginfo
+	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+		${EMACSDIR}/pkginfo/
+.endif
+
 .include <bsd.port.mk>
diff --git a/japanese/lookup-xemacs/Makefile b/japanese/lookup-xemacs/Makefile
index e57cc75c1db4..6784ef9703d1 100644
--- a/japanese/lookup-xemacs/Makefile
+++ b/japanese/lookup-xemacs/Makefile
@@ -10,8 +10,6 @@ PKGNAME=	ja-lookup-xemacs-1.0
 
 MASTERDIR=	${.CURDIR}/../lookup-mule
 EMACS=		xemacs
-ELISPDIR=	${PREFIX}/lib/xemacs/site-lisp/lookup
-PORTINFODIR=	${PREFIX}/lib/xemacs/info
 
 .if defined(PARALLEL_PACKAGE_BUILD)
 FORBIDDEN=	hang
diff --git a/japanese/lookup-xemacs/pkg-plist b/japanese/lookup-xemacs/pkg-plist
index 865d11da8a20..218df1c99444 100644
--- a/japanese/lookup-xemacs/pkg-plist
+++ b/japanese/lookup-xemacs/pkg-plist
@@ -1,30 +1,28 @@
-lib/xemacs/site-lisp/lookup-startup.el
-lib/xemacs/site-lisp/lookup/evi-mule.el
-lib/xemacs/site-lisp/lookup/evi.el
-lib/xemacs/site-lisp/lookup/lookup-content.el
-lib/xemacs/site-lisp/lookup/lookup-entry.el
-lib/xemacs/site-lisp/lookup/lookup-package.el
-lib/xemacs/site-lisp/lookup/lookup-select.el
-lib/xemacs/site-lisp/lookup/lookup-types.el
-lib/xemacs/site-lisp/lookup/lookup-utils.el
-lib/xemacs/site-lisp/lookup/lookup-vars.el
-lib/xemacs/site-lisp/lookup/lookup-vse.el
-lib/xemacs/site-lisp/lookup/lookup.el
-lib/xemacs/site-lisp/lookup/ndcookie.el
-lib/xemacs/site-lisp/lookup/ndeb.el
-lib/xemacs/site-lisp/lookup/ndic.el
-lib/xemacs/site-lisp/lookup/ndict.el
-lib/xemacs/site-lisp/lookup/ndkks.el
-lib/xemacs/site-lisp/lookup/ndmisc.el
-lib/xemacs/site-lisp/lookup/ndspell.el
-lib/xemacs/site-lisp/lookup/ndsrd.el
-lib/xemacs/site-lisp/lookup/ndtp.el
-lib/xemacs/site-lisp/lookup/sdicf.el
-lib/xemacs/site-lisp/lookup/stem-english.el
-@unexec install-info  --delete %D/lib/xemacs/info/lookup.info %D/lib/xemacs/info/dir
-lib/xemacs/info/lookup.info
-lib/xemacs/info/lookup.info-1
-lib/xemacs/info/lookup.info-2
-@exec [ -f %D/lib/xemacs/info/dir ] || mkdir -p %D/lib/xemacs/info; sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/lib/xemacs/info/dir
-@exec install-info %D/lib/xemacs/info/lookup.info %D/lib/xemacs/info/dir
-@dirrm lib/xemacs/site-lisp/lookup
+lib/xemacs/site-packages/lisp/lookup-startup.el
+lib/xemacs/site-packages/lisp/lookup/evi-mule.el
+lib/xemacs/site-packages/lisp/lookup/evi.el
+lib/xemacs/site-packages/lisp/lookup/lookup-content.el
+lib/xemacs/site-packages/lisp/lookup/lookup-entry.el
+lib/xemacs/site-packages/lisp/lookup/lookup-package.el
+lib/xemacs/site-packages/lisp/lookup/lookup-select.el
+lib/xemacs/site-packages/lisp/lookup/lookup-types.el
+lib/xemacs/site-packages/lisp/lookup/lookup-utils.el
+lib/xemacs/site-packages/lisp/lookup/lookup-vars.el
+lib/xemacs/site-packages/lisp/lookup/lookup-vse.el
+lib/xemacs/site-packages/lisp/lookup/lookup.el
+lib/xemacs/site-packages/lisp/lookup/ndcookie.el
+lib/xemacs/site-packages/lisp/lookup/ndeb.el
+lib/xemacs/site-packages/lisp/lookup/ndic.el
+lib/xemacs/site-packages/lisp/lookup/ndict.el
+lib/xemacs/site-packages/lisp/lookup/ndkks.el
+lib/xemacs/site-packages/lisp/lookup/ndmisc.el
+lib/xemacs/site-packages/lisp/lookup/ndspell.el
+lib/xemacs/site-packages/lisp/lookup/ndsrd.el
+lib/xemacs/site-packages/lisp/lookup/ndtp.el
+lib/xemacs/site-packages/lisp/lookup/sdicf.el
+lib/xemacs/site-packages/lisp/lookup/stem-english.el
+lib/xemacs/site-packages/pkginfo/MANIFEST.lookup
+@unexec install-info  --delete %D/lib/xemacs/site-packages/info/lookup.info %D/lib/xemacs/site-packages/info/dir
+lib/xemacs/site-packages/info/lookup.info
+@exec install-info %D/lib/xemacs/info/lookup.info %D/lib/xemacs/site-packages/info/dir
+@dirrm lib/xemacs/site-packages/lisp/lookup
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index 825eb9f9fc35..2440ef06218a 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -20,20 +20,26 @@ FILESDIR=	${.CURDIR}/../lookup-mule/files
 PKGDIR=		${.CURDIR}/../lookup-mule/pkg
 PLIST=		${.CURDIR}/pkg/PLIST
 PATCHDIR=	${.CURDIR}/patches
-ELISPDIR?=	${PREFIX}/share/emacs/site-lisp/lookup
-PORTINFODIR?=	${PREFIX}/info
 EMACS?=		mule
 
 .if (${EMACS} == "xemacs")
-BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs
+BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs \
+		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages
+EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
+ELISPDIR=	${EMACSDIR}/lisp/lookup
+PORTINFODIR=	${EMACSDIR}/info
+MANIFEST=	MANIFEST.lookup
 DO_MAKEINFO=	${SETENV} LANG=ja_JP.EUC xemacs -no-site-file -no-init-file \
-		-batch lookup.texi -e texinfo-format-buffer -f save-buffer; \
+		-batch -l texinfmt -f batch-texinfo-format lookup.texi; \
 		${ECHO} "INFO-DIR-SECTION The Emacs editor and associated tools" >> lookup.info; \
 		${ECHO} "START-INFO-DIR-ENTRY" >> lookup.info; \
 		${ECHO} "* Lookup: (lookup).             Lookup, a Search Interface." >> lookup.info; \
 		${ECHO} "END-INFO-DIR-ENTRY" >> lookup.info
 .else
 DO_MAKEINFO=	makeinfo --no-split --no-validate lookup.texi
+EMACSDIR=	${PREFIX}/share/emacs/site-lisp
+ELISPDIR=	${EMACSDIR}/lookup
+PORTINFODIR=	${PREFIX}/info
 .endif
 
 do-build:
@@ -45,7 +51,7 @@ do-build:
 	)
 
 do-install:
-	${MKDIR} ${ELISPDIR}
+	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
@@ -54,4 +60,15 @@ do-install:
 	install-info ${PORTINFODIR}/lookup.info ${PORTINFODIR}/dir
 	${SED} -e 's,%%ELISPDIR%%,${ELISPDIR},' ${FILESDIR}/lookup-startup.el.tmpl > ${ELISPDIR}/../lookup-startup.el
 
+.if (${EMACS} == "xemacs")
+post-install:
+	${RM} -f ${WRKDIR}/${MANIFEST}
+	emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
+	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
+		${SED} -e "s;^${EMACSDIR}/;;" > ${WRKDIR}/${MANIFEST}
+	${MKDIR} ${EMACSDIR}/pkginfo
+	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+		${EMACSDIR}/pkginfo/
+.endif
+
 .include <bsd.port.mk>