Use the bsd.pkg.mk and bsd.pkg.subdir.mk files in the pkgsrc tree.

Remove redundant (and sometimes erroneous) comments.

20 files changed, 40 insertions, 134 deletions

diff --git a/net/Makefile b/net/Makefile
index 2f49db874b0..51467a3e51e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1998/03/30 10:07:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 1998/04/15 10:38:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp 
 #
 
@@ -86,4 +86,4 @@
 #    SUBDIR += zircon
     SUBDIR += zephyr
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/net/bing/Makefile b/net/bing/Makefile
index a3f91e4ad87..daac41b3645 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	bing
-# Version required:	1.0.4
-# Date created:		28 December 1996
-# Whom:			jseger@scds.com
-#
-# $NetBSD: Makefile,v 1.2 1997/11/19 16:02:31 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/10/13 09:14:49 tg Exp
 #
 
@@ -21,4 +16,4 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/bing
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/icb/Makefile b/net/icb/Makefile
index 3c91528d316..185982befdd 100644
--- a/net/icb/Makefile
+++ b/net/icb/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	icb client
-# Version required:	5.0.5
-# Date created:		18 March 1998
-# Whom:			cjs
-#
-# $NetBSD: Makefile,v 1.4 1998/03/28 21:59:06 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:38 agc Exp $
 #
 
 DISTNAME=		icb-5.0.5
@@ -26,4 +21,4 @@ do-install:
 		${WRKSRC}/contrib/echofile \
 		${PREFIX}/libdata/icb
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/ircII/Makefile b/net/ircII/Makefile
index 2ed705cbed3..862198333ba 100644
--- a/net/ircII/Makefile
+++ b/net/ircII/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	IrcII Client
-# Version required:	2.9
-# Date created:		18 Oct 1994
-# Whom:			torstenb
-#
-# $NetBSD: Makefile,v 1.11 1998/03/10 15:25:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
@@ -34,4 +29,4 @@ post-install:
 		find ${PREFIX}/lib/irc/help -type f -print | xargs ${GZIP_CMD}; \
 	fi
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 2a36a12888d..f910d6ae895 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   kdenetwork
-# Version required:    Beta3
-# Date created:        28 October 1997
-# Whom:                Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/21 01:54:50 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -46,4 +41,4 @@ CONFIGURE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index 93db8892bff..1a76d0fbbc6 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mirror
-# Version required:	2.8
-# Date created:		15 May 1995
-# Whom:			torstenb
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:37:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp 
 #
 
@@ -31,4 +26,4 @@ post-configure:
 pre-install:
 	${MKDIR} ${PREFIX}/lib/mirror
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index da0a42c0c12..074660185bf 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    ncftp2
-# Version required:     2.4.3
-# Date created:         4 Nov 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.4 1998/03/23 19:29:38 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:39 agc Exp $
 # $FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
 #
 
@@ -23,4 +18,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
 	${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 2708e73ae45..7cfbcacaa3d 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-Net
-# Version required:			1.0505
-# Date created:				September 30th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:38:41 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -27,4 +22,4 @@ MANPREFIX=	${PREFIX}/lib/perl5
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 5d23d902273..afc53a40777 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    rsync
-# Version required:     1.6.9
-# Date created:         Sat Aug 3, 1996
-# Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.3 1998/02/02 21:02:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/01/03 10:14:21 obrien Exp
 #
 
@@ -26,4 +21,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9df1f5aeb88..9cf70964001 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	samba
-# Version required:			1.9.18p3
-# Date created:				11th Feb 1995
-# Whom:					gpalmer
-#
-# $NetBSD: Makefile,v 1.6 1998/02/21 21:20:09 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
 #
 
@@ -69,4 +64,4 @@ post-install:
 	chown root.wheel ${PREFIX}/bin/smbpasswd
 	chmod 4111 ${PREFIX}/bin/smbpasswd
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 6446a8d262e..78e0e5f5f7a 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	scotty
-# Version required:	2.1.6
-# Date created:		18 Februar 1995
-# Whom:			Gennady Sorokopud <gena@netvision.net.il>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/07 22:11:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp
 #
 
@@ -36,4 +31,4 @@ PLIST_SRC=${PLIST}.tmp
 pre-clean:
 	@${RM} -f ${PKGDIR}/PLIST.tmp
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/sirc/Makefile b/net/sirc/Makefile
index 3a1ba9b5d54..d3b79a5a6b5 100644
--- a/net/sirc/Makefile
+++ b/net/sirc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    sirc
-# Version required:     2.21
-# Date created:         1997/11/11
-# Whom:                 hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:42:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:40 agc Exp $
 
 DISTNAME=	sirc-2.21
 CATEGORIES=	net
@@ -41,4 +36,4 @@ do-install:
 		${ECHO} "" ; \
 	) | ./install
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 4171b9c8ae0..f969b18d1a6 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:	sniffit
-# Version required:	0.3.5
-# Date created:		28 Mar 1998
-# Whom:			bsdx
-#
-# $NetBSD: Makefile,v 1.2 1998/03/30 09:57:56 hubertf Exp $
-# FreeBSD 
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:40 agc Exp $
 #
 
 DISTNAME=	sniffit.0.3.5
