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

Remove redundant (and sometimes erroneous) comments.

21 files changed, 42 insertions, 142 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 7c08b9a9c64..6e549f3f970 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/04/09 14:03:10 tv Exp $
+# $NetBSD: Makefile,v 1.18 1998/04/15 10:38:18 agc Exp $
 # FreeBSD Id: Makefile,v 1.78 1997/10/01 08:32:59 cracauer Exp
 #
 
@@ -94,4 +94,4 @@
 #    SUBDIR += xwpe
     SUBDIR += xxgdb
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index dc0ce06869a..2b15ff2fc12 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for:	autoconf
-# Version required:     2.12
-# Date created:		7 October 1995
-# Whom:			torstenb@FreeBSD.ORG
-#
-# $NetBSD: Makefile,v 1.12 1998/03/16 11:02:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:19 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -25,4 +20,4 @@ post-install:
 	@install-info ${PREFIX}/info/autoconf.info ${PREFIX}/info/dir
 	@install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 630ae09ac6c..b3b6fc9bf45 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	automake
-# Version required:	1.3
-# Date created:		14 April 1998
-# Whom:			Hubert Feyrer <hubert.feyrer@rz.uni-regensburg.de>
-#
-# $NetBSD: Makefile,v 1.10 1998/04/14 01:51:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:19 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
 #
 
@@ -27,4 +22,4 @@ pre-install:
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 46f51bc3fd3..ce3402a7fce 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for: bison
-# Version required:                     1.25
-# Date created:                         20 March 1998
-# Whom:                                 Jason R. Thorpe
-#
-# $NetBSD: Makefile,v 1.2 1998/04/13 10:11:28 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:19 agc Exp $
 
 DISTNAME=	bison-1.25
 CATEGORIES=	devel
@@ -19,4 +14,4 @@ MAN1=		bison.1
 post-install:
 		@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index b120b7dd7f2..5c6d3a17d64 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	boehm-gc
-# Version required:	4.12
-# Date created:		15 November 1996
-# Whom:			Mike McGaughey <mmcg@cs.monash.edu.au>
-#
-# $NetBSD: Makefile,v 1.4 1998/02/26 16:48:55 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:19 agc Exp $
 # FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp
 #
 
@@ -22,4 +17,4 @@ MAKE_ENV+=	CP="${CP}"
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}"
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 258d3698adf..96ce99e0264 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	cvs
-# Version required:     1.9
-# Date created:		15 November 1997
-# Whom:			lamj@stat.cmu.edu
-#
-# $NetBSD: Makefile,v 1.7 1998/03/25 17:50:15 tv Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:19 agc Exp $
 #
 
 DISTNAME=       cvs-1.9
