* List info files directly in the PLIST and honor PKGINFODIR.

* Centralize directory creation during do-install in INSTALLATION_DIRS.
* Don't install *.orig files.
* Fix PLIST problems if using xemacs instead of emacs.

Bump PKGREVISION to 4 for PLIST changes.

2 files changed, 24 insertions, 26 deletions

diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index a4a0fc81bdb..e94c03b3a75 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/05 06:25:52 jlam Exp $
 #
 
 DISTNAME=	twelf-1-4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.cmu.edu/~twelf/dist/
 
@@ -24,7 +24,7 @@ MAKEFILE=	smlnj/Makefile
 MAKEFLAGS+=	sml=${PREFIX:Q}/bin/sml
 BUILD_TARGET=	twelf-server twelf-sml
 
-INFO_FILES=		twelf.info
+INFO_FILES=		# PLIST
 
 TWELF_LIBDIR=		${PREFIX}/lib/twelf
 TWELF_EMACSDIR=		${EMACS_LISPPREFIX}/twelf
@@ -34,7 +34,10 @@ TWELF_EXAMPLEDIR=	${PREFIX}/share/examples/twelf
 
 .include "../../lang/smlnj/Makefile.common"
 
-INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	bin ${PKGINFODIR}				\
+			${TWELF_LIBDIR} ${TWELF_EMACSDIR}		\
+			${TWELF_DOCDIR} ${TWELF_HTMLDIR}		\
+			${TWELF_EXAMPLEDIR}
 
 post-extract:
 	${CHMOD} -R +r ${WRKSRC}
@@ -46,31 +49,28 @@ post-patch:
 		${WRKSRC}/${f}.orig > ${WRKSRC}/${f}
 .endfor
 
-pre-install:
-	${RM} -f ${WRKSRC}/bin/.mkexec.orig ${WRKSRC}/doc/info/*.orig
+post-build:
+	find ${WRKSRC} -name "*.orig" | xargs rm
 
 do-install:
-	${INSTALL_DATA_DIR} ${TWELF_LIBDIR}
 	cd ${WRKSRC} && ${PAX} -rw -pam bin ${TWELF_LIBDIR}
 	${LN} -sf ${TWELF_LIBDIR}/bin/* ${PREFIX}/bin
 
-	${INSTALL_DATA_DIR} ${TWELF_EMACSDIR}
 	cd ${WRKSRC}/emacs && ${PAX} -rw -pam * ${TWELF_EMACSDIR}
 	${LN} -sf ${TWELF_EMACSDIR} ${TWELF_LIBDIR}/emacs
 
-	${INSTALL_DATA_DIR} ${TWELF_DOCDIR}
-	cd ${WRKSRC}/doc && 						\
-	for t in dvi pdf ps; do						\
-	   ${INSTALL_DATA} $${t}/twelf.$${t} ${TWELF_DOCDIR};		\
+	cd ${WRKSRC}/doc; for t in dvi pdf ps; do			\
+		${INSTALL_DATA} $${t}/twelf.$${t} ${TWELF_DOCDIR};	\
 	done
 	${LN} -sf ${TWELF_DOCDIR} ${TWELF_LIBDIR}/doc
 
-	cd ${WRKSRC}/doc/info && ${PAX} -rw -pam * ${PREFIX}/info
+	cd ${WRKSRC}/doc/info; for f in *.info *.info-[0-9]*; do	\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
-	${INSTALL_DATA_DIR} ${TWELF_HTMLDOCDIR}
 	cd ${WRKSRC}/doc/html && ${PAX} -rw -pam * ${TWELF_HTMLDOCDIR}
 
-	${INSTALL_DATA_DIR} ${TWELF_EXAMPLEDIR}
 	cd ${WRKSRC}/examples && ${PAX} -rw -pam * ${TWELF_EXAMPLEDIR}
 	${LN} -sf ${TWELF_EXAMPLEDIR} ${TWELF_LIBDIR}/examples
 
diff --git a/lang/twelf/PLIST b/lang/twelf/PLIST
index b0c222c38f7..588d5dd1c8b 100644
--- a/lang/twelf/PLIST
+++ b/lang/twelf/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/07 17:47:22 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:25:52 jlam Exp $
 bin/twelf-server
 bin/twelf-sml
+info/twelf.info
 lib/twelf/bin/.dbase/README
 lib/twelf/bin/.heap/README
 lib/twelf/bin/.heap/twelf-server.${BOX}-${OS}
@@ -15,6 +16,12 @@ lib/twelf/bin/twelf-sml
 lib/twelf/doc
 lib/twelf/emacs
 lib/twelf/examples
+${EMACS_LISPPREFIX}/twelf/README
+${EMACS_LISPPREFIX}/twelf/auc-menu.el
+${EMACS_LISPPREFIX}/twelf/twelf-font.el
+${EMACS_LISPPREFIX}/twelf/twelf-hilit.el
+${EMACS_LISPPREFIX}/twelf/twelf-init.el
+${EMACS_LISPPREFIX}/twelf/twelf.el
 share/doc/html/twelf/index.html
 share/doc/html/twelf/twelf_1.html
 share/doc/html/twelf/twelf_10.html
@@ -37,13 +44,6 @@ share/doc/html/twelf/twelf_toc.html
 share/doc/twelf/twelf.dvi
 share/doc/twelf/twelf.pdf
 share/doc/twelf/twelf.ps
-share/emacs/site-lisp/twelf/README
-share/emacs/site-lisp/twelf/auc-menu.el
-share/emacs/site-lisp/twelf/twelf-font.el
-share/emacs/site-lisp/twelf/twelf-hilit.el
-share/emacs/site-lisp/twelf/twelf-init.el
-share/emacs/site-lisp/twelf/twelf-init.el.orig
-share/emacs/site-lisp/twelf/twelf.el
 share/examples/twelf/README
 share/examples/twelf/arith/README
 share/examples/twelf/arith/arith.elf
@@ -159,7 +159,6 @@ share/examples/twelf/cpsocc/def16.elf
 share/examples/twelf/cpsocc/def3+6+fig5.elf
 share/examples/twelf/cpsocc/dsBNF.elf
 share/examples/twelf/cpsocc/examples.quy
-share/examples/twelf/cpsocc/examples.quy.orig
 share/examples/twelf/cpsocc/fig1.elf
 share/examples/twelf/cpsocc/fig10.elf
 share/examples/twelf/cpsocc/fig11.elf
@@ -176,7 +175,6 @@ share/examples/twelf/cpsocc/load.sml
 share/examples/twelf/cpsocc/sources.cfg
 share/examples/twelf/cpsocc/test.cfg
 share/examples/twelf/cpsocc/test.quy
-share/examples/twelf/cpsocc/test.quy.orig
 share/examples/twelf/cpsocc/th10.elf
 share/examples/twelf/cpsocc/th15.elf
 share/examples/twelf/cpsocc/th18.elf
@@ -393,9 +391,9 @@ share/examples/twelf/tabled/tests/test7.elf
 @dirrm share/examples/twelf/ccc
 @dirrm share/examples/twelf/arith
 @dirrm share/examples/twelf
-@dirrm share/emacs/site-lisp/twelf
 @dirrm share/doc/twelf
 @dirrm share/doc/html/twelf
+@dirrm ${EMACS_LISPPREFIX}/twelf
 @dirrm lib/twelf/bin/.heap
 @dirrm lib/twelf/bin/.dbase
 @dirrm lib/twelf/bin