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

Remove redundant (and sometimes erroneous) comments.

14 files changed, 28 insertions, 94 deletions

diff --git a/lang/Makefile b/lang/Makefile
index b6a3b18f9aa..67edd8b8034 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/03 21:15:54 tron Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.82 1997/09/30 07:49:24 asami Exp
 #
 
@@ -59,4 +59,4 @@
     SUBDIR += tclX80
 #    SUBDIR += xpl
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 49d8950306d..c08022dac79 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    elk
-# Version required:     3.0pl2
-# Date created:         08 March 1995
-# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/04/01 11:33:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/09/01 12:28:30 tg Exp
 #
 
@@ -18,4 +13,4 @@ ALL_TARGET=	default
 
 MAN1=		elk.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 2bab7cca04a..6c3c9cdf3ba 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	expect
-# Date created:		20 November 1994
-# Whom:			pst
-# Version required:	5.25
-#
-# $NetBSD: Makefile,v 1.7 1998/02/02 08:59:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1998/01/27 01:11:47 fenner Exp
 #
 
@@ -41,4 +36,4 @@ test:
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guavac/Makefile b/lang/guavac/Makefile
index b585fe01c20..67ac4633bf6 100644
--- a/lang/guavac/Makefile
+++ b/lang/guavac/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    guavac
-# Version required:     1.0
-# Date created:         07-02-98
-# Whom:                 mjl@emsi.priv.at
-#
-# $NetBSD: Makefile,v 1.2 1998/02/14 16:57:55 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:28 agc Exp $
 #
 
 DISTNAME=	guavac-1.0
@@ -23,4 +18,4 @@ CAT1=		guavac.0
 post-install:
 	${MV} ${PREFIX}/man/cat1/guavac.man ${PREFIX}/man/cat1/guavac.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 49a80ea3c29..c08330dee31 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for: hugs
-# Version required:	1.4
-# Date created:		22-Mar-98
-# Whom:			nathanw@mit.edu
-#
-# $NetBSD: Makefile,v 1.2 1998/04/03 22:11:43 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:28 agc Exp $
 
 DISTNAME=	hugs-January1998-source
 PKGNAME=	hugs-1.4
@@ -23,4 +18,4 @@ MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_DATA="${INSTALL_DATA}" \
 post-extract:
 	@${LN} -s ${FILESDIR}/configure ${WRKSRC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index e28f843c0fb..70aca331488 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    icon
-# Version required:     9.3
-# Date created:         05 April 1995
-# Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
-#
-# $NetBSD: Makefile,v 1.5 1998/02/01 10:26:26 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
 #
 
@@ -25,4 +20,4 @@ MANCOMPRESSED=	yes
 
 MAN1=		icon.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 95f25e5aa9a..426eb131080 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    kaffe
-# Version required:     0.9.2
-# Date created:         20 February 1995
-# Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
-#
-# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/08 09:37:16 obrien Exp
 #
 
@@ -30,4 +25,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 8c436cae5cd..7bb857634e5 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mawk
-# Version required:     1.2.2
-# Date created:		1 October 1997
-# Whom:			agc@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 20:19:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:29 agc Exp $
 #
 
 DISTNAME=       mawk1.2.2
@@ -17,4 +12,4 @@ MAINTAINER=	agc@netbsd.org
 GNU_CONFIGURE=	yes
 MAN1=		mawk.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 62fff26e635..70e10615e76 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    moscow-ml
-# Version required:     1.42
-# Date created:         17 February 1998
-# Whom:                 lamj@stat.cmu.edu
-#
-# $NetBSD: Makefile,v 1.1 1998/02/17 10:18:36 agc Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:29 agc Exp $
 #
 
 DISTNAME=       mos14src
@@ -27,4 +22,4 @@ post-install:
 	${CP} -R ${WRKDIR}/mosml/examples/* ${PREFIX}/share/examples/moscow_ml
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 2a530b4b2f4..c740fc1313a 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	perl5
-# Version required:	5.004_01
-# Date created:		16 April 1995
-# Whom:			markm
-#
-# $NetBSD: Makefile,v 1.7 1998/03/16 06:56:19 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -74,4 +69,4 @@ post-install:
 	@strip ${PREFIX}/bin/suidperl
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python/Makefile b/lang/python/Makefile
index dfe58d2ca74..e783a6fe3a2 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	python
-# Version required:	1.5
-# Date created:		1 January 1998
-# Whom:			tsarna@endicor.com
-#
-# $NetBSD: Makefile,v 1.2 1998/02/01 01:54:43 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:29 agc Exp $
 #
 
 DISTNAME=	python1.5
@@ -36,4 +31,4 @@ post-configure:
 post-install:
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index dfd6b630bad..5d16a2e2db8 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    scheme48
-# Version required:     0.46
-# Date created:         25 Aug 1997
-# Whom:                 jmacd
-#
-# $NetBSD: Makefile,v 1.5 1998/02/09 00:19:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/08/27 19:31:37 jmacd Exp
 #
 
@@ -19,4 +14,4 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}
 ALL_TARGET = 	enough
 MAN1=		scheme48.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index e8163789658..ed56efcca72 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tcl8.0
-# Version required:	8.0p2
-# Date created:		19 August 1997
-# Whom:			jkh
-#
-# $NetBSD: Makefile,v 1.8 1998/02/14 01:00:51 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/20 10:33:35 jkh Exp
 #
 
@@ -121,4 +116,4 @@ post-install:
 test:
 	cd ${WRKSRC} && ${MAKE} test
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 3c88d62d358..bb4d8e0e4e7 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -1,10 +1,4 @@
-#
-# New packages collection makefile for:	tclX8.0
-# Version required:			8.0.2
-# Date Created:				07 March 1998
-# Whom:					tron
-#
-# $NetBSD: Makefile,v 1.1 1998/03/07 23:41:37 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:30 agc Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -30,4 +24,4 @@ MAN3=	TclCommandWriting.3 Tcl_HandleAlloc.3 Tcl_HandleFree.3 \
 MANN=	ckalloc.n memory.n ckfree.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 	Tcl_ValidateAllMemory.n TclX.n
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"