List the info files directly in the PLIST and honor PKG{INFO,MAN}DIR.

24 files changed, 51 insertions, 41 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 7375ad82e11..6fedf14f414 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/04/06 02:41:44 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2006/04/06 03:20:54 jlam Exp $
 
 DISTNAME=		arla-0.41
 PKGREVISION=		3
@@ -16,7 +16,7 @@ CONFLICTS+=		rx-[0-9]*
 CONFLICTS+=		kth-krb4-[0-9]*
 
 OSVERSION_SPECIFIC=	yes
-INFO_FILES=		arla.info send-pr.info
+INFO_FILES=		# PLIST
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/arla/PLIST b/net/arla/PLIST
index 57df43bdb67..be3b61fef96 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2005/12/15 21:28:47 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/04/06 03:20:54 jlam Exp $
 bin/afsfsperf
 bin/afstool
 bin/amon
@@ -65,6 +65,8 @@ include/sl.h
 include/ss/ss.h
 include/timer.h
 include/xdbm.h
+info/arla.info
+info/send-pr.info
 lib/emacs/site-lisp/send-pr.el
 lib/libarlalib.la
 lib/libarlautil.la
diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index 9224e6d005c..1106b51077d 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 11:16:18 seb Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 03:20:54 jlam Exp $
 #
 
 DISTNAME=	cftp-0.12
@@ -11,7 +11,7 @@ HOMEPAGE=	http://sunsite.csd.smc.univie.ac.at/pub/nih/cftp/
 COMMENT=	Comfortable FTP, a full screen ftp client
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	cftp.info
+INFO_FILES=	# PLIST
 
 BUILD_DEFS+=	USE_INET6
 
diff --git a/net/cftp/PLIST b/net/cftp/PLIST
index 29bc6c879cb..196d6600d2a 100644
--- a/net/cftp/PLIST
+++ b/net/cftp/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/08 22:38:05 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/06 03:20:54 jlam Exp $
 bin/cftp
+info/cftp.info
 share/doc/cftp/README
 share/doc/cftp/bindings.desc
 @dirrm share/doc/cftp
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index 2fc533dc1d0..a01c1f74b33 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 03:20:54 jlam Exp $
 
 DISTNAME=	netcat-0.7.1
 PKGNAME=	gnetcat-0.7.1
@@ -11,7 +11,6 @@ HOMEPAGE= 	http://netcat.sourceforge.net/
 COMMENT=	Read and write data across network connections
 
 GNU_CONFIGURE=		YES
-
-INFO_FILES=		netcat.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnetcat/PLIST b/net/gnetcat/PLIST
index 2dcf1adb944..9a561e164c1 100644
--- a/net/gnetcat/PLIST
+++ b/net/gnetcat/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/09 11:37:30 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/06 03:20:54 jlam Exp $
 bin/netcat
+info/netcat.info
 man/man1/netcat.1
diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile
index 966245081e5..147b39690c6 100644
--- a/net/ipgrab/Makefile
+++ b/net/ipgrab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 03:20:54 jlam Exp $
 
 DISTNAME=	ipgrab-0.9.9
 CATEGORIES=	net security
@@ -12,7 +12,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	makeinfo
-INFO_FILES=	ipgrab.info
+INFO_FILES=	# PLIST
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ipgrab/PLIST b/net/ipgrab/PLIST
index 34ffaecc3b9..4e03b9752c2 100644
--- a/net/ipgrab/PLIST
+++ b/net/ipgrab/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/18 18:48:43 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/06 03:20:54 jlam Exp $
 bin/ipgrab
+info/ipgrab.info
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 3acdc529876..fc2ad47bd01 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/02/05 23:10:25 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/06 03:20:54 jlam Exp $
 #
 
 DISTNAME=		jwhois-3.2.2
@@ -17,18 +17,18 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db
 
 LIBS.SunOS+=		-lnsl -lsocket
 
-INFO_FILES=		jwhois.info
-
 .include "options.mk"
 
 EGDIR=			${PREFIX}/share/examples/jwhois
 CONF_FILES=		${EGDIR}/jwhois.conf.default	\
 			${PKG_SYSCONFDIR}/jwhois.conf
+INFO_FILES=		# PLIST
+
+.include "../../devel/gettext-lib/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf	\
 		${EGDIR}/jwhois.conf.default
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST
index b9a15ac270c..b14a869d7d6 100644
--- a/net/jwhois/PLIST
+++ b/net/jwhois/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2004/03/09 11:41:44 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/06 03:20:54 jlam Exp $
 bin/jwhois
+info/jwhois.info
 man/man1/jwhois.1
 man/sv/man1/jwhois.1
 share/examples/jwhois/jwhois.conf.default
diff --git a/net/quagga-devel/Makefile b/net/quagga-devel/Makefile
index 2c767ac54e9..9ea240d089a 100644
--- a/net/quagga-devel/Makefile
+++ b/net/quagga-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/08 01:46:05 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/06 03:20:54 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -27,7 +27,7 @@ CONFLICTS+=		zebra-[0-9]*
 PLIST_SRC=		${WRKDIR}/PLIST
 PLIST_CAT=		# empty
 
-INFO_FILES=	quagga.info
+INFO_FILES=	# PLIST
 
 RCD_SCRIPTS=	zebra bgpd ospfd ripd
 PKG_GROUPS=	quagga
