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

Remove redundant (and sometimes erroneous) comments.

18 files changed, 36 insertions, 114 deletions

diff --git a/audio/Makefile b/audio/Makefile
index bfb060f9a27..71f69eddde6 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/02/22 23:29:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 1998/04/15 10:38:09 agc Exp $
 #
 
     SUBDIR += amp
@@ -23,4 +23,4 @@
     SUBDIR += xmmix
     SUBDIR += xwave
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index 7268b285fed..2d5b64fc65d 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		amp
-# Version required:	0.7.6
-#
-# $NetBSD: Makefile,v 1.4 1998/03/20 06:02:06 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:09 agc Exp $
 #
 
 DISTNAME=	amp-0.7.6
@@ -19,4 +16,4 @@ do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
 	@ ${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index afac8b1e1a9..1a33350ff48 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	cam
-# Version required:	1.02
-# Date created:		Tue Nov 12 15:54:21 CST 1996
-# Whom:			erich@FreeBSD.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/19 00:50:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:09 agc Exp $
 #
 
 DISTNAME=	cam-1.02
@@ -19,4 +14,4 @@ BUILD_DEPENDS=	${PREFIX}/lib/libncurses.a:${PORTSDIR}/devel/ncurses
 
 MAN1=		cam.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cddbd/Makefile b/audio/cddbd/Makefile
index 28fba8ea91c..d5af0f0fa26 100644
--- a/audio/cddbd/Makefile
+++ b/audio/cddbd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: cddbd
-# Version required:                  1.3.1 patch 1
-# Date created:                      18 Apr 1997
-# Whom:                              Brent J. Nordquist <bjn@visi.com>
-#
-# $NetBSD: Makefile,v 1.2 1998/02/02 20:53:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:10 agc Exp $
 #
 
 DISTNAME=	cddbd-1.3.1
@@ -29,4 +24,4 @@ do-install:
 	  BINPERM=${BINMODE} BINOWNER=${BINOWN} BINGROUP=${BINGRP} \
 	  sh install.sh )
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 078f7b3acad..a7634c4aa5f 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	gsm
-# Version required:     gsm-1.0.10
-# Date created:		5 January 1995
-# Whom:			pst
-#
-# $NetBSD: Makefile,v 1.7 1998/03/16 07:44:47 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:10 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:39 max Exp 
 #
 
@@ -24,4 +19,4 @@ post-install:
 	@strip ${PREFIX}/bin/toast
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index cec8862cd6c..291b6a466b1 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    maplay
-# Version required:     1.2
-# Date created:         Feb 13 1995
-# Whom:                 jkh
-#
-# $NetBSD: Makefile,v 1.2 1997/10/28 23:49:37 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:10 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp 
 #
 
@@ -21,4 +16,4 @@ PATCH_STRIP=	-p2
 pre-configure:
 	@(cd ${WRKSRC}; make pre-install)
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index fb899edc57e..d6e65fbe7ef 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		mikmod
-# Version required:	2.14
-#
-# $NetBSD: Makefile,v 1.6 1998/03/20 07:08:43 mycroft Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:10 agc Exp $
 #
 
 DISTNAME=	mikmod-2.14-unix
@@ -29,4 +26,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 183c67aa4ee..f6890d230b9 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mpg123
-# Version required:     mpg123-0.59k
-# Date created:		97-10-25
-# Whom:			augustss@cs.chalmers.se
-#
-# $NetBSD: Makefile,v 1.5 1998/03/07 13:55:38 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:10 agc Exp $
 #
 
 DISTNAME=       mpg123-0.59o
@@ -22,4 +17,4 @@ ALL_TARGET=	netbsd
 
 MAKE_FLAGS+=	PREFIX="${PREFIX}"
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 0fea9686628..08fb5965158 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		nspmod
-# Version required:	0.1
-#
-# $NetBSD: Makefile,v 1.3 1998/03/20 06:41:17 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:10 agc Exp $
 #
 
 DISTNAME=	nspmod-0.1
