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, 138 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 82bde144a6b..1b2e6be1a5d 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: ImageMagick
-# Version required:	4.0.1
-# Date created:         09th February 1998
-# Whom:                 tron
-#
-# $NetBSD: Makefile,v 1.15 1998/03/28 21:55:48 tron Exp $
+# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:25 agc Exp $
 #
 
 DISTNAME=	ImageMagick-4.0.3
@@ -30,4 +25,4 @@ CAT5=		quantize.0
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Makefile b/graphics/Makefile
index 30ddffe3570..585ab0dd13a 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/03/29 22:17:55 tron Exp $
+# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:25 agc Exp $
 # FreeBSD Id: Makefile,v 1.53 1997/09/28 13:25:40 markm Exp
 #
 
@@ -68,4 +68,4 @@
     SUBDIR += xpm
     SUBDIR += xv
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 571f2c106fb..feb84960ad0 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,7 +1,4 @@
-# New packages collection makefile for:	Mesa
-# Version required:     		2.6
-#
-# $NetBSD: Makefile,v 1.13 1998/03/26 22:54:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/15 10:38:25 agc Exp $
 #
 
 DISTNAME=       MesaLib-2.6
@@ -51,4 +48,4 @@ do-install:
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/Mesa
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 7727b2bef05..5b341ab21d1 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: gd
-# Version required:     1.2
-# Date created:         28 Jan 1997
-# Whom:                 jeff@cetlink.net
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 00:51:59 explorer Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:25 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -19,4 +14,4 @@ pre-install:
 	${MKDIR} ${PREFIX}/include/gd
 	${MKDIR} ${PREFIX}/share/examples/gd
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 7afa2ea2e69..f67d3038cde 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	giflib
-# Version required:	3.0
-# Date created:		03 May 1997
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:25 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp
 #
 
