* Move info file entries into the PLIST.

* Honor PKGINFODIR and EMACS_INFOPREFIX.

31 files changed, 65 insertions, 67 deletions

diff --git a/devel/guile-oops/Makefile b/devel/guile-oops/Makefile
index 5fb8618680f..c5ff7d72aeb 100644
--- a/devel/guile-oops/Makefile
+++ b/devel/guile-oops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/31 05:37:08 jlam Exp $
 #
 
 DISTNAME=	guile-oops-0.9.0
@@ -14,7 +14,7 @@ CONFLICTS=	guile>1.4
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-INFO_FILES=		goops.info
+INFO_FILES=		# PLIST
 
 .include "../../lang/guile14/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-oops/PLIST b/devel/guile-oops/PLIST
index 738eac0e0a4..fba602c00ac 100644
--- a/devel/guile-oops/PLIST
+++ b/devel/guile-oops/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2004/10/14 15:31:40 tv Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 05:37:08 jlam Exp $
 bin/guile-oops
 include/goops-snarf.h
 include/goops.h
 include/goops/versiondat.h
+info/goops.info
 lib/libgoopscore.la
 share/guile/oop/goops.scm
 share/guile/oop/goops/active-slot.scm
diff --git a/devel/guile-www/Makefile b/devel/guile-www/Makefile
index 998e15e9555..3f61b96cf36 100644
--- a/devel/guile-www/Makefile
+++ b/devel/guile-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 05:37:08 jlam Exp $
 
 DISTNAME=	guile-www-2.13
 PKGREVISION=	1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.glug.org/people/ttn/software/guile-www/
 COMMENT=	Guile WWW module
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	guile-www.info
+INFO_FILES=	# PLIST
 
 .include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-www/PLIST b/devel/guile-www/PLIST
index b42ea4387b6..fcbe7c52ab4 100644
--- a/devel/guile-www/PLIST
+++ b/devel/guile-www/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2005/10/17 00:03:35 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 05:37:08 jlam Exp $
+info/guile-www.info
 share/guile/site/www/cgi
 share/guile/site/www/data/content-type
 share/guile/site/www/data/http-status
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index 5e8b4adc510..8f52104cae8 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/03/31 05:37:08 jlam Exp $
 #
 
 DISTNAME=	isect-1.6.2
@@ -13,20 +13,19 @@ COMMENT=	Open source middleware daemon
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 PTHREAD_OPTS+=		require
-INFO_FILES=		isect.info
+INFO_FILES=		# PLIST
 
 RCD_SCRIPTS=	isect
 
 DOCDIR=		${PREFIX}/share/doc/isect
 EGDIR=		${PREFIX}/share/examples/isect
 
+INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	for file in ${WRKSRC}/doc/*.html; do \
 		${INSTALL_DATA} $${file} ${DOCDIR}; \
 	done
-
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${EGDIR}
 
 .include "../../www/libwww/buildlink3.mk"
diff --git a/devel/isect/PLIST b/devel/isect/PLIST
index 335df2eec03..ffe2941eab9 100644
--- a/devel/isect/PLIST
+++ b/devel/isect/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/10/23 16:03:11 rillig Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/31 05:37:08 jlam Exp $
 bin/isdcat
 bin/isdcfgck
 bin/isdclient
@@ -12,6 +12,7 @@ include/isect_io_IsdIO.h
 include/libisect.h
 include/queues.h
 include/tabfuncs.h
+info/isect.info
 lib/libisdio.la
 lib/libisect.la
 sbin/isdexecd
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 01af1e0d40d..dd471d4b076 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/12 18:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/31 05:37:08 jlam Exp $
 
 DISTNAME=	libidn-0.6.3
 CATEGORIES=	devel
@@ -15,12 +15,11 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		makeinfo pkg-config perl:build
 GNU_CONFIGURE=		yes
+INFO_FILES=		# PLIST
 
 PKGCONFIG_OVERRIDE+=	libidn.pc.in
 TEST_TARGET=		check
 
-INFO_FILES=		libidn.info
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
diff --git a/devel/libidn/PLIST b/devel/libidn/PLIST
index 867ca2d6a2a..f3838b6ef29 100644
--- a/devel/libidn/PLIST
+++ b/devel/libidn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/10/25 13:24:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/31 05:37:08 jlam Exp $
 bin/idn
 include/idn-free.h
 include/idn-int.h
@@ -7,6 +7,7 @@ include/pr29.h
 include/punycode.h
 include/stringprep.h
 include/tld.h
+info/libidn.info
 lib/libidn.la
 lib/pkgconfig/libidn.pc
 man/man1/idn.1
diff --git a/devel/libjit/Makefile b/devel/libjit/Makefile
index b1d88303400..a4c4d635bdf 100644
--- a/devel/libjit/Makefile
+++ b/devel/libjit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/31 05:37:08 jlam Exp $
 #
 
 DISTNAME=	libjit-0.0.4
@@ -13,7 +13,7 @@ COMMENT=	Just-In-Time compilation functionality
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
-INFO_FILES=		libjit.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libjit/PLIST b/devel/libjit/PLIST
index 4dddcecf3e5..4b01a3e7f56 100644
--- a/devel/libjit/PLIST
+++ b/devel/libjit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/22 15:51:02 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/31 05:37:08 jlam Exp $
 include/jit/jit-apply.h
 include/jit/jit-block.h
 include/jit/jit-common.h
@@ -22,6 +22,7 @@ include/jit/jit-util.h
 include/jit/jit-value.h
 include/jit/jit-walk.h
 include/jit/jit.h
+info/libjit.info
 lib/libjit.la
 lib/libjitdynamic.la
 lib/libjitplus.la
diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile
index 3185749e8a4..66558737655 100644
--- a/devel/libtool-info/Makefile
+++ b/devel/libtool-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 05:37:08 jlam Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT=	Generic shared library support script - info pages
 CONFLICTS+=	libtool<1.3.5nb11
 
 USE_TOOLS+=	makeinfo
-INFO_FILES=	libtool.info
+INFO_FILES=	# PLIST
 
 do-build:
 	cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
diff --git a/devel/libtool-info/PLIST b/devel/libtool-info/PLIST
index 3352ffec3f5..0e70be50417 100644
--- a/devel/libtool-info/PLIST
+++ b/devel/libtool-info/PLIST
@@ -1 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/16 13:00:53 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:08 jlam Exp $
+info/libtool.info
diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST
index 847d5cd2d16..2df0369982a 100644
--- a/devel/monotone/PLIST
+++ b/devel/monotone/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2005/12/31 11:33:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:09 jlam Exp $
 bin/monotone
+info/monotone.info
 man/man1/monotone.1
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/monotone.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/monotone.mo
diff --git a/devel/nana/Makefile b/devel/nana/Makefile
index 61e7e159474..0c5cb580930 100644
--- a/devel/nana/Makefile
+++ b/devel/nana/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/31 05:37:09 jlam Exp $
 
 DISTNAME=	nana-2.4
 CATEGORIES=	devel
@@ -8,9 +8,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cs.ntu.edu.au/homepages/pjm/nana-home/
 COMMENT=	Improved support for assertions and logging in C and C++
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	nana.info
 USE_LANGUAGES=	c c++
+GNU_CONFIGURE=	yes
+INFO_FILES=	# PLIST
 
 NOT_FOR_COMPILER=	sunpro
 
diff --git a/devel/nana/PLIST b/devel/nana/PLIST
index bdd36294944..414ff496a1f 100644
--- a/devel/nana/PLIST
+++ b/devel/nana/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/16 13:08:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:09 jlam Exp $
 bin/nana
 bin/nana-c++lg
 bin/nana-clg
@@ -23,6 +23,7 @@ include/nana-config.h
 include/nana.h
 include/nana_error.h
 include/now.h
+info/nana.info
 lib/libnana.a
 libexec/nana-trace.gdb
 libexec/nanafilter
diff --git a/devel/nana/distinfo b/devel/nana/distinfo
index 270609e056a..62693a0a31b 100644
--- a/devel/nana/distinfo
+++ b/devel/nana/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:21 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/03/31 05:37:09 jlam Exp $
 
 SHA1 (nana-2.4.tar.gz) = a1679889fe43da2d25e70974ace6d1f2a44568e0
 RMD160 (nana-2.4.tar.gz) = 135a4025fc1b24ae5d1613970490eae053e70292
 Size (nana-2.4.tar.gz) = 345014 bytes
-SHA1 (patch-aa) = e16c34a228037451fba97f8fc653f9b9000149c0
diff --git a/devel/nana/patches/patch-aa b/devel/nana/patches/patch-aa
deleted file mode 100644
index 566b881ec12..00000000000
--- a/devel/nana/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/06/23 11:32:02 seb Exp $
-
---- doc/Makefile.in.orig	1999-05-03 10:29:55.000000000 +0000
-+++ doc/Makefile.in
-@@ -73,7 +73,6 @@ FIND = @FIND@
- FMT = @FMT@
- GDB = @GDB@
- HAVE_RDTSC = @HAVE_RDTSC@
--MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- PREV_VERSION = @PREV_VERSION@
- RANLIB = @RANLIB@
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 802a9aeaa13..e470532d38c 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/31 05:37:09 jlam Exp $
 
 DISTNAME=	nasm-0.98.39
 PKGREVISION=	2
@@ -16,14 +16,14 @@ USE_TOOLS+=		gmake makeinfo perl
 GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
 
-INFO_FILES=		nasm.info
+INFO_FILES=		# PLIST
 BUILD_TARGET=		everything
 INSTALL_TARGET=		install_everything
 
 MAKE_ENV+=	PERL5=${PERL5:Q}			\
 		INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
 
-INSTALLATION_DIRS=	bin info ${PKGMANDIR}/man1 share/doc/html
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/html
 
 .include "../../mk/compiler.mk"
 
diff --git a/devel/nasm/PLIST b/devel/nasm/PLIST
index 4ecff2f00a0..e1751e17243 100644
--- a/devel/nasm/PLIST
+++ b/devel/nasm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/25 11:42:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:09 jlam Exp $
 bin/ldrdf
 bin/nasm
 bin/ndisasm
@@ -8,6 +8,7 @@ bin/rdf2ihx
 bin/rdfdump
 bin/rdflib
 bin/rdx
+info/nasm.info
 man/man1/nasm.1
 man/man1/ndisasm.1
 share/doc/html/nasm/nasmdo10.html
diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile
index 585150b26f6..b96f6447f39 100644
--- a/devel/papaya/Makefile
+++ b/devel/papaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/30 23:16:10 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/31 05:37:09 jlam Exp $
 #
 
 DISTNAME=	papaya-0.1.7
@@ -20,7 +20,7 @@ CONFIGURE_ENV+=	sh_command=${TOOLS_SH:Q}
 CONFIGURE_ENV+=	tar_command=${TOOLS_TAR:Q}
 CONFIGURE_ENV+=	texi2html_command=${TOOLS_PATH.texi2html:Q}
 USE_TOOLS+=	sh perl:run tar texi2html
-INFO_FILES=	papaya.info
+INFO_FILES=	# PLIST
 
 CONFIGURE_ENV+=	perl_command=${PERL5:Q}
 
diff --git a/devel/papaya/PLIST b/devel/papaya/PLIST
index 488759dfe69..205de1b4429 100644
--- a/devel/papaya/PLIST
+++ b/devel/papaya/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/02 14:11:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:09 jlam Exp $
 bin/add-html-signature
 bin/compare-version
 bin/copy-if-changed
@@ -20,6 +20,7 @@ bin/recursive-make
 bin/search-exec
 bin/search-package
 bin/texi2html-wrapper
+info/papaya.info
 libexec/papaya-lib.pl
 libexec/papaya-lib.sh
 share/doc/papaya/Copying.html
diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index eef89695062..9cfeda8a4fd 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/14 20:30:00 kristerw Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/31 05:37:09 jlam Exp $
 #
 
 DISTNAME=	pcl-cvs-2.9.9
@@ -26,7 +26,7 @@ PKG_SKIP_REASON+=	"${PKGNAME} is only for emacs20"
 
 MAKE_ENV+=	PREFIX=${PREFIX:Q}
 BUILD_TARGET= 	default
-INFO_FILES=	pcl-cvs.info
+INFO_FILES=	# PLIST
 MESSAGE_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pcl-cvs/PLIST b/devel/pcl-cvs/PLIST
index e7ca4cc52f0..6c8c7bcf32d 100644
--- a/devel/pcl-cvs/PLIST
+++ b/devel/pcl-cvs/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/16 14:47:18 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:09 jlam Exp $
+${EMACS_INFOPREFIX}/pcl-cvs.info
 ${EMACS_LISPPREFIX}/pcl-cvs/cvs-compat.el
 ${EMACS_LISPPREFIX}/pcl-cvs/cvs-compat.elc
 ${EMACS_LISPPREFIX}/pcl-cvs/cvs-edit.el
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 274291b436a..cddb1c4286c 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/31 03:56:30 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/31 05:37:09 jlam Exp $
 
 DISTNAME= 		prcs-1.3.3
 PKGREVISION=		3
@@ -11,7 +11,7 @@ COMMENT=		Project Revision Control System
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		lispdir=${PREFIX}/share/examples/prcs
-INFO_FILES=		prcs.info
+INFO_FILES=		# PLIST
 USE_LANGUAGES=		c c++
 CONFIGURE_ENV+=		EMACS=no
 CONFIGURE_ENV+=		PRCS_REPOSITORY=${VARBASE:Q}/PRCS
diff --git a/devel/prcs/PLIST b/devel/prcs/PLIST
index 68519cb92e7..d405d02a93d 100644
--- a/devel/prcs/PLIST
+++ b/devel/prcs/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2004/06/25 16:43:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 05:37:09 jlam Exp $
 bin/prcs
 bin/prcs-callback
 bin/prcs-emerge
 bin/prcs-ediff
+info/prcs.info
 man/man1/prcs.1
 man/man1/prcs-callback.1
 man/man1/prcs-emerge.1
diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile
index 6007c5e9812..51bff5cf146 100644
--- a/devel/sml-mode/Makefile
+++ b/devel/sml-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/31 05:37:09 jlam Exp $
 
 DISTNAME=	sml-mode-3.9.5
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,15 +11,14 @@ COMMENT=	Emacs mode for editing Standard ML source code
 
 BUILD_TARGET=	default
 
-INFO_FILES=	sml-mode.info
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	info
+INSTALLATION_DIRS=	${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/sml-mode
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/sml-mode
 	cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc README NEWS TODO \
 		ChangeLog ${EMACS_LISPPREFIX}/sml-mode
-	${INSTALL_DATA} ${WRKSRC}/sml-mode.info ${PREFIX}/info
+	${INSTALL_DATA} ${WRKSRC}/sml-mode.info ${EMACS_INFOPREFIX}
 
 .include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/sml-mode/PLIST b/devel/sml-mode/PLIST
index cbaa655be88..b113253ed5b 100644
--- a/devel/sml-mode/PLIST
+++ b/devel/sml-mode/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/05/08 15:10:58 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 05:37:09 jlam Exp $
+${EMACS_INFOPREFIX}/sml-mode.info
 ${EMACS_LISPPREFIX}/sml-mode/sml-compat.el
 ${EMACS_LISPPREFIX}/sml-mode/sml-defs.el
 ${EMACS_LISPPREFIX}/sml-mode/sml-mode-startup.el
diff --git a/devel/treecc/Makefile b/devel/treecc/Makefile
index 39930bf37ef..6a3636e5480 100644
--- a/devel/treecc/Makefile
+++ b/devel/treecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/31 05:37:09 jlam Exp $
 #
 
 DISTNAME=	treecc-0.3.6
@@ -12,6 +12,6 @@ COMMENT=	DotGNU Portable.NET aspect-oriented programming tool
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake makeinfo
-INFO_FILES=	treecc.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/treecc/PLIST b/devel/treecc/PLIST
index 169b5af3fe8..fec09740fb0 100644
--- a/devel/treecc/PLIST
+++ b/devel/treecc/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/12 17:10:10 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/31 05:37:09 jlam Exp $
 bin/treecc
+info/treecc.info
 man/man1/treecc.1
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index 011664e5656..9a1c763f7aa 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/31 05:37:09 jlam Exp $
 #
 
 DISTNAME=		xdelta-1.1.1
@@ -11,10 +11,9 @@ HOMEPAGE=		http://www.xcf.berkeley.edu/~jmacd/xdelta.html
 COMMENT=		Enhanced diff that works on binary files
 
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
-INFO_FILES=		xdelta.info
+INFO_FILES=		# PLIST
 
 .include "../../devel/glib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/xdelta/PLIST b/devel/xdelta/PLIST
index 031af65b3cc..26b519bea5a 100644
--- a/devel/xdelta/PLIST
+++ b/devel/xdelta/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/23 16:03:11 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 05:37:09 jlam Exp $
 bin/edsio-comp
 bin/xdelta
 bin/xdelta-config
@@ -6,6 +6,7 @@ include/edsio.h
 include/edsio_edsio.h
 include/xd_edsio.h
 include/xdelta.h
+info/xdelta.info
 lib/libedsio.la
 lib/libxdelta.la
 man/man1/xdelta.1