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

Remove redundant (and sometimes erroneous) comments.

47 files changed, 94 insertions, 325 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 65a8998660c..796325b1203 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1998/03/24 22:48:07 tron Exp $
+# $NetBSD: Makefile,v 1.29 1998/04/15 10:38:52 agc Exp $
 # FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
 #
 
@@ -120,4 +120,4 @@
 #    SUBDIR += xview-lib
 #    SUBDIR += xzoom
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 93d7f616436..49527b9d667 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: Xaw3d
-# Version required:	1.3
-# Date created:         30th November 1997
-# Whom:                 tron@lyssa.owl.de, soren@t.dk
-#
-# $NetBSD: Makefile,v 1.11 1998/03/12 00:58:06 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:52 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp
 #
 
@@ -32,4 +27,4 @@ post-install:
 			< ${PKGDIR}/PLIST > ${PLIST_SRC};	\
 	fi
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/amiwm/Makefile b/x11/amiwm/Makefile
index 252b7f68a64..0ca1db4f910 100644
--- a/x11/amiwm/Makefile
+++ b/x11/amiwm/Makefile
@@ -1,9 +1,4 @@
-# New packages collection Makefile for: amiwm
-# Version required:     0.20pl28
-# Date created:         23-Feb-98
-# Whom:                 rh@trapdoor.vip.at
-#
-# $NetBSD: Makefile,v 1.1 1998/03/01 20:42:54 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:52 agc Exp $
 #
 
 DISTNAME=	amiwm0.20pl28
@@ -19,4 +14,4 @@ GNU_CONFIGURE=	yes
 
 MAN1=		amiwm.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index d699afe45f0..4e5feb0faf6 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    asclock
-# Version required:     10
-# Date created:         1997/11/11
-# Whom:                 Hubert Feyrer <hubert.feyrer@rz.uni-regensburg.de>
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:40 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:52 agc Exp $
 #
 
 DISTNAME=		asclock
@@ -43,4 +38,4 @@ INSTALL_TARGET=	install install.man
 do-configure:
 		cd ${WRKSRC} ; ( ${ECHO} ${LANG} ; ${ECHO} ${PANEL} ) | ./configure
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ctwm/Makefile b/x11/ctwm/Makefile
index da882ae26fa..4008f6afdce 100644
--- a/x11/ctwm/Makefile
+++ b/x11/ctwm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: ctwm
-# Version required:	3.5
-# Date created:         29th January 1998
-# Whom:                 tron
-#
-# $NetBSD: Makefile,v 1.7 1998/03/12 10:12:10 tron Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:52 agc Exp $
 #
 
 DISTNAME=	ctwm-3.5
@@ -18,4 +13,4 @@ USE_IMAKE=	yes
 
 CAT1=		ctwm.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index 15e116292fd..5ecb5469418 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	dxpc
-# Version required:			3.7.0
-# Date created:				2 Januar 1998
-# Whom:					frueauf@ira.uka.de
-#
-# $NetBSD: Makefile,v 1.3 1998/03/20 08:35:59 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:53 agc Exp $
 #
 
 DISTNAME=	dxpc-3.7.0
@@ -21,4 +16,4 @@ MAN1=		dxpc.1
 post-install:
 	@strip ${PREFIX}/bin/dxpc
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index ee646ed236b..73c732fc4ba 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	filerunner
-# Version required:	2.4.2
-# Date created:		24th March 1998
-# Whom:			hubertf
-#
-# $NetBSD: Makefile,v 1.4 1998/03/24 11:00:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:53 agc Exp $
 # $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
 #
 