@@ -20,4 +15,4 @@ post-install:
 .endif
 	@${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c5aacfb14e6..f50cdaf91cc 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: gimp
-# Version required:	0.99.18
-# Date created:         29 January 1998
-# Whom:                 Bernd Sieker <bsieker@techfak.uni-bielefeld.de>
-#
-# $NetBSD: Makefile,v 1.7 1998/03/11 10:10:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:25 agc Exp $
 
 DISTNAME=	gimp-0.99.18
 CATEGORIES=	graphics
@@ -83,4 +78,4 @@ post-install:
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 01b2beb0dd2..1d915c845b3 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	gnuplot
-# Version required:			3.5
-# Date Created:				30 January 1998
-# Whom:					root@garbled.futureone.com
-#
-# $NetBSD: Makefile,v 1.2 1998/02/08 23:59:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:26 agc Exp $
 #
 
 DISTNAME=	gnuplot-3.5
@@ -20,4 +15,4 @@ MAN1=		gnuplot.1
 post-patch:
 	${RM} ${WRKSRC}/docs/makefile
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 0219747098d..6d4af893e9f 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	jpeg
-# Version required:     6a
-# Date created:		6 November 1994
-# Whom:			smace
-#
-# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:43 max Exp
 #
 
@@ -22,4 +17,4 @@ MAN1=		cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 8bf01219aae..9512173ab03 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mpeg
-# Version required:			1.2.1
-# Date created:				07 December 1997
-# Whom:					tron@lyssa.owl.de
-#
-# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:26 agc Exp $
 
 DISTNAME=	mpeg_lib-1.2.1
 PKGNAME=	mpeg-1.2.1
@@ -26,4 +21,4 @@ post-install:
 	(cd ${WRKSRC};make PREFIX=${PREFIX} includes)
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 79d7ad644f9..ffad607dda6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	netpbm
-# Version required:	1mar1994
-# Date created:		20 December 1997
-# Whom:			jmz (original), asami@FreeBSD.ORG, tron
-#
-# $NetBSD: Makefile,v 1.12 1998/02/25 01:40:47 tron Exp $
+# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:26 agc Exp $
 #
 
 DISTNAME=	netpbm
@@ -82,4 +77,4 @@ post-extract:
 	${MV} ../*pcx*.? ppm;\
 	${MV} ../*rle*.? ../*png*.? pnm
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 599a00696d3..936aeb98968 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	pixmap
-# Version required:	2.6
-# Date created:		19 February 1995
-# Whom:			jmz
-#
-# $NetBSD: Makefile,v 1.3 1998/01/30 13:57:15 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:26 agc Exp $
 # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
 #
 
@@ -21,4 +16,4 @@ WRKSRC=		${WRKDIR}/pixmap
 USE_IMAKE=	yes
 CAT1=    pixmap.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 4ae16b11673..9dbe6d9950b 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    PNG images library
-# Version required:     0.96
-# Date created:         5 Dec 1995
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.5 1998/02/02 08:59:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
 #
 
@@ -20,4 +15,4 @@ MAKEFILE=       makefile
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 08d4d04c091..07adcd765f5 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tgif
-# Version required:	3.0-p16
-# Date created:		7 Dec 1997
-# Whom:			Dan McMahill <mcmahill@alum.mit.edu>
-#
-# $NetBSD: Makefile,v 1.1 1998/03/29 22:16:36 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:27 agc Exp $
 
 DISTNAME=	tgif-3.0-p16
 CATEGORIES=	graphics
@@ -16,4 +11,4 @@ USE_IMAKE=	yes
 
 CAT1=	prtgif.0 tgif.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 2e73f18201f..4445d1cc663 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tiff
-# Version required:	3.4 beta 037
-# Date created:		27 November 1997
-# Whom:			tron
-#
-# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:27 agc Exp $
 
 DISTNAME=	tiff-v3.4beta037
 PKGNAME=	tiff-3.4
@@ -54,4 +49,4 @@ CONFIGURE_ENV+=		PREFIX=${PREFIX}
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index a96f301c6e2..da57d4de44a 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		xanim
-# Version required:     2.70.6.4
-#
-# $NetBSD: Makefile,v 1.8 1998/03/20 06:15:38 mycroft Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:27 agc Exp $
 #
 
 DISTNAME=       xanim27064
@@ -40,4 +37,4 @@ post-extract:
 	  ${GUNZIP_CMD} ${WRKSRC}/$$file; \
 	done
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index d54cec556c9..810e732075f 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xbmbrowser
-# Version required:	xbmbrowser5.1
-# Date created:		06 September 1995
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 14:02:54 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:27 agc Exp $
 # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp
 #
 
@@ -22,4 +17,4 @@ USE_GMAKE=		yes
 
 CAT1=			xbmbrowser.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index a058708ffe5..ec5f6017efd 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xfig
-# Version required:			3.2
-# Date Created:				30 January 1998
-# Whom:					root@garbled.futureone.com
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 14:04:55 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:27 agc Exp $
 #
 
 DISTNAME=		xfig.3.2
@@ -28,4 +23,4 @@ post-install:
 	${CP} ${WRKSRC}/Examples/* ${X11BASE}/share/examples/xfig
 	${CP} ${WRKSRC}/Doc/xfig.ps.gz ${X11BASE}/share/doc/xfig
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index ba4f93511a2..11c210bc923 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    xpaint
-# Version required:     2.4.8
-# Date created:         2 Jan 1995
-# Whom:                 swallace
-#
-# $NetBSD: Makefile,v 1.2 1998/02/05 11:39:00 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 #
 
@@ -28,4 +23,4 @@ pre-configure:
 		< ${WRKSRC}/Local.config > ${WRKSRC}/Local.config.new && \
 	${MV} ${WRKSRC}/Local.config.new ${WRKSRC}/Local.config
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile
index c1e2e8a2cd7..b8314f74579 100644
--- a/graphics/xplot/Makefile
+++ b/graphics/xplot/Makefile
@@ -1,9 +1,4 @@
-# Packages collection Makefile for: xplot
-# Version required: 0.90
-# Date created: 10 December 1997
-# Whom: thorpej
-#
-# $NetBSD: Makefile,v 1.4 1998/01/25 00:46:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:58 agc Exp $
 #
 
 DISTNAME=	xplot-0.90
@@ -25,4 +20,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 9e6c58010ab..872eb0e5989 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xpm
-# Version required:     3.4j
-# Date created:		14 September 1994
-# Whom:			jkh
-#
-# $NetBSD: Makefile,v 1.7 1998/02/02 08:59:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/17 15:12:45 max Exp
 #
 
@@ -20,4 +15,4 @@ CAT1= 		sxpm.0
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 1c601b37ee8..52772e0ba65 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xv
-# Version required:	3.10a
-# Date created:		30 October 1994
-# Whom:			smace
-#
-# $NetBSD: Makefile,v 1.6 1998/02/05 14:22:41 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp
 #
 
@@ -42,4 +37,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"