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

Remove redundant (and sometimes erroneous) comments.

33 files changed, 66 insertions, 229 deletions

diff --git a/misc/Makefile b/misc/Makefile
index c2aaac153dd..5a06f30933c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 1998/02/17 19:35:57 tron Exp $
+#	$NetBSD: Makefile,v 1.14 1998/04/15 10:38:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.117 1997/10/13 04:41:07 max Exp
 
     SUBDIR += amanda
@@ -47,4 +47,4 @@
 #    SUBDIR += xtar		# needs Motif/Lesstif - HF
     SUBDIR += zorro
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 933b3fa6b7a..caf36f6e175 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	amanda
-# Version required:			2.3.0
-# Date created:				28th Feb 1995
-# Whom:					gpalmer
-#
-# $NetBSD: Makefile,v 1.5 1998/01/24 20:52:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -29,4 +24,4 @@ post-install:
 	${MKDIR}  ${PREFIX}/share/examples/amanda
 	${CP} -R ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 96311b1cbd8..8395319456d 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,13 +1,4 @@
-# New ports collection makefile for:    astrolog
-#
-# http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
-# http://www.magitech.com/~cruiser1/astrolog.htm
-#
-# Version required:     5.30
-# Date created:         31 July 1995
-# Whom:                 faulkner@cactus.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 20:55:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
 #
 
@@ -51,4 +42,4 @@ do-install:
 	@echo "See the file ${PREFIX}/share/doc/astrolog/Helpfile.530 for help"
 	@echo "and tune ${PREFIX}/lib/astrolog/astrolog.dat"
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 2d31dbe5c2d..c4190680003 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	buffer
-# Version required:     1.17
-# Date created:         17 Nov 1995
-# Whom:                 markm
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 14:41:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/17 09:05:15 obrien Exp
 #
 
@@ -16,4 +11,4 @@ MAINTAINER=	markm@FreeBSD.ORG
 NO_WRKSUBDIR=	yes
 MAN1=		buffer.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/cal/Makefile b/misc/cal/Makefile
index f7907756bfa..36624742638 100644
--- a/misc/cal/Makefile
+++ b/misc/cal/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	cal
-# Version required:			3.5
-# Date created:				2 April 1997
-# Whom:	Andrey Zakhvatov <andy@icc.surw.chel.su>
-#
-# $NetBSD: Makefile,v 1.2 1997/10/24 00:47:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/05/12 06:33:23 max Exp
 #
 