@@ -34,4 +29,4 @@ post-install:
 	install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cvsclient.info
 	${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index fc8b3508d22..c5739f7e6b0 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   indent
-# Version required:    1.9.1
-# Date created:        28 August 1997
-# Whom:                Kapil Chowksey <kchowksey@hss.hns.com>
-#
-# $NetBSD: Makefile,v 1.6 1998/01/25 00:42:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
@@ -41,4 +36,4 @@ post-install:
 	fi
 	@install-info ${PREFIX}/info/indent.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 1962c854632..587b0817436 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	GNU make
-# Version required:     3.76.1
-# Date created:		11 September 1994
-# Whom:			jkh
-#
-# $NetBSD: Makefile,v 1.8 1998/01/30 20:47:23 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
 #
 
@@ -29,4 +24,4 @@ post-install:
 	cd ${WRKSRC} && \
 		${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/${MAN1}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 6ea3b9961bf..e339776a379 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	GNU texinfo
-# Version required:     3.11
-# Date created:		14 November 1997
-# Whom:			lamj@stat.cmu.edu
-#
-# $NetBSD: Makefile,v 1.5 1998/03/09 08:09:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:20 agc Exp $
 #
 
 DISTNAME=       texinfo-3.12
@@ -24,4 +19,4 @@ post-install:
 	strip ${PREFIX}/bin/${file}
 .endfor
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index afe3f117466..5bb707d94cd 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	id-utils
-# Version required:	3.2
-# Date created:		22 Aug 1996
-# Whom:			pst@freebsd.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 04:15:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -23,4 +18,4 @@ BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 64353b490d0..9b39f18283b 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libg++
-# Version required:	2.8.1.1a
-# Date created:		8 April 1998
-# Whom:			tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/04/12 23:16:16 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:20 agc Exp $
 #
 
 GXXVERSION=	2.8.1.1a	# used by internal Makefile
@@ -39,4 +34,4 @@ post-install:
 		/bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \
 		>${PLIST_SRC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 843501e5afc..3c404ea2151 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    S-Lang library
-# Version required:     0.99-38
-# Date created:         11 July 1996
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp 
 #
 
@@ -23,4 +18,4 @@ post-install:
 	@rm -f ${PREFIX}/lib/libslang.so.99.3[348]
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index b71adbd446e..ddb9e22d919 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	m4
-# Version required:     1.4
-# Date created:		25 October 1994
-# Whom:			mr
-#
-# $NetBSD: Makefile,v 1.6 1998/01/24 04:20:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp
 #
 
@@ -29,4 +24,4 @@ post-install:
 	 fi
 	@install-info ${PREFIX}/info/m4.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile
index 5335df044e8..359b0d1f622 100644
--- a/devel/mit-pthreads/Makefile
+++ b/devel/mit-pthreads/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	MIT pthreads
-# Version required:     1.60beta6
-# Date created:		10th October 1997
-# Whom:			Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.7 1998/03/10 21:35:14 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:21 agc Exp $
 #
 
 DISTNAME=       pthreads-1_60_beta6
@@ -24,4 +19,4 @@ post-install:
 	find ${PREFIX}/pthreads/include -type f -print|xargs chmod 644
 	find ${PREFIX}/pthreads/include -type d -print|xargs chmod 755
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 0665e07f97c..781f79e4f92 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for:	ncurses
-# Version required:     		1.9.9g
-# Date created:				Tue Oct 28 00:12:41 CET 1997
-# Whom:					Hubert Feyrer (hubertf@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.12 1998/03/16 11:06:07 frueauf Exp $
+# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:21 agc Exp $
 
 DISTNAME=	ncurses-1.9.9g
 CATEGORIES=	devel
@@ -65,4 +60,4 @@ post-install:
 	  ${MV} $$i.BAK $$i ; done )
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 4db201d85fa..0d892999a6b 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	noweb
-# Version required:	noweb-2.8a
-# Date created:		29 July 1995
-# Whom:			Thomas Gellekum <tg@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/02/24 12:27:00 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
 #
 
@@ -24,4 +19,4 @@ MAN1=		cpif.1 nodefs.1 noroots.1 noweb.1 noindex.1 \
 		nountangle.1 noweave.1
 MAN7=		nowebstyle.7 nowebfilters.7
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 4464a4d2af0..68cc9380498 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-Data-Dumper
-# Version required:			2.07
-# Date created:				October 17th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 04:37:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:11 jfitz Exp
 #
 
@@ -24,4 +19,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/devel/prcs/Makefile b/devel/prcs/Makefile
index a51eb07a188..a6df5968c09 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    prcs
-# Version required:     1.2.2
-# Date created:         17 Sep 96
-# Whom:                 jmacd@FreeBSD.ORG
-#
-# $NetBSD: Makefile,v 1.3 1998/03/26 10:14:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/10/13 05:11:40 jmacd Exp
 #
 
@@ -16,4 +11,4 @@ MAINTAINER=	jmacd@FreeBSD.ORG
 GNU_CONFIGURE=	yes
 MAN1=		prcs.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index efa8c107d6f..68c747fa87f 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	readline
-# Version required:    			2.1
-# Date created:        			Fri Mar  6 19:07:28 GMT 1998
-# Whom:                			Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.4 1998/03/28 21:24:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:21 agc Exp $
 #
 
 DISTNAME=	readline-2.1
@@ -28,4 +23,4 @@ do-build:
 post-install:
 	@${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 3e18efe9e81..e56156f8714 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tkcvs
-# Version required:     6.0
-# Date created:         02 Aug 1996
-# Whom:                 shanee@augusta.de
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 13:50:10 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:24 jseger Exp
 #
 
@@ -33,4 +28,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tkdiff/README ${PREFIX}/share/doc/tkcvs/README.tkdiff
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index e642e3f525d..e13a0db0dce 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,9 +1,4 @@
-# New packages collection Makefile for: xxgdb
-# Version required:     1.12
-# Date created:         17-Feb-98
-# Whom:                 rh@trapdoor.vip.at
-#
-# $NetBSD: Makefile,v 1.2 1998/03/01 21:30:05 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:22 agc Exp $
 #
 
 DISTNAME=	xxgdb-1.12
@@ -23,4 +18,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/XDbx.ad ${PREFIX}/lib/X11/app-defaults/XDbx
 	${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${PREFIX}/man/man1/xxgdb.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"