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

Remove redundant (and sometimes erroneous) comments.

16 files changed, 32 insertions, 110 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index 1b1b6ec5ab7..e9f0411fcc9 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/03/19 14:10:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.18 1997/05/16 01:42:31 asami Exp 
 #
 
@@ -24,4 +24,4 @@
 #    SUBDIR += zip.with_encryption
     SUBDIR += zoo
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 821a6fab531..715acfe4f0f 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    arc
-# Version required:     5.21e
-# Date created:         31 Dec 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp 
 #
 
@@ -18,4 +13,4 @@ MAINTAINER=     ache@FreeBSD.ORG
 NO_WRKSUBDIR=	yes
 MAN1=		arc.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 425dc487d33..857892a29db 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    bzip
-# Version required:     0.21
-# Date created:         Fr  27 Sep 1996 11:47:35 MET DST
-# Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1996/12/07 09:28:40 max Exp 
 #
 
@@ -26,4 +21,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/bzip.1 ${PREFIX}/man/man1/bzip.1
 	${INSTALL_MAN} ${WRKSRC}/bzip.1 ${PREFIX}/man/man1/bunzip.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index a1b46dcb19c..fc09310fb91 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	bzip2
-# Version required:	0.1pl2
-# Date created:		19 Nov 1997
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/09 09:58:29 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/20 08:18:40 tg Exp
 #
 
@@ -23,4 +18,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${PREFIX}/man/man1
 	ln ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bunzip2.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 7514cbcf7fa..853a7943f93 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    freeze
-# Version required:     2.5
-# Date created:         20 Jul 1996
-# Whom:                 lukin@okbmei.msk.su
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/18 11:20:59 asami Exp 
 #
 
@@ -17,4 +12,4 @@ GNU_CONFIGURE=	yes
 ALL_TARGET=	prog
 MAN1=		freeze.1 melt.1 unfreeze.1 fcat.1 statist.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 04e5466d60c..ee40348500f 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	gcpio
-# Version required:     2.4.2
-# Date created:		1 March 1998
-# Whom:			tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/03/05 20:09:46 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
 #
 
 DISTNAME=       cpio-2.4.2
@@ -27,4 +22,4 @@ MAN1=	gcpio.1
 post-install:
 	install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cpio.info
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index daa8f085cd6..9e264da73eb 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	gtar
-# Version required:     1.12
-# Date created:		1 March 1998
-# Whom:			tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 11:57:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:08 agc Exp $
 #
 
 DISTNAME=       tar-1.12
@@ -26,4 +21,4 @@ MAN1=	gtar.1
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 5cbb3c070e4..dd7e85f5197 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    ha
-# Version required:     0.999beta
-# Date created:         24 Jan 1995
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.3 1998/02/09 00:34:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp 
 #
 
@@ -24,4 +19,4 @@ USE_GMAKE=      yes
 do-install:
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 471aba4ab23..0dcb6748bd4 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    lha
-# Version required:     1.14C
-# Date created:         26 Dec 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.3 1997/11/18 12:26:05 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1996/12/15 02:05:58 max Exp 
 #
 
@@ -20,4 +15,4 @@ MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
 MANLANG=	ja_JP.EUC
 MAN1=		lha.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index 3b92427752d..4e925bc0470 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for:		macutil
-# Version required:	2.0b3
-# Date created:		13 March 1998
-# Whom:			mycroft
-#
-# $NetBSD: Makefile,v 1.3 1998/03/16 10:44:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:08 agc Exp $
 
 DISTNAME=	macutil
 PKGNAME=	macutil-2.0b3
@@ -40,4 +35,4 @@ do-install:
 		       ${WRKSRC}/man/frommac.1 \
 		       ${WRKSRC}/man/macutil.1 ${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index b5b9aa8dd76..9bb8fa5e2a5 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:    rar
-# http://www.inetpros.net/rar.htm
-# Version required:     2.01
-# Date created:         15 May 1996
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.8 1998/03/07 21:23:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp 
 #
 
@@ -49,4 +43,4 @@ do-install:
 		${INSTALL_DATA} Dos.SFX \
 			${PREFIX}/share/rar/dos.sfx
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index c895a6a64cb..a5e2fb36187 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    unarj
-# Version required:     2.41
-# Date created:         28 Dec 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/12 02:17:38 obrien Exp 
 #
 
@@ -18,4 +13,4 @@ MAINTAINER=     ache@FreeBSD.ORG
 do-install:
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} ${DISTNAME} ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 3561fe04740..1b76f6b486a 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    unrar
-# Version required:     2.01
-# Date created:         28 Dec 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.3 1998/03/07 21:23:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/08/10 22:31:33 fenner Exp 
 #
 
@@ -26,4 +21,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_MAN} readme.txt license.txt \
 		${PREFIX}/share/doc/unrar
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 0bcb80dbe27..738cba0c17c 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    unzip
-# Version required:     5.3.2
-# Date created:         17 October 1994
-# Whom:                 jmz
-#
-# $NetBSD: Makefile,v 1.5 1998/03/07 21:24:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp 
 #
 
@@ -31,4 +26,4 @@ do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} README WHERE COPYING ${PREFIX}/share/doc/unzip
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 9224c50d971..9ab7a086494 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,11 +1,4 @@
-# New packages collection makefile for:    zip (without encryption)
-# http://infozip.cdrom.com/pub/infozip/
-#
-# Version required:     2.2
-# Date created:         22 Dec 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.6 1998/03/16 10:47:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp 
 #
 
@@ -30,4 +23,4 @@ do-install:
 	ln -fs zip.1 ${PREFIX}/man/man1/zipnote.1
 	ln -fs zip.1 ${PREFIX}/man/man1/zipsplit.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index ba9c2bc15d4..b547481d242 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    zoo
-# Version required:     2.10pl1
-# Date created:         18 October 1994
-# Whom:                 jmz
-#
-# $NetBSD: Makefile,v 1.4 1998/02/09 00:33:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp 
 #
 
@@ -21,4 +16,4 @@ MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 MAN1=		fiz.1 zoo.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"