Install documentation in pkgsrc canonical directories.

Add directory entry to twelf.info via patch file.
Avoid patch backup files to be installed.
Convert to USE_NEW_TEXINFO.

Bump PKGREVISION.

4 files changed, 66 insertions, 40 deletions

diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index aa4a5a0d41a..6098cada300 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/07 23:33:49 seb Exp $
 #
 
 DISTNAME=	twelf-1-4
 PKGNAME=	twelf-1.4
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/twelf
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.cmu.edu/~twelf/dist/
@@ -23,9 +24,13 @@ MAKEFILE=	smlnj/Makefile
 MAKEFLAGS+=	sml=${PREFIX:Q}/bin/sml
 ALL_TARGET=	twelf-server twelf-sml
 
+USE_NEW_TEXINFO=	YES
+INFO_FILES=		twelf.info
+
 TWELF_LIBDIR=		${PREFIX}/lib/twelf
 TWELF_EMACSDIR=		${EMACS_LISPPREFIX}/twelf
 TWELF_DOCDIR=		${PREFIX}/share/doc/twelf
+TWELF_HTMLDOCDIR=	${PREFIX}/share/doc/html/twelf
 TWELF_EXAMPLEDIR=	${PREFIX}/share/examples/twelf
 
 .include "../../lang/smlnj/Makefile.common"
@@ -40,6 +45,9 @@ post-patch:
 		${WRKSRC}/${f}.orig > ${WRKSRC}/${f}
 .endfor
 