@@ -27,4 +22,4 @@ do-install:
 	if [ ! -f ${PREFIX}/etc/cal/calcol ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${PREFIX}/etc/cal/calcol; fi
 	if [ ! -f ${PREFIX}/etc/cal/caldat ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${PREFIX}/etc/cal/caldat; fi
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index 804edcac251..31b89e42e9f 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	chard
-# Version required:	3.6
-# Date created:		24 April 1995
-# Whom:			Satoshi Asami
-#
-# $NetBSD: Makefile,v 1.2 1997/10/24 00:55:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/04/30 03:18:06 asami Exp
 #
 
@@ -17,4 +12,4 @@ MAINTAINER=	asami@FreeBSD.ORG
 MANCOMPRESSED=	yes
 MAN1=		chord.1 a2crd.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 43a4d2a2637..766f1796601 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	colorls
-# Version required:	FreeBSD-current (around January '97)
-# Date created:		8 March 1995
-# Whom:			Satoshi Asami
-#
-# $NetBSD: Makefile,v 1.4 1998/02/23 15:25:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/04/30 03:18:06 asami Exp
 #
 
@@ -23,4 +18,4 @@ CAT1=		colorls.0
 pre-patch:
 	${CP} ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index fb1b6be695d..a27d7ed4962 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: dotfile
-# Version required:  2.0
-# Date created:      11/12/96
-# Whom:              oly@world.std.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:21 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
 #
 
@@ -25,4 +20,4 @@ do-build:
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index e987fe40c56..48b095a3041 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    FD
-# Version required:     1.01h
-# Date created:         20 Feb 1996
-# Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:01:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/01/06 06:38:33 max Exp
 #
 
@@ -34,4 +29,4 @@ post-install:
 	@strip ${PREFIX}/bin/fd
 	cd ${WRKSRC} ; [ -f .fdrc ] && ${CP} .fdrc ${PREFIX}/etc/fdrc
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 5ce3ffb54ef..deb6abebbf6 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    fep
-# Version required:     1.0
-# Date created:         20 Feb 1996
-# Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:02:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
 #
 
@@ -18,4 +13,4 @@ NO_WRKSUBDIR=	yes
 MANCOMPRESSED=	yes
 MAN1=		fep.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 293d50ea79d..b30bde8f8f4 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    figlet
-# Version required:     2.2
-# Date created:         Sat July 20, 1996
-# Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.2 1997/10/24 01:16:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/06/29 09:56:32 obrien Exp
 #
 
@@ -17,4 +12,4 @@ MAINTAINER=     obrien@FreeBSD.org
 
 MAN6=		figlet.6
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 97edde382eb..fec9560d42e 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	git
-# Version required:	4.3.11
-# Date created:		12 Jul 1995
-# Whom:			torstenb@FreeBSD.ORG
-#
-# $NetBSD: Makefile,v 1.7 1998/03/28 21:37:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
 #
 
@@ -31,4 +26,4 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc
 	${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index db777b44f74..34ac8180b09 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Linux-style colorized `ls'
-# Version required:			3.12.0.2 (GNU fileutils 3.12)
-# Date created:				06 January 1996
-# Whom:					bmc@WillsCreek.COM
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:06:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp
 #
 
@@ -22,4 +17,4 @@ MAINTAINER=	bmc@WillsCreek.COM
 GNU_CONFIGURE=	yes
 MAN1=		linuxls.1 dircolors.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/ical/Makefile b/misc/ical/Makefile
index ae262cfe275..36e319ff431 100644
--- a/misc/ical/Makefile
+++ b/misc/ical/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    ical
-# Version required:     2.1
-# Date created:         Mon Aug 28 13:35:31 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.2 1998/02/17 19:33:47 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:35 agc Exp $
 # $FreeBSD Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp
 #
 
@@ -28,4 +23,4 @@ MAN1=		ical.1
 post-install:
 	@strip ${PREFIX}/bin/${DISTNAME}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index e53e782bff8..4123aea1dd6 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,10 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for:  jive
-# Version required:     	  1.0
-# Date created:			  Mon Feb 17, 1997
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:08:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/04/02 07:58:25 obrien Exp
 #
 
@@ -22,4 +16,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 9965f30b325..960b76b9b3c 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   kdeutils
-# Version required:    Beta3
-# Date created:        28 October 1997
-# Whom:                Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.7 1998/04/11 22:13:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
@@ -43,4 +38,4 @@ CONFIGURE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
 
 WRKSRC=		${WRKDIR}/kdeutils
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 1445dbfcf93..1eaffefd7c2 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    kp
-# Version required:     0.96
-# Date created:         8 May 1995
-# Whom:                 asami
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:10:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
 #
 
@@ -24,4 +19,4 @@ pre-configure:
 	done
 	${RM} ${WRKDIR}/prefix-list
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index c380e90fd5f..8ed22e5cd84 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libutf
-# Version required:			2.10
-# Date created:				Thu Oct 23 20:22:27 BST 1997
-# Whom:					Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:11:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
 #
 
 DISTNAME=	libutf-2.10
@@ -16,4 +11,4 @@ MAN3=		ure.3 utf.3
 GNU_CONFIGURE=	yes
 ALL_TARGET=	tst
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/lile/Makefile b/misc/lile/Makefile
index d6cca016939..14a8edb3d7c 100644
--- a/misc/lile/Makefile
+++ b/misc/lile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	ile
-# Version required:	2.0
-# Date created:		25 Jun 1997
-# Whom:			jmz
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:12:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/08/15 16:47:08 jmz Exp
 #
 
@@ -22,4 +17,4 @@ do-configure:
 	${SED} -e s:/usr/local:${PREFIX}: <Makefile.old > Makefile; \
 	${ECHO} all: ile >> Makefile; ${ECHO} CC=cc ${CFLAGS} >> Makefile)
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/linuxls/Makefile b/misc/linuxls/Makefile
index db777b44f74..34ac8180b09 100644
--- a/misc/linuxls/Makefile
+++ b/misc/linuxls/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Linux-style colorized `ls'
-# Version required:			3.12.0.2 (GNU fileutils 3.12)
-# Date created:				06 January 1996
-# Whom:					bmc@WillsCreek.COM
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:06:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp
 #
 
@@ -22,4 +17,4 @@ MAINTAINER=	bmc@WillsCreek.COM
 GNU_CONFIGURE=	yes
 MAN1=		linuxls.1 dircolors.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index 2102e582fa8..a8acbaec53b 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	logsurfer
-# Version required:	1.41
-# Date created:		28 Jul 1996
-# Whom:			shanee@rabbit.augusta.de
-#
-# $NetBSD: Makefile,v 1.5 1998/02/04 20:41:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/10/26 23:56:58 fenner Exp
 #
 
@@ -22,4 +17,4 @@ MANCOMPRESSED=	yes
 MAN1=		logsurfer.1
 MAN4=		logsurfer.conf.4
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index d526c87f719..fc60baaf959 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mc
-# Version required:	4.1
-# Date created:		24 Oct 1997
-# Whom:			hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
@@ -22,4 +17,4 @@ MAN8=		mcserv.8
 post-install:
 	@ ${RMDIR} ${PREFIX}/lib/mc/icons
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 1dae317fed6..ba3fc45ef5b 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	most
-# Version required:	4.7
-# Date created:		31 May 1997
-# Whom:			rhwang@bigpanda.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/30 13:57:23 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/03 21:52:01 asami Exp
 #
 
@@ -21,4 +16,4 @@ GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/most
 MAN1=		most.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index b651b2bbfba..13da9dc08de 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-Array-PrintCols
-# Version required:			1.2
-# Date created:				October 17th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:22:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
 #
 
@@ -22,4 +17,4 @@ WRKSRC=		${WRKDIR}/Array-PrintCols
 MAN3=		Array::PrintCols.3p
 MANPREFIX=	${PREFIX}/lib/perl5
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index df8d84105e6..d28113685b9 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-Business-CreditCard
-# Version required:			0.1
-# Date created:				October 20th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:22:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
 #
 
@@ -25,4 +20,4 @@ do-install:
 		@ ${INSTALL_DATA} ${WRKSRC}/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/
 		@ ln -sf ${PREFIX}/lib/perl5/site_perl/Business/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/CreditCard.pm
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index cef5ffa6d2c..a3930e896df 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    p5-Locale-Codes
-# Version required:			0.003
-# Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:23:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
 #
 
@@ -23,4 +18,4 @@ MAN3=		Locale::Country.3 Locale::Language.3
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index 1b229c7798d..5bc243e22aa 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-Search
-# Version required:			0.2
-# Date created:				October 17th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:25:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
 #
 
@@ -23,4 +18,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/misc/rpm/Makefile b/misc/rpm/Makefile
index 5aef891f6d4..03310754ee8 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		rpm
-# Version required:	2.4.12
-#
-# $NetBSD: Makefile,v 1.8 1998/03/20 05:54:42 mycroft Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:37 agc Exp $
 #
 
 DISTNAME=	rpm-2.4.12
@@ -21,4 +18,4 @@ MAN8=		rpm.8 rpm2cpio.8
 pre-install:
 	${MKDIR} ${PREFIX}/include/rpm
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index fa88e80dac3..5e11c8bc3d9 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	screen
-# Version required:     3.7.4
-# Date created:         25 Nov 1994
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.6 1998/02/16 08:52:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
 #
 
@@ -25,4 +20,4 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/examples/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/share/examples/screen/screenrc
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index dbb81e4c76e..6c4219427a4 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    Splitvt
-# Version required:     1.6.1
-# Date created:         Fri Oct 4, 1996
-# Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:29:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/02 08:39:12 obrien Exp
 #
 
@@ -23,4 +18,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/team/Makefile b/misc/team/Makefile
index 6eadd540d09..0947cc3e28e 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	team
-# Version required:	3.1 (From the RCS Id line of team.c)
-# Date created:		1 July 1995
-# Whom:			joerg
-#
-# $NetBSD: Makefile,v 1.7 1998/02/04 22:46:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/30 03:18:06 asami Exp
 #
 
@@ -16,4 +11,4 @@ MAINTAINER=	joerg@FreeBSD.org
 MAN1=		team.1
 CAT1=		team.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/xfinans/Makefile b/misc/xfinans/Makefile
index 44242aee682..49f90af5f8f 100644
--- a/misc/xfinans/Makefile
+++ b/misc/xfinans/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Xfinans
-# Version required:			5.9
-# Date Created:				30 January 1998
-# Whom:					root@garbled.futureone.com
-#
-# $NetBSD: Makefile,v 1.1 1998/02/08 23:48:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:57 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
@@ -37,4 +32,4 @@ post-install:
 	${CP} ${WRKSRC}/../category_engine ${PREFIX}/share/examples/Xfinans
 	${RM} ${PREFIX}/man/cat1/xfinans.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile
index 47a1d097692..56a7de3d45b 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	zorro
-# Version required:     1.1p8
-# Date created:         03 Aug 1996
-# Whom:                 shanee@rabbit.augusta.de
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:28 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp
 #
 
@@ -30,4 +25,4 @@ do-install:
 	@echo "Take a look at ${PREFIX}/share/zorro/DOTzorrorc"
 	@echo ""
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"