@@ -18,4 +15,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nspmod ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 62471025027..6e8e53e80c7 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	rplay - Network audio player   
-# Version required:     3.2.0b6
-# Date created:		16 March 1995  
-# Whom:			rmallory@csusb.edu
-#
-# $NetBSD: Makefile,v 1.5 1998/01/30 13:56:55 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:10 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -50,4 +45,4 @@ post-install:
 	install-info ${PREFIX}/info/rplay.info ${PREFIX}/info/dir
 	install-info ${PREFIX}/info/librplay.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 85810c62c48..9e6eb5cf270 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	snd
-# Version required:			12-Feb-98
-# Date created:				1998-02-22
-# Whom:					hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/03/05 15:32:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
 #
 
 DISTNAME=		snd
@@ -28,4 +23,4 @@ do-install:
 	${MKDIR} ${PREFIX}/share/doc/snd
 	cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${PREFIX}/share/doc/snd
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 2563c0455a4..91088510651 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	sox - Sound Exchange
-# Version required:	12p12
-# Date created:		17 Oct 1994
-# Whom:			torstenb
-#
-# $NetBSD: Makefile,v 1.2 1997/10/29 01:48:29 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp 
 #
 
@@ -22,4 +17,4 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/sox ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/sox.man ${PREFIX}/man/man1/sox.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index fb73d5150eb..113e20f61ee 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    splay
-# Version required:     0.3
-# Date created:         1 Apr 1997
-# Whom:                 junker@jazz.snu.ac.kr
-#
-# $NetBSD: Makefile,v 1.2 1997/11/01 00:56:26 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/08/09 23:37:33 fenner Exp 
 #
 
@@ -17,4 +12,4 @@ MAINTAINER=		junker@jazz.snu.ac.kr
 
 GNU_CONFIGURE=		yes
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index ecb2f53ab30..04fa1d91ee0 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,4 @@
-# Makefile for:		timidity
-# Homepage:		http://www.cgs.fi/~tt/timidity/
-# Version required:     0.2i
-#
-# $NetBSD: Makefile,v 1.9 1998/03/20 07:07:31 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:11 agc Exp $
 #
 
 DISTNAME=       timidity-0.2i
@@ -34,4 +30,4 @@ post-install:
 	cd ${PREFIX}/lib/timidity/patch && \
 	unzip -o -q -L ${DISTDIR}/${TIINS}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index d9cc0126a59..723c7db0eb1 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tosha
-# Version required:	0.05
-# Date created:		21 May 1997
-# Whom:			Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/19 01:13:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/05/25 08:58:43 andreas Exp
 #
 
@@ -15,4 +10,4 @@ MAINTAINER=	oliver.fromme@heim3.tu-clausthal.de
 
 MAN1=		pcmfade.1 pcmplay.1 tosha.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index e4af02fcb33..a8bc5d34842 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    tracker
-# Version required:     5.3
-# Date created:         2 Oct 1994
-# Whom:                 swallace
-#
-# $NetBSD: Makefile,v 1.6 1998/03/01 03:27:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:11 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp 
 #
 
@@ -37,4 +32,4 @@ post-install:
 	-${MKDIR} ${PREFIX}/share/doc/tracker
 	${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 0a1952c8f2f..3775cb53c62 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    xcd
-# Version required:     1.6
-# Date created:         22 November 1994
-# Whom:                 jmz
-#
-# $NetBSD: Makefile,v 1.2 1998/01/19 01:18:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
 # FreeBSD Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp
 #
 
@@ -18,4 +13,4 @@ RUN_DEPENDS=    wish8.0:${PORTSDIR}/x11/tk80
 WRKSRC=		${WRKDIR}/xcd
 MAN1=		cdplayer.1 xcd.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 786b07bf699..5c24e690b88 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    xcdplayer
-# Version required:     2.2
-# Date created:         30 Sep 1994
-# Whom:                 swallace
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 12:29:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:12 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/01 23:08:24 swallace Exp
 #
 
@@ -18,4 +13,4 @@ MAINTAINER=	swallace@FreeBSD.org
 USE_IMAKE=      yes
 CAT1=		xcdplayer.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"