+pre-install:
+	${RM} -f ${WRKSRC}/bin/.mkexec.orig ${WRKSRC}/doc/info/*.orig
+
 do-install:
 	${INSTALL_DATA_DIR} ${TWELF_LIBDIR}
 	cd ${WRKSRC} && ${PAX} -rw -pam bin ${TWELF_LIBDIR}
@@ -50,13 +58,20 @@ do-install:
 	${LN} -sf ${TWELF_EMACSDIR} ${TWELF_LIBDIR}/emacs
 
 	${INSTALL_DATA_DIR} ${TWELF_DOCDIR}
-	cd ${WRKSRC}/doc && ${PAX} -rw -pam * ${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
+
+	${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
 
 .include "../../mk/emacs.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/twelf/PLIST b/lang/twelf/PLIST
index 4d60b37108a..07478be0f32 100644
--- a/lang/twelf/PLIST
+++ b/lang/twelf/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/22 22:41:23 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/07 23:33:49 seb Exp $
 bin/twelf-server
 bin/twelf-sml
+info/twelf.info
+info/twelf.info-1
+info/twelf.info-2
+info/twelf.info-3
+info/twelf.info-4
+info/twelf.info-5
 lib/twelf/bin/.dbase/README
 lib/twelf/bin/.heap/README
 lib/twelf/bin/.heap/twelf-server.${BOX}-${OS}
@@ -15,36 +21,28 @@ lib/twelf/bin/twelf-sml
 lib/twelf/doc
 lib/twelf/emacs
 lib/twelf/examples
-share/doc/twelf/dvi/twelf.dvi
-share/doc/twelf/html/index.html
-share/doc/twelf/html/twelf_1.html
-share/doc/twelf/html/twelf_10.html
-share/doc/twelf/html/twelf_11.html
-share/doc/twelf/html/twelf_12.html
-share/doc/twelf/html/twelf_13.html
-share/doc/twelf/html/twelf_14.html
-share/doc/twelf/html/twelf_15.html
-share/doc/twelf/html/twelf_16.html
-share/doc/twelf/html/twelf_17.html
-share/doc/twelf/html/twelf_2.html
-share/doc/twelf/html/twelf_3.html
-share/doc/twelf/html/twelf_4.html
-share/doc/twelf/html/twelf_5.html
-share/doc/twelf/html/twelf_6.html
-share/doc/twelf/html/twelf_7.html
-share/doc/twelf/html/twelf_8.html
-share/doc/twelf/html/twelf_9.html
-share/doc/twelf/html/twelf_toc.html
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/share/doc/twelf/info/twelf.info
-share/doc/twelf/info/twelf.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/share/doc/twelf/info/twelf.info
-share/doc/twelf/info/twelf.info-1
-share/doc/twelf/info/twelf.info-2
-share/doc/twelf/info/twelf.info-3
-share/doc/twelf/info/twelf.info-4
-share/doc/twelf/info/twelf.info-5
-share/doc/twelf/pdf/twelf.pdf
-share/doc/twelf/ps/twelf.ps
+share/doc/html/twelf/index.html
+share/doc/html/twelf/twelf_1.html
+share/doc/html/twelf/twelf_10.html
+share/doc/html/twelf/twelf_11.html
+share/doc/html/twelf/twelf_12.html
+share/doc/html/twelf/twelf_13.html
+share/doc/html/twelf/twelf_14.html
+share/doc/html/twelf/twelf_15.html
+share/doc/html/twelf/twelf_16.html
+share/doc/html/twelf/twelf_17.html
+share/doc/html/twelf/twelf_2.html
+share/doc/html/twelf/twelf_3.html
+share/doc/html/twelf/twelf_4.html
+share/doc/html/twelf/twelf_5.html
+share/doc/html/twelf/twelf_6.html
+share/doc/html/twelf/twelf_7.html
+share/doc/html/twelf/twelf_8.html
+share/doc/html/twelf/twelf_9.html
+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
@@ -402,12 +400,8 @@ share/examples/twelf/tabled/tests/test7.elf
 @dirrm share/examples/twelf/arith
 @dirrm share/examples/twelf
 @dirrm share/emacs/site-lisp/twelf
-@dirrm share/doc/twelf/ps
-@dirrm share/doc/twelf/pdf
-@dirrm share/doc/twelf/info
-@dirrm share/doc/twelf/html
-@dirrm share/doc/twelf/dvi
 @dirrm share/doc/twelf
+@dirrm share/doc/html/twelf
 @dirrm lib/twelf/bin/.heap
 @dirrm lib/twelf/bin/.dbase
 @dirrm lib/twelf/bin
diff --git a/lang/twelf/distinfo b/lang/twelf/distinfo
index 932e3f077bf..4ffa8f7a13d 100644
--- a/lang/twelf/distinfo
+++ b/lang/twelf/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/22 22:41:23 kristerw Exp $
+$NetBSD: distinfo,v 1.2 2003/07/07 23:33:49 seb Exp $
 
 SHA1 (twelf-1-4.tar.gz) = 3476fc18b7d0596df2c9847102d239de3eae813b
 Size (twelf-1-4.tar.gz) = 1463158 bytes
 SHA1 (patch-aa) = f209e39ddc4d8d2099d6562429b51fea829b2bc8
 SHA1 (patch-ab) = 4e2fb0068dbae4dee50faaf376c6942e485b9612
+SHA1 (patch-ac) = f08767f423d2465556230a3f5fb632c67a7cda1a
diff --git a/lang/twelf/patches/patch-ac b/lang/twelf/patches/patch-ac
new file mode 100644
index 00000000000..2d5d899ee80
--- /dev/null
+++ b/lang/twelf/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2003/07/07 23:33:50 seb Exp $
+
+--- doc/info/twelf.info.orig	2002-12-28 02:39:40.000000000 +0000
++++ doc/info/twelf.info
+@@ -1,5 +1,11 @@
+ This is twelf.info, produced by makeinfo version 4.2 from twelf.texi.
+ 
++INFO-DIR-SECTION Languages
++START-INFO-DIR-ENTRY
++* Twelf: (twelf).       The Twelf meta-language for proving properties of
++                        languages and logics.
++END-INFO-DIR-ENTRY
++
+ 
+ Indirect:
+ twelf.info-1: 71