diff --git a/net/quagga-devel/PLIST b/net/quagga-devel/PLIST
index 3ef94fbd339..1015e645735 100644
--- a/net/quagga-devel/PLIST
+++ b/net/quagga-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/08 01:46:05 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/06 03:20:54 jlam Exp $
 include/quagga/buffer.h
 include/quagga/checksum.h
 include/quagga/command.h
@@ -45,6 +45,7 @@ include/quagga/workqueue.h
 include/quagga/zassert.h
 include/quagga/zclient.h
 include/quagga/zebra.h
+info/quagga.info
 lib/libospf.la
 lib/libzebra.la
 man/man1/vtysh.1
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index a9a989f25fa..8ac7956491a 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/08 15:24:53 gdt Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/06 03:20:54 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -28,7 +28,7 @@ CONFLICTS+=		zebra-[0-9]*
 PLIST_SRC=		${WRKDIR}/PLIST
 PLIST_CAT=		# empty
 
-INFO_FILES=	quagga.info
+INFO_FILES=	# PLIST
 
 RCD_SCRIPTS=	zebra bgpd ospfd ripd
 PKG_GROUPS=	quagga
diff --git a/net/quagga/PLIST b/net/quagga/PLIST
index b7d04d18e31..aaf76e0b9b1 100644
--- a/net/quagga/PLIST
+++ b/net/quagga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/03 15:46:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/06 03:20:54 jlam Exp $
 include/quagga/buffer.h
 include/quagga/command.h
 include/quagga/distribute.h
@@ -42,6 +42,7 @@ include/quagga/vty.h
 include/quagga/zassert.h
 include/quagga/zclient.h
 include/quagga/zebra.h
+info/quagga.info
 lib/libospf.la
 lib/libzebra.la
 man/man1/vtysh.1
diff --git a/net/scli/Makefile b/net/scli/Makefile
index 0b742528306..f4a8e16ba76 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/04/06 03:12:46 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 03:20:54 jlam Exp $
 #
 
 DISTNAME=		scli-0.2.12
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 USE_GNU_READLINE=	# history_list
 BUILDLINK_DEPENDS.readline+=    readline>=4.0
 
-INFO_FILES=		scli.info
+INFO_FILES=		# PLIST
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
diff --git a/net/scli/PLIST b/net/scli/PLIST
index 2d11266ee35..7f583fdbd34 100644
--- a/net/scli/PLIST
+++ b/net/scli/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/09 15:00:45 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/06 03:20:54 jlam Exp $
 bin/scli
+info/scli.info
 man/man1/scli.1
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index ef8d7666078..2fece54cfe1 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 03:20:54 jlam Exp $
 #
 
 DISTNAME=	tinc-1.0.4
@@ -10,8 +10,7 @@ HOMEPAGE=	http://tinc.nl.linux.org/
 COMMENT=	Virtual Private Network (VPN) daemon
 
 GNU_CONFIGURE=	yes
-
-INFO_FILES=	tinc.info
+INFO_FILES=	# PLIST
 
 .include "../../archivers/liblzo/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/net/tinc/PLIST b/net/tinc/PLIST
index f6f7779b30a..2e754322d92 100644
--- a/net/tinc/PLIST
+++ b/net/tinc/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/01 05:42:12 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/06 03:20:54 jlam Exp $
+info/tinc.info
 man/man5/tinc.conf.5
 man/man8/tincd.8
 sbin/tincd
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 9534e09fc25..4d9ec3da2ce 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.90 2006/04/06 03:20:54 jlam Exp $
 
 DISTNAME=	wget-1.10.2
 PKGREVISION=	1
@@ -22,8 +22,7 @@ CONFIGURE_ENV+=		ac_cv_func_sigsetjmp=yes
 
 EGDIR=			${PREFIX}/share/examples/wget
 CONF_FILES=		${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
-
-INFO_FILES=		wget.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
diff --git a/net/wget/PLIST b/net/wget/PLIST
index 0d6b5c2906f..c89877e2334 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2005/07/02 15:10:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/04/06 03:20:54 jlam Exp $
 bin/wget
+info/wget.info
 man/man1/wget.1
 share/examples/wget/wgetrc
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/wget.mo
diff --git a/net/wol/Makefile b/net/wol/Makefile
index c16c77172f2..d7c52c45033 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 03:20:54 jlam Exp $
 
 DISTNAME=	wol-0.7.1
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	Small Wake On Lan client
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl
 USE_PKGLOCALEDIR=	yes
-INFO_FILES=		wol.info
+INFO_FILES=		# PLIST
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wol/PLIST b/net/wol/PLIST
index ba08ec58216..417c9fd2f60 100644
--- a/net/wol/PLIST
+++ b/net/wol/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2005/08/20 19:23:17 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/06 03:20:54 jlam Exp $
 bin/wol
 bin/wol-bootptab
 bin/wol-dhcpdconf
+info/wol.info
 man/man1/wol.1
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wol.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/wol.mo
diff --git a/net/yafc/Makefile b/net/yafc/Makefile
index 719e657426b..ba3f6cfa056 100644
--- a/net/yafc/Makefile
+++ b/net/yafc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 03:20:54 jlam Exp $
 
 DISTNAME=	yafc-0.7.10
 PKGREVISION=	2
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		yes
 USE_GNU_READLINE=	yes
 
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
-INFO_FILES=		yafc.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/yafc/PLIST b/net/yafc/PLIST
index 642411a7c3c..7d707a4e06f 100644
--- a/net/yafc/PLIST
+++ b/net/yafc/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/09 16:09:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/06 03:20:54 jlam Exp $
 bin/yafc
+info/yafc.info
 man/man1/yafc.1