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

Remove redundant (and sometimes erroneous) comments.

8 files changed, 16 insertions, 51 deletions

diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
index 0775633d76c..a4d16222830 100644
--- a/plan9/9menu/Makefile
+++ b/plan9/9menu/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    9menu
-# Version required:     1.5
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:03:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:41 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp
 #
 
@@ -27,4 +22,4 @@ EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/9term/Makefile b/plan9/9term/Makefile
index 7ef2d9c3571..1ed1949c497 100644
--- a/plan9/9term/Makefile
+++ b/plan9/9term/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    9term
-# Version required:     1.6.3
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/01/24 22:05:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -27,4 +22,4 @@ MAN1=		9term.1
 NO_WRKSUBDIR=	yes
 MAKE_ENV+=	WRKDIR=${WRKDIR}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
index a92431bb68f..ff5456b87ab 100644
--- a/plan9/9wm/Makefile
+++ b/plan9/9wm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    9wm
-# Version required:     1.1
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/03/10 15:48:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
 #
 
@@ -22,4 +17,4 @@ USE_IMAKE=		yes
 
 CAT1=			9wm.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/Makefile b/plan9/Makefile
index bf39c0d60de..8870e1e3eb3 100644
--- a/plan9/Makefile
+++ b/plan9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1997/10/24 09:51:35 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:41 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/26 08:57:54 asami Exp
 #
 
@@ -10,4 +10,4 @@
     SUBDIR += sam
     SUBDIR += wily
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/plan9/Xg/Makefile b/plan9/Xg/Makefile
index 58d800fc721..0e1eca65324 100644
--- a/plan9/Xg/Makefile
+++ b/plan9/Xg/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    libXg
-# Version required:     ????? arbitrarily picked 1.0 for version
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 22:15:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:44 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
 #
 
@@ -17,4 +12,4 @@ MAINTAINER=	erich@FreeBSD.org
 NO_WRKSUBDIR=	yes
 USE_X11=	yes
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/rc/Makefile b/plan9/rc/Makefile
index 45b2a8d7f45..67a6758ed52 100644
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    rc
-# Version required:     1.5b1
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/02/27 13:21:23 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
 #
 
@@ -18,4 +13,4 @@ NO_WRKSUBDIR=	yes
 MANCOMPRESSED=	yes
 MAN1=		rc.1 history.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index 913f9bce427..117b7c3b99a 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    sam
-# Version required:     4.3
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:28:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
@@ -30,4 +25,4 @@ MAN3=		add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 graphics.3 rgbpix.3
 MAN4=		font.4 keyboard.4 utf.4
 MAN6=		bitmap.6 regexp.6
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/wily/Makefile b/plan9/wily/Makefile
index 9561eca9067..a8f22206952 100644
--- a/plan9/wily/Makefile
+++ b/plan9/wily/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    wily
-# Version required:     		0.13.36
-# Date created:         		Tue Oct 21 16:06:30 BST 1997
-# Whom:                 		agc@netbsd.org (Alistair Crooks)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 22:30:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:45 agc Exp $
 #
 
 DISTNAME=	wily-0.13.36
@@ -16,4 +11,4 @@ MAINTAINER=	agc@netbsd.org
 GNU_CONFIGURE=	yes
 MAN1=		wily.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"