@@ -25,4 +19,4 @@ do-install:
 	${INSTALL_MAN}     ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
 	${INSTALL_MAN}     ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index da76d479cf3..427f2a2f0e2 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	socks5
-# Version required:			beta-0.17.2-exportable
-# Date created:				24 Apr 1996
-# Whom:					pst
-#
-# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
 #
 
@@ -42,4 +37,4 @@ post-install:
 	ln -fs ${PREFIX}/lib/libsocks5_sh.so ${PREFIX}/lib/libsocks5_sh.so.0.0
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 567d1bec335..8f34e852459 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tcptrace
-# Version required:	4.1.3
-# Date created:		3 March 1997
-# Whom:			fenner
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:47:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
 #
 
@@ -29,4 +24,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/tkirc/Makefile b/net/tkirc/Makefile
index 97751ba0faf..2ab528e080e 100644
--- a/net/tkirc/Makefile
+++ b/net/tkirc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    tkirc
-# Version required:     1.202
-# Date created:         1997/11/09
-# Whom:                 Hubert Feyrer <hubertf@netbsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/03/28 21:41:11 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:55 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
@@ -27,4 +22,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/CHANGES	  ${PREFIX}/share/doc/tkirc
 	${INSTALL_DATA} ${WRKSRC}/COPYING	  ${PREFIX}/share/doc/tkirc
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile
index ba70ee43f99..f5401b1223a 100644
--- a/net/ttcp/Makefile
+++ b/net/ttcp/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	ttcp
-# Version required:	1.12
-# Date created:		14 December 1997
-# Whom:			thorpej
-#
-# $NetBSD: Makefile,v 1.9 1998/03/20 22:04:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:40 agc Exp $
 #
 
 DISTNAME=	ttcp
@@ -20,4 +15,4 @@ NO_WRKSUBDIR=	yes
 # Do not list MAN/CAT pages here. It will confuse if MANZ is set.
 # The pkg uses BSD-style-Makefiles itself, so it does the right thing.
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/Makefile b/net/wget/Makefile
index a774aeebb02..5de8538b07e 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	wget
-# Version required:	1.4.5
-# Date created:		31 December 1996
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 15:30:38 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
 #
 
@@ -25,4 +20,4 @@ post-install:
 	fi
 	-install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 6a45224d656..6bc45ce2f20 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	wu-ftpd
-# Version required:     2.4.2-beta-16
-# Date created:		18 Oct 1994
-# Whom:			torstenb
-#
-# $NetBSD: Makefile,v 1.3 1998/03/30 18:40:25 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:41 agc Exp $
 # $FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
@@ -25,4 +20,4 @@ MAN8=		ftpd.8 ftpshut.8
 do-build:
 	cd ${WRKSRC} && ./build nbs PREFIX=${PREFIX}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 5e69cb5280e..146f2496f33 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		zephyr
-# Version required:	2.0.4
-#
-# $NetBSD: Makefile,v 1.6 1998/04/09 19:49:16 sommerfe Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:41 agc Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
@@ -40,4 +37,4 @@ post-install:
 	    done
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"