@@ -34,4 +29,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
 .endfor
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 08c0d6bce54..68a23fd1a2f 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	fvwm (version 1)
-# Version required:	1.24r
-# Date created:		17 March 1997
-# Whom:			cjs@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/03/25 18:32:00 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:53 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -38,4 +33,4 @@ post-install:
 		${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \
 		${PREFIX}/lib/X11/fvwm/bitmaps
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index eb658876be9..92824f6b73a 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Internationalized fvwm2
-# Version required:	2.0.46
-# Date created:		20 Jan 1996
-# Whom:			peter
-#
-# $NetBSD: Makefile,v 1.6 1998/03/24 23:18:40 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:53 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -45,4 +40,4 @@ post-install:
 		${PREFIX}/lib/X11/fvwm2/pixmaps
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index e0120427f4a..75a33a4881e 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	fvwm95-2
-# Version required:	2.0.43a
-# Date created:		Sa   1 Feb 1997 14:46:05 MET
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/24 23:32:14 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:53 agc Exp $
 # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
 #
 
@@ -30,4 +25,4 @@ post-install:
 		@${INSTALL_MAN}	${WRKSRC}/fvwm/fvwm95.man \
 			${PREFIX}/man/man1/fvwm95.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 6d1977c9446..73443230464 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	gtk
-# Version required:			1.0.0
-# Date created:				29 January 1998
-# Whom:					bsieker@techfak.uni-bielefeld.de
-#
-# $NetBSD: Makefile,v 1.6 1998/04/14 23:15:59 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:53 agc Exp $
 
 DISTNAME=	gtk+-1.0.0
 CATEGORIES=	x11
@@ -28,4 +23,4 @@ pre-install:
 	 fi
 	@${SED} -e 's|\$${LOCALBASE}|'${LOCALBASE}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index 7af8c07a543..0d22b91f54a 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   kde
-# Version required:    Beta3
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/04/14 11:41:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp
 #
 
@@ -28,4 +23,4 @@ NO_BUILD=	yes
 
 do-install:	# empty
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index bd0f98c2643..2b822afd83e 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   kdebase
-# Version required:    Beta3
-# Date created:        28 October 1997
-# Whom:                Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/21 01:54:04 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 #
 
@@ -54,4 +49,4 @@ post-install:
 	@find ${PLIST_DIRS} -type d | sort -r | \
 	    ${SED} "s/${PREFIX:S/\//\\\//g}\//\@dirrm /g" >>${PLIST_SRC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 761f5dd6774..e2466b3d0fd 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   kdelibs
-# Version required:    Beta3
-# Date created:        28 October 1997
-# Whom:                Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/21 01:53:36 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -34,4 +29,4 @@ CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 
 WRKSRC=		${WRKDIR}/kdelibs
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 8179a5cb91a..29539ae6a61 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	lesstif
-# Version required:	0.83
-# Date created:		December 10, 1996
-# Whom:			1wardd@airmail.net
-#
-# $NetBSD: Makefile,v 1.15 1998/03/26 22:58:37 frueauf Exp $
+# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
@@ -53,4 +48,4 @@ pre-fetch:
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 48eb1d24c3f..68cc3d6bee9 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-Tk
-# Version required:			402.002
-# Date created:				October 21st 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:43 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
 #
 
@@ -41,4 +36,4 @@ MAN3PREFIX=	${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/x11/qt/Makefile b/x11/qt/Makefile
index d069ac5347e..e75f50fbdc2 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   qt
-# Version required:	1.33
-# Date created:		30 Jul 1996
-# Whom:			searle@longacre.demon.co.uk
-#
-# $NetBSD: Makefile,v 1.8 1998/04/14 20:17:03 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:54 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/10/30 05:15:19 jkh Exp
 #
 
@@ -126,4 +121,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${QTDIR}/share/doc/qt
 	${INSTALL_DATA} ${WRKSRC}/README.QT ${QTDIR}/share/doc/qt
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/rclock/Makefile b/x11/rclock/Makefile
index 26e9f069134..40cf29e5d29 100644
--- a/x11/rclock/Makefile
+++ b/x11/rclock/Makefile
@@ -1,10 +1,4 @@
-# ex:ts=8
-# Ports collection Makefile for:  rclock
-# Version required:		  2.19
-# Date created:			  24th Feburary 1997
-# Whom:				  obrien@NUXI.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:11:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/03/03 16:27:10 obrien Exp
 #
 
@@ -25,4 +19,4 @@ GNU_CONFIGURE=  yes
 ALL_TARGET=	clock
 MAN1=		rclock.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index b1e0ab66057..be17c9d3325 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: rxvt
-# Version required:	2.20
-# Date created:         5th December 1994
-# Whom:                 gpalmer@FreeBSD.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:12:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -21,4 +16,4 @@ USE_X11=	yes
 GNU_CONFIGURE=  yes
 MAN1=		rxvt.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/sunclock/Makefile b/x11/sunclock/Makefile
index c110d119359..d21e962ec19 100644
--- a/x11/sunclock/Makefile
+++ b/x11/sunclock/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	sunclock
-# Version required:			1.3
-# Date created:				Sun Dec 14 00:47:27 GMT 1997
-# Whom:					Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/25 00:14:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:55 agc Exp $
 #
 
 DISTNAME=	sunclock1.3
@@ -20,4 +15,4 @@ USE_IMAKE=	yes
 
 CAT1=		sunclock.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/swisswatch/Makefile b/x11/swisswatch/Makefile
index a9a47123f51..faa3495a545 100644
--- a/x11/swisswatch/Makefile
+++ b/x11/swisswatch/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    swisswatch
-# Version required:     0.0.6
-# Date created:         16 December 1995
-# Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:15:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/18 11:43:40 asami Exp
 #
 
@@ -16,4 +11,4 @@ MAINTAINER=	sanpei@yy.cs.keio.ac.jp
 
 USE_IMAKE=	yes
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index 62939ca033f..55b5efd20cf 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tk8.0
-# Version required:	tk8.0
-# Date created:		19 August 1997
-# Whom:			jkh
-#
-# $NetBSD: Makefile,v 1.11 1998/03/01 18:16:36 tron Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
 #
 
@@ -128,4 +123,4 @@ post-install:
 test:
 	cd ${WRKSRC}; make test
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkcron/Makefile b/x11/tkcron/Makefile
index 9cbac3ced3a..ff5afdd75ad 100644
--- a/x11/tkcron/Makefile
+++ b/x11/tkcron/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tkcron-2.12
-# Version required:	2.12
-# Date created:		30 July 1996
-# Whom:			Sander Vesik <sander@haldjas.folklore.ee>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:17:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/22 20:10:39 jseger Exp
 #
 
@@ -24,4 +19,4 @@ NO_WRKSUBDIR=	yes
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index fcb56ee34d7..b5c5580eacb 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tkinfo
-# Version required:     1.5
-# Date created:         16 Jan 1995
-# Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:19:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
 #
 
@@ -25,4 +20,4 @@ post-patch:
 	( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|'${PREFIX}'|g' \
 		<tkinfo >tkinfo.BAK ; ${MV} tkinfo.BAK tkinfo )
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkirc/Makefile b/x11/tkirc/Makefile
index 97751ba0faf..2ab528e080e 100644
--- a/x11/tkirc/Makefile
+++ b/x11/tkirc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    tkirc
-# Version required:     1.202
-# Date created:         1997/11/09
-# Whom:                 Hubert Feyrer <hubertf@netbsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/03/28 21:41:11 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:55 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
@@ -27,4 +22,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/CHANGES	  ${PREFIX}/share/doc/tkirc
 	${INSTALL_DATA} ${WRKSRC}/COPYING	  ${PREFIX}/share/doc/tkirc
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index b9be3df85a1..a37b83684f6 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	tkman
-# Version required:     1.8
-# Date created:         27 Dec 1994
-# Whom:                 thomas Gellekum <tg@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.8 1998/03/10 16:44:47 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
@@ -21,4 +16,4 @@ RUN_DEPENDS=		rman:${PORTSDIR}/textproc/rman \
 NO_CDROM=		"Don't sell for profit"
 MIRROR_DISTFILE=	no
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index 7a2fd42c760..617cf7064d0 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,7 +1,4 @@
-# Makefile for:		unclutter
-# Version required:	8
-#
-# $NetBSD: Makefile,v 1.4 1998/03/20 06:51:55 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:56 agc Exp $
 #
 
 DISTNAME=	unclutter-8
@@ -16,4 +13,4 @@ WRKSRC=		${WRKDIR}/unclutter
 USE_IMAKE=	yes
 CAT1=		unclutter.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index f56d5759dec..00c5ec15418 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:	WindowMaker
-# Version required:	0.6.3
-# Date created:		August 13, 1997
-# Whom:			handy@physics.montana.edu (FreeBSD)
-# 			explorer@netbsd.org (NetBSD)
-#
-# $NetBSD: Makefile,v 1.6 1998/03/10 16:47:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/04 10:33:43 tg Exp
 #
 
@@ -25,4 +19,4 @@ GNU_CONFIGURE=		yes
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 3f0079532d6..1e0184c8ebd 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	x3270
-# Version required:	3.1.1.6
-# Date created:		31 January 1995
-# Whom:			janek
-#
-# $NetBSD: Makefile,v 1.3 1998/01/30 16:39:21 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/10/15 20:23:40 max Exp
 #
 
@@ -18,4 +13,4 @@ WRKSRC=		${WRKDIR}/x3270-3.1.1
 USE_IMAKE=	yes
 CAT1=		x3270.0 x3270if.0 x3270-script.0 ibm_hosts.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index aa14ce6a512..1a61033f6b7 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,9 +1,4 @@
-# Ports collection makefile for:	xautolock
-# Version required:	1pl10
-# Date created:		20 Jul 1996
-# Whom:			Eric Blood <eblood@cs.unr.edu>
-#
-# $NetBSD: Makefile,v 1.4 1998/01/25 00:29:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/11/18 09:55:42 asami Exp
 #
 
@@ -21,4 +16,4 @@ WRKSRC=		${WRKDIR}/xautolock.pl10
 
 CAT1=		xautolock.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 97947e5bd43..cbedb4cd6b1 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xcolors
-# Version required:	R6 contrib
-# Date created:		10 May 1995
-# Whom:			asami
-#
-# $NetBSD: Makefile,v 1.2 1998/01/23 12:08:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:56 agc Exp $
 # FreeBSD: Makefile,v 1.9 1998/01/22 00:41:36 fenner Exp
 #
 
@@ -19,4 +14,4 @@ USE_IMAKE=	yes
 IGNOREFILES=	xcolors.tar.gz
 CAT1=    xcolors.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index de735379022..70028c4ccb6 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xearth
-# Version required:    			1.0
-# Date created:				Mon Jan 19 14:34:50 GMT 1998
-# Whom:					agc@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/02/10 21:58:50 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:57 agc Exp $
 #
 
 DISTNAME=	xearth-1.0
@@ -15,4 +10,4 @@ MAINTAINER=	agc@netbsd.org
 USE_IMAKE=	yes
 CAT1=		xearth.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfinans/Makefile b/x11/xfinans/Makefile
index 44242aee682..49f90af5f8f 100644
--- a/x11/xfinans/Makefile
+++ b/x11/xfinans/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	Xfinans
-# Version required:			5.9
-# Date Created:				30 January 1998
-# Whom:					root@garbled.futureone.com
-#
-# $NetBSD: Makefile,v 1.1 1998/02/08 23:48:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:57 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
@@ -37,4 +32,4 @@ post-install:
 	${CP} ${WRKSRC}/../category_engine ${PREFIX}/share/examples/Xfinans
 	${RM} ${PREFIX}/man/cat1/xfinans.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 8b68da72a8a..5dfff51cf57 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   xfishtank
-# Version required:    2.2
-# Date created:        24th April 1997
-# Whom:                jacs
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:30:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/17 07:45:12 asami Exp
 #
 
@@ -20,4 +15,4 @@ NO_INSTALL_MANPAGES=yes
 post-patch:
 	cd  ${WRKDIR}/xfishtank2.0; make clean
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index f81437ce20d..74fc6693d4d 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xforms
-# Version required:	0.88
-# Date created:		24 January 1998
-# Whom:			lamj@stat.cmu.edu
-#
-# $NetBSD: Makefile,v 1.1 1998/02/27 21:50:44 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:57 agc Exp $
 #
 
 DISTNAME=		bxform-088
@@ -41,4 +36,4 @@ post-patch:
 post-install:
 	${LDCONFIG} || ${TRUE}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xgas/Makefile b/x11/xgas/Makefile
index 77b6bb1ba1c..e69084845cf 100644
--- a/x11/xgas/Makefile
+++ b/x11/xgas/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    xgas
-# Version required:     1.0
-# Date created:         20 Oct 1996
-# Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/25 00:31:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1996/11/15 09:55:44 asami Exp
 #
 
@@ -20,4 +15,4 @@ post-install:
 	@chmod 755 ${PREFIX}/bin/xgas
 	@chown bin.bin ${PREFIX}/bin/xgas
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index ff13e6f73e4..13060b77072 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,9 +1,4 @@
-# Packages collection Makefile for: 	xkeycaps
-# Version required: 			2.38
-# Date created: 			Sat Dec 13 01:12:10 GMT 1997
-# Whom: 				Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/25 00:34:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:57 agc Exp $
 #
 
 DISTNAME=	xkeycaps-2.38
@@ -16,4 +11,4 @@ MAINTAINER=	packages@netbsd.org
 USE_IMAKE=      yes
 CAT1=           xkeycaps.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index 1da1b73e801..3e0f61befac 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xless
-# Version required:	1.7
-# Date created:		23 December 1996
-# Whom:			Conrad Sabatier <conrads@neosoft.com>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/25 00:39:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/12/29 00:51:27 obrien Exp
 #
 
@@ -17,4 +12,4 @@ MAINTAINER=	conrads@neosoft.com
 
 USE_IMAKE=	yes
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index e42808939c7..a8eec336244 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xlockmore
-# Version required:     4.08
-# Date created:		2 March 1998
-# Whom:			hubertf
-#
-# $NetBSD: Makefile,v 1.11 1998/03/24 07:54:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:58 agc Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
@@ -23,4 +18,4 @@ CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \
 USE_X11=	yes
 MAN1=		xlock.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 2125ed3e2f8..191aad17f29 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   xmascot
-# Version required:    2.5p2
-# Date created:        20 November 1996
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
-# $NetBSD: Makefile,v 1.6 1998/01/25 00:45:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:58 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/07 19:47:09 max Exp
 #
 
@@ -23,4 +18,4 @@ CAT1=		xmascot.0
 MANCOMPRESSED=	yes
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 0c24a75f202..837162caf06 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xmove
-# Version required:	2.0b2
-# Date created:		Tue Mar 10 22:45:33 GMT 1998
-# Whom:			Alistair Crooks agc@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/03/16 12:36:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:58 agc Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -30,4 +25,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/limitations.txt ${XMOVEDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/using_xmove.txt ${XMOVEDOCDIR}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile
index c8ba9b69278..dd98042194c 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xneko
-# Version required:	4.4BSD-Lite
-# Date created:		22 December 1995
-# Whom:			markm
-#
-# $NetBSD: Makefile,v 1.2 1998/02/17 23:47:48 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:58 agc Exp $
 # $FreeBSD Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp
 #
 
@@ -20,4 +15,4 @@ WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 
 MAN6=	xneko.6
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xplot/Makefile b/x11/xplot/Makefile
index c1e2e8a2cd7..b8314f74579 100644
--- a/x11/xplot/Makefile
+++ b/x11/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/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 41d90edb272..b3311c3d1ec 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,10 +1,4 @@
-#
-# New packages collection makefile for:	xpmroot
-# Version required:	2.0.46
-# Date created:		24 Mar 1998
-# Whom:			tron@netbsd.org
-#
-# $NetBSD: Makefile,v 1.1 1998/03/24 22:45:21 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:58 agc Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
@@ -23,4 +17,4 @@ CAT1= 		xpmroot.0
 
 WRKSRC=		${WRKDIR}/fvwm-2.0.46/xpmroot
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 422815b6856..bc8a2fd7b38 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xpns
-# Version required:     1.0
-# Date created:         6 Apr 97
-# Whom:                 Pedro Giffuni <pgiffuni@fps.biblos.unal.edu.co>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/25 00:49:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:58 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
 #
 
@@ -33,4 +28,4 @@ post-install:
 	${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 8926aa8fa8a..5eee3bc9c99 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    xsnow
-# Version required:     1.40
-# Date created:         12 November 1994
-# Whom:                 jmz
-#
-# $NetBSD: Makefile,v 1.3 1998/01/25 00:50:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:59 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1996/11/18 09:56:45 asami Exp 
 #
 
@@ -22,4 +17,4 @@ pre-install:
 	@mkdir -p ${PREFIX}/man/man6
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xtimer/Makefile b/x11/xtimer/Makefile
index 50dc9dfcff8..3f6f18b9756 100644
--- a/x11/xtimer/Makefile
+++ b/x11/xtimer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	xtimer
-# Version required:	0.8087
-# Date created:		05 Apr 1997
-# Whom:			candy@fct.kgc.co.jp
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 16:50:29 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:59 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/15 10:44:39 asami Exp
 #
 
@@ -17,4 +12,4 @@ MAINTAINER=	candy@fct.kgc.co.jp
 USE_IMAKE=	yes
 CAT1=		xtimer.0
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"