summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1998-04-15 10:38:15 +0000
committeragc <agc@pkgsrc.org>1998-04-15 10:38:15 +0000
commit258b808c9f6f683ca8810e74e4dce09adb0493fb (patch)
tree35307bbb1d53c1243684aaf33a30be9253e985bc
parent24d9d77786235d895f1e269ed5b2b85a91ef6987 (diff)
downloadpkgsrc-258b808c9f6f683ca8810e74e4dce09adb0493fb.tar.gz
Use the bsd.pkg.mk and bsd.pkg.subdir.mk files in the pkgsrc tree.
Remove redundant (and sometimes erroneous) comments.
-rw-r--r--audio/xmix/Makefile9
-rw-r--r--audio/xmmix/Makefile9
-rw-r--r--audio/xwave/Makefile9
-rw-r--r--benchmarks/Makefile4
-rw-r--r--benchmarks/bonnie/Makefile9
-rw-r--r--cad/Makefile4
-rw-r--r--comms/Makefile4
-rw-r--r--comms/kermit/Makefile9
-rw-r--r--comms/lrzsz/Makefile9
-rw-r--r--comms/minicom/Makefile10
-rw-r--r--comms/modemd/Makefile9
-rw-r--r--comms/pilot-link/Makefile9
-rw-r--r--converters/Makefile4
-rw-r--r--converters/kdesupport/Makefile9
-rw-r--r--converters/mpack/Makefile9
-rw-r--r--converters/p5-MIME-Base64/Makefile9
-rw-r--r--converters/uudeview/Makefile9
-rw-r--r--converters/uulib/Makefile9
-rw-r--r--converters/xdeview/Makefile9
-rw-r--r--databases/Makefile4
-rw-r--r--databases/gdbm/Makefile9
-rw-r--r--databases/postgresql/Makefile9
-rw-r--r--devel/Makefile4
-rw-r--r--devel/autoconf/Makefile9
-rw-r--r--devel/automake/Makefile9
-rw-r--r--devel/bison/Makefile9
-rw-r--r--devel/boehm-gc/Makefile9
-rw-r--r--devel/cvs/Makefile9
-rw-r--r--devel/gindent/Makefile9
-rw-r--r--devel/gmake/Makefile9
-rw-r--r--devel/gtexinfo/Makefile9
-rw-r--r--devel/id-utils/Makefile9
-rw-r--r--devel/libg++/Makefile9
-rw-r--r--devel/libslang/Makefile9
-rw-r--r--devel/m4/Makefile9
-rw-r--r--devel/mit-pthreads/Makefile9
-rw-r--r--devel/ncurses/Makefile9
-rw-r--r--devel/noweb/Makefile9
-rw-r--r--devel/p5-Data-Dumper/Makefile9
-rw-r--r--devel/prcs/Makefile9
-rw-r--r--devel/readline/Makefile9
-rw-r--r--devel/tkcvs/Makefile9
-rw-r--r--devel/xxgdb/Makefile9
-rw-r--r--editors/Makefile4
-rw-r--r--editors/emacs/Makefile9
-rw-r--r--editors/joe/Makefile11
-rw-r--r--editors/sam/Makefile9
-rw-r--r--editors/ssam/Makefile9
-rw-r--r--editors/vile/Makefile9
-rw-r--r--editors/vim/Makefile10
-rw-r--r--editors/wily/Makefile9
-rw-r--r--editors/xemacs20/Makefile9
-rw-r--r--editors/xvile/Makefile9
-rw-r--r--emulators/Makefile4
-rw-r--r--emulators/compat11/Makefile9
-rw-r--r--emulators/compat12/Makefile9
-rw-r--r--emulators/linux_lib/Makefile9
-rw-r--r--emulators/wine/Makefile9
-rw-r--r--emulators/xmame/Makefile7
-rw-r--r--fonts/Xg/Makefile9
-rw-r--r--games/Makefile4
-rw-r--r--games/kdegames/Makefile9
-rw-r--r--games/xblast/Makefile9
-rw-r--r--games/xdemineur/Makefile9
-rw-r--r--games/xkobo/Makefile9
-rw-r--r--graphics/ImageMagick/Makefile9
-rw-r--r--graphics/Makefile4
-rw-r--r--graphics/Mesa/Makefile7
-rw-r--r--graphics/gd/Makefile9
-rw-r--r--graphics/giflib/Makefile9
-rw-r--r--graphics/gimp/Makefile9
-rw-r--r--graphics/gnuplot/Makefile9
-rw-r--r--graphics/jpeg/Makefile9
-rw-r--r--graphics/mpeg-lib/Makefile9
-rw-r--r--graphics/netpbm/Makefile9
-rw-r--r--graphics/pixmap/Makefile9
-rw-r--r--graphics/png/Makefile9
-rw-r--r--graphics/tgif/Makefile9
-rw-r--r--graphics/tiff/Makefile9
-rw-r--r--graphics/xanim/Makefile7
-rw-r--r--graphics/xbmbrowser/Makefile9
-rw-r--r--graphics/xfig/Makefile9
-rw-r--r--graphics/xpaint/Makefile9
-rw-r--r--graphics/xplot/Makefile9
-rw-r--r--graphics/xpm/Makefile9
-rw-r--r--graphics/xv/Makefile9
-rw-r--r--lang/Makefile4
-rw-r--r--lang/elk/Makefile9
-rw-r--r--lang/expect/Makefile9
-rw-r--r--lang/guavac/Makefile9
-rw-r--r--lang/hugs/Makefile9
-rw-r--r--lang/icon/Makefile9
-rw-r--r--lang/kaffe/Makefile9
-rw-r--r--lang/mawk/Makefile9
-rw-r--r--lang/moscow_ml/Makefile9
-rw-r--r--lang/perl5/Makefile9
-rw-r--r--lang/python/Makefile9
-rw-r--r--lang/scheme48/Makefile9
-rw-r--r--lang/tcl80/Makefile9
-rw-r--r--lang/tclX80/Makefile10
-rw-r--r--mail/Makefile4
-rw-r--r--mail/elm/Makefile10
-rw-r--r--mail/exmh/Makefile9
-rw-r--r--mail/faces/Makefile10
-rw-r--r--mail/fetchmail/Makefile9
-rw-r--r--mail/metamail/Makefile9
-rw-r--r--mail/mutt/Makefile10
-rw-r--r--mail/nmh/Makefile9
-rw-r--r--mail/pine/Makefile10
-rw-r--r--mail/procmail/Makefile9
-rw-r--r--mail/qpopper/Makefile9
-rw-r--r--math/Makefile4
-rw-r--r--math/py-Numeric/Makefile9
-rw-r--r--mbone/Makefile4
-rw-r--r--mbone/imm/Makefile9
-rw-r--r--mbone/nte/Makefile13
-rw-r--r--mbone/rat/Makefile9
-rw-r--r--mbone/sdr/Makefile15
-rw-r--r--mbone/vat/Makefile9
-rw-r--r--mbone/vic/Makefile9
-rw-r--r--misc/Makefile4
-rw-r--r--misc/amanda/Makefile9
-rw-r--r--misc/astrolog/Makefile13
-rw-r--r--misc/buffer/Makefile9
-rw-r--r--misc/cal/Makefile9
-rw-r--r--misc/chord/Makefile9
-rw-r--r--misc/colorls/Makefile9
-rw-r--r--misc/dotfile/Makefile9
-rw-r--r--misc/fd/Makefile9
-rw-r--r--misc/fep/Makefile9
-rw-r--r--misc/figlet/Makefile9
-rw-r--r--misc/git/Makefile9
-rw-r--r--misc/gnuls/Makefile9
-rw-r--r--misc/ical/Makefile9
-rw-r--r--misc/jive/Makefile10
-rw-r--r--misc/kdeutils/Makefile9
-rw-r--r--misc/kp/Makefile9
-rw-r--r--misc/libutf/Makefile9
-rw-r--r--misc/lile/Makefile9
-rw-r--r--misc/linuxls/Makefile9
-rw-r--r--misc/logsurfer/Makefile9
-rw-r--r--misc/mc/Makefile9
-rw-r--r--misc/most/Makefile9
-rw-r--r--misc/p5-Array-PrintCols/Makefile9
-rw-r--r--misc/p5-Business-CreditCard/Makefile9
-rw-r--r--misc/p5-Locale-Codes/Makefile9
-rw-r--r--misc/p5-Search/Makefile9
-rw-r--r--misc/rpm/Makefile7
-rw-r--r--misc/screen/Makefile9
-rw-r--r--misc/splitvt/Makefile9
-rw-r--r--misc/team/Makefile9
-rw-r--r--misc/xfinans/Makefile9
-rw-r--r--misc/zorro/Makefile9
-rw-r--r--net/Makefile4
-rw-r--r--net/bing/Makefile9
-rw-r--r--net/icb/Makefile9
-rw-r--r--net/ircII/Makefile9
-rw-r--r--net/kdenetwork/Makefile9
-rw-r--r--net/mirror/Makefile9
-rw-r--r--net/ncftp2/Makefile9
-rw-r--r--net/p5-Net/Makefile9
-rw-r--r--net/rsync/Makefile9
-rw-r--r--net/samba/Makefile9
-rw-r--r--net/scotty/Makefile9
-rw-r--r--net/sirc/Makefile9
-rw-r--r--net/sniffit/Makefile10
-rw-r--r--net/socks5/Makefile9
-rw-r--r--net/tcptrace/Makefile9
-rw-r--r--net/tkirc/Makefile9
-rw-r--r--net/ttcp/Makefile9
-rw-r--r--net/wget/Makefile9
-rw-r--r--net/wu-ftpd/Makefile9
-rw-r--r--net/zephyr/Makefile7
-rw-r--r--news/Makefile4
-rw-r--r--news/knews/Makefile9
-rw-r--r--news/nntpclnt/Makefile10
-rw-r--r--plan9/9menu/Makefile9
-rw-r--r--plan9/9term/Makefile9
-rw-r--r--plan9/9wm/Makefile9
-rw-r--r--plan9/Makefile4
-rw-r--r--plan9/Xg/Makefile9
-rw-r--r--plan9/rc/Makefile9
-rw-r--r--plan9/sam/Makefile9
-rw-r--r--plan9/wily/Makefile9
-rw-r--r--print/Makefile4
-rw-r--r--print/a2ps/Makefile9
-rw-r--r--print/enscript/Makefile9
-rw-r--r--print/ghostscript5/Makefile9
-rw-r--r--print/gv/Makefile9
-rw-r--r--print/lyx/Makefile9
-rw-r--r--print/mpage/Makefile9
-rw-r--r--print/psutils/Makefile9
-rw-r--r--print/teTeX/Makefile9
-rw-r--r--print/transfig/Makefile9
-rw-r--r--security/Makefile4
-rw-r--r--security/p5-MD5/Makefile9
-rw-r--r--security/pgp2/Makefile9
-rw-r--r--security/rsaref/Makefile9
-rw-r--r--security/ssh/Makefile15
-rw-r--r--security/sudo/Makefile9
-rw-r--r--shells/Makefile4
-rw-r--r--shells/bash2/Makefile9
-rw-r--r--shells/es/Makefile9
-rw-r--r--shells/rc/Makefile9
-rw-r--r--shells/scsh/Makefile9
-rw-r--r--shells/tcsh/Makefile9
-rw-r--r--shells/zsh/Makefile9
-rw-r--r--sysutils/Makefile4
-rw-r--r--sysutils/amanda/Makefile9
-rw-r--r--sysutils/cdrecord/Makefile9
-rw-r--r--sysutils/crashme/Makefile9
-rw-r--r--sysutils/depot/Makefile9
-rw-r--r--sysutils/lsof/Makefile9
-rw-r--r--sysutils/mc/Makefile9
-rw-r--r--sysutils/mkisofs/Makefile9
-rw-r--r--sysutils/mtools/Makefile9
-rw-r--r--sysutils/rtty/Makefile11
-rw-r--r--sysutils/socket/Makefile9
-rw-r--r--sysutils/top/Makefile9
-rw-r--r--sysutils/xosview/Makefile9
-rw-r--r--sysutils/xosview/patches/patch-ae2
-rw-r--r--textproc/Makefile4
-rw-r--r--textproc/glimpse/Makefile9
-rw-r--r--textproc/ispell/Makefile9
-rw-r--r--textproc/par/Makefile9
-rw-r--r--textproc/rman/Makefile9
-rw-r--r--textproc/unroff/Makefile9
-rw-r--r--www/Makefile4
-rw-r--r--www/apache/Makefile9
-rw-r--r--www/lynx/Makefile10
-rw-r--r--www/mozilla/Makefile9
-rw-r--r--www/p5-libwww/Makefile9
-rw-r--r--x11/Makefile4
-rw-r--r--x11/Xaw3d/Makefile9
-rw-r--r--x11/amiwm/Makefile9
-rw-r--r--x11/asclock/Makefile9
-rw-r--r--x11/ctwm/Makefile9
-rw-r--r--x11/dxpc/Makefile9
-rw-r--r--x11/filerunner/Makefile9
-rw-r--r--x11/fvwm1/Makefile9
-rw-r--r--x11/fvwm2/Makefile9
-rw-r--r--x11/fvwm95/Makefile9
-rw-r--r--x11/gtk/Makefile9
-rw-r--r--x11/kde/Makefile9
-rw-r--r--x11/kdebase/Makefile9
-rw-r--r--x11/kdelibs/Makefile9
-rw-r--r--x11/lesstif/Makefile9
-rw-r--r--x11/p5-Tk/Makefile9
-rw-r--r--x11/qt/Makefile9
-rw-r--r--x11/rclock/Makefile10
-rw-r--r--x11/rxvt/Makefile9
-rw-r--r--x11/sunclock/Makefile9
-rw-r--r--x11/swisswatch/Makefile9
-rw-r--r--x11/tk80/Makefile9
-rw-r--r--x11/tkcron/Makefile9
-rw-r--r--x11/tkinfo/Makefile9
-rw-r--r--x11/tkirc/Makefile9
-rw-r--r--x11/tkman/Makefile9
-rw-r--r--x11/unclutter/Makefile7
-rw-r--r--x11/windowmaker/Makefile10
-rw-r--r--x11/x3270/Makefile9
-rw-r--r--x11/xautolock/Makefile9
-rw-r--r--x11/xcolors/Makefile9
-rw-r--r--x11/xearth/Makefile9
-rw-r--r--x11/xfinans/Makefile9
-rw-r--r--x11/xfishtank/Makefile9
-rw-r--r--x11/xforms/Makefile9
-rw-r--r--x11/xgas/Makefile9
-rw-r--r--x11/xkeycaps/Makefile9
-rw-r--r--x11/xless/Makefile9
-rw-r--r--x11/xlockmore/Makefile9
-rw-r--r--x11/xmascot/Makefile9
-rw-r--r--x11/xmove/Makefile9
-rw-r--r--x11/xneko/Makefile9
-rw-r--r--x11/xplot/Makefile9
-rw-r--r--x11/xpmroot/Makefile10
-rw-r--r--x11/xpns/Makefile9
-rw-r--r--x11/xsnow/Makefile9
-rw-r--r--x11/xtimer/Makefile9
279 files changed, 562 insertions, 1843 deletions
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 96c3aa1a52f..89d5db0320f 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xmix
-# Version required: 2.1
-# Date created: 30 June 1995
-# Whom: janek@gaja.ipan.lublin.pl
-#
-# $NetBSD: Makefile,v 1.3 1998/01/19 01:21:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:15 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1996/11/18 13:56:53 asami Exp
#
@@ -27,4 +22,4 @@ pre-configure:
pre-install:
${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 163cef72c68..be445f565f4 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xmmix
-# Version required: 1.2-pl2
-# Date created: 97-10-24
-# Whom: augustss@cs.chalmers.se
-#
-# $NetBSD: Makefile,v 1.8 1998/03/26 07:21:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:15 agc Exp $
# FreeBSD ID: Makefile,v 1.5 1997/09/08 13:37:47 tg Exp
#
@@ -25,4 +20,4 @@ post-patch:
${SED} "s^/usr/lib/X11/xmmix.hlp^${PREFIX}/lib/X11/xmmix.hlp^" $$file.orig > $$file; \
done
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index a8791c32081..96e6880f07b 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xwave
-# Version required: 0.6
-# Date created: 1998-02-21
-# Whom: hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.1 1998/02/21 22:43:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:15 agc Exp $
#
DISTNAME= xwave-0.6
@@ -23,4 +18,4 @@ post-patch:
cd ${WRKSRC} ; ${MV} src/XWave src/XWave.ad
cd ${WRKSRC} ; ${TOUCH} src/xwave.man
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 84595a0cdb2..9cef9306e98 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/02/26 23:36:45 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:15 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/02/16 13:32:59 andreas Exp
#
@@ -10,4 +10,4 @@
# SUBDIR += tcpblast
# SUBDIR += xengine
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 9eb57364d02..99e512ce0ec 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: bonnie
-# Version required: 1.0
-# Date created: 26 September 1994
-# Whom: se
-#
-# $NetBSD: Makefile,v 1.5 1998/03/20 22:04:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:16 agc Exp $
# $FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp
#
@@ -23,4 +18,4 @@ NO_CONFIGURE= yes
post-extract:
${MV} ${WRKSRC}/Bonnie.c ${WRKSRC}/bonnie.c
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/cad/Makefile b/cad/Makefile
index 021eba3842a..e7d57156e54 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/04/09 13:02:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:16 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/11/17 10:53:52 tg Exp
#
@@ -12,4 +12,4 @@
# SUBDIR += pcb
# SUBDIR += spice
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/comms/Makefile b/comms/Makefile
index 77e27b03dfe..b922a25d6ac 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/03/20 11:08:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:16 agc Exp $
# FreeBSD Id: Makefile,v 1.26 1997/10/13 04:41:06 max Exp
#
@@ -19,4 +19,4 @@
# SUBDIR += xcept
# SUBDIR += zmtx-zmrx
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 9260b79897f..f9358d1a9bb 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: kermit
-# Version required: 6.0.192
-# Date created: Oct 27, 1994
-# Whom: pst
-#
-# $NetBSD: Makefile,v 1.6 1998/03/20 22:04:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:16 agc Exp $
# $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
#
@@ -27,4 +22,4 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/dot.kermrc ${PREFIX}/share/examples/kermit
@${CAT} ${PKGDIR}/DESCR
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 3b022db98a7..ff20414d593 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: lrzsz
-# Version required: 0.12.x
-# Date created: 29 Sept 1996
-# Whom: David O'Brien <obrien@cs.ucdavis.edu>
-#
-# $NetBSD: Makefile,v 1.1 1998/02/05 21:49:11 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:16 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:29 obrien Exp
DISTNAME= lrzsz-0.12.18
@@ -15,4 +10,4 @@ MAINTAINER= obrien@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= lrz.1 lsz.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index ebc34e62449..6b39ecb43c0 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,10 +1,4 @@
-# ex:ts=8
-# New ports collection makefile for: minicom
-# Version required: 1.74
-# Date created: Fri Dec 01, 1995
-# Whom: obrien@cs.ucdavis.edu
-#
-# $NetBSD: Makefile,v 1.3 1998/02/17 23:54:23 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:16 agc Exp $
# $FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
#
@@ -30,4 +24,4 @@ pre-install:
${SH} ${SCRIPTDIR}/create-dev-link
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 34d5bf80370..4a05425838b 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: modemd
-# Version required: 970221
-# Date created: 12 December 1997
-# Whom: tsarna@endicor.com
-#
-# $NetBSD: Makefile,v 1.1 1998/03/20 11:05:17 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:17 agc Exp $
DISTNAME= modemd-970221
CATEGORIES= comms
@@ -17,4 +12,4 @@ MAINTAINER= tsarna@endicor.com
pre-install:
${MKDIR} ${PREFIX}/share/examples/modemd
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 4a38062c20c..54d2e05897a 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: pilot-link
-# Version required: 0.8.11
-# Date created: 13 March 1998
-# Whom: sommerfeld@alum.mit.edu
-#
-# $NetBSD: Makefile,v 1.5 1998/03/19 10:57:54 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:17 agc Exp $
#
DISTNAME= pilot-link.0.8.11
@@ -29,4 +24,4 @@ do-configure:
post-install:
${LDCONFIG} || ${TRUE}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/converters/Makefile b/converters/Makefile
index cfdb51797b8..f5889590e37 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/03/02 00:40:59 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:17 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/11/16 22:45:25 jseger Exp
#
@@ -17,4 +17,4 @@
SUBDIR += uulib
SUBDIR += xdeview
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 17e51b3c1f4..ca5a23455f1 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: kdesupport
-# Version required: Beta3
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.4 1998/03/21 01:53:16 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:17 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
#
@@ -32,4 +27,4 @@ CONFIGURE_ARGS= "--prefix=${PREFIX}" \
WRKSRC= ${WRKDIR}/kdesupport
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index b7e0f4f12e2..66e53130122 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mpack
-# Version required: 1.5
-# Date created: 1 May 1995
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.2 1998/02/26 00:11:06 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:17 agc Exp $
# $FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp
#
@@ -20,4 +15,4 @@ MAKE_ENV= PREFIX=${PREFIX}
MAN1= mpack.1 munpack.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 4418b32b4f0..842d88ef0cd 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-MIME-Base64
-# Version required: 2.03
-# Date created: June 21th 1997
-# Whom: ache@freebsd.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 03:40:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:17 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/08/04 22:47:16 ache Exp
#
@@ -23,4 +18,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/converters/uudeview/Makefile b/converters/uudeview/Makefile
index e233dcad5df..5f2a8ca74cc 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: uudeview
-# Version Required: 0.5.9
-# Date Created: 04 Aug 1996
-# Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
-#
-# $NetBSD: Makefile,v 1.3 1998/03/02 00:06:45 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:17 agc Exp $
# $FreeBSD Id: Makefile,v 1.15 1998/02/18 22:19:58 hoek Exp
#
@@ -34,4 +29,4 @@ post-install:
@${ECHO_MSG} "===> Not copying available documents"
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 22eedfbba56..a1be39d4a2f 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: uulib
-# Version Required: 0.5.9
-# Date Created: 04 Aug 1996
-# Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
-#
-# $NetBSD: Makefile,v 1.3 1998/03/01 22:56:24 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:18 agc Exp $
# $FreeBSD Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp
#
@@ -42,4 +37,4 @@ do-install:
.endfor
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index cf05bb0a4ec..3d2dd227205 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xdeview
-# Version Required: 0.5.13
-# Date Created: 9 Feb 1997
-# Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
-#
-# $NetBSD: Makefile,v 1.3 1998/03/02 00:37:49 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:18 agc Exp $
# $FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp
#
@@ -41,4 +36,4 @@ post-install:
.endif
${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/Makefile b/databases/Makefile
index beea3c37396..c079d2dea42 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/02/17 15:48:54 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:18 agc Exp $
# FreeBSD Id: Makefile,v 1.20 1997/07/30 11:47:51 tg Exp
#
@@ -16,4 +16,4 @@
SUBDIR += postgresql
# SUBDIR += typhoon
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 42c0ec4be85..68967db57ec 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: gdbm
-# Version required: 1.7.3
-# Date created: 8 Apr 1996
-# Whom: Brent J. Nordquist <bjn@visi.com>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 03:42:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:18 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp
#
@@ -26,4 +21,4 @@ post-build:
post-install:
@install-info ${PREFIX}/info/gdbm.info ${PREFIX}/info/dir
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 44f392e6f49..a4e14abdf53 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: PostgreSQL
-# Version required: 6.2.1
-# Date created: April 2, 1997
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/16 14:40:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:18 agc Exp $
# FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
DISTNAME= postgresql-6.2.1
@@ -105,4 +100,4 @@ post-install:
@${CAT} ${FILESDIR}/post-install-notes
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
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"
diff --git a/editors/Makefile b/editors/Makefile
index 6ce217b63fa..d6d1557869d 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/02/19 21:48:56 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:22 agc Exp $
# FreeBSD Id: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp
#
@@ -29,4 +29,4 @@
SUBDIR += xemacs20
SUBDIR += xvile
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 6e826d8528c..56bcecff7f1 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: GNU emacs
-# Version required: 20.2
-# Date created: 11 October 1997
-# Whom: hubertf
-#
-# $NetBSD: Makefile,v 1.12 1998/04/13 13:46:39 tron Exp $
+# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:22 agc Exp $
# FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
#
@@ -41,4 +36,4 @@ post-install:
install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
.endfor
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 12f77da0248..2ed6214e7ce 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,11 +1,4 @@
-# New ports collection makefile for: joe
-# Version required: 2.8
-# Date created: 01 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
-#
-# Imported into NetBSD by explorer@flame.org
-#
-# $NetBSD: Makefile,v 1.4 1998/04/07 13:04:21 tv Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:22 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/17 07:01:28 obrien Exp
#
@@ -23,4 +16,4 @@ MAN1= joe.1
CFLAGS+= -DTERMINFO
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 913f9bce427..117b7c3b99a 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: sam
-# Version required: 4.3
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:28:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
#
@@ -30,4 +25,4 @@ MAN3= add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 graphics.3 rgbpix.3
MAN4= font.4 keyboard.4 utf.4
MAN6= bitmap.6 regexp.6
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ssam/Makefile b/editors/ssam/Makefile
index 2c66fbb5908..19662bd9c84 100644
--- a/editors/ssam/Makefile
+++ b/editors/ssam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ssam
-# Version required: 1.9
-# Date created: Thu Oct 23 21:00:32 BST 1997
-# Whom: Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 04:50:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:22 agc Exp $
#
DISTNAME= ssam-1.9
@@ -19,4 +14,4 @@ MAN1= ssam.1
GNU_CONFIGURE= yes
ALL_TARGET= tst
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index cf09680803e..3b04b1ab470 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: vile
-# Version required: 7.3
-# Date created: Wed Nov 26, 1996
-# Whom: pgf
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 04:53:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:22 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
#
@@ -24,4 +19,4 @@ post-install:
@echo "You might want to copy the *.rc files from the source tree before"
@echo "doing \`make clean'."
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index eed54613a59..3a6c8541163 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,10 +1,4 @@
-#
-# New ports collection makefile for: vim
-# Version required: vim-5.0
-# Date Created: 19 February 1998
-# Whom: tron
-#
-# $NetBSD: Makefile,v 1.4 1998/03/01 13:35:54 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:23 agc Exp $
DISTNAME= vim-5.0
CATEGORIES= editors
@@ -21,4 +15,4 @@ GNU_CONFIGURE= yes
MAN1= ex.1 gview.1 gvim.1 rgview.1 rgvim.1 rview.1 rvim.1 view.1 vim.1 \
xxd.1 vim-ctags.1 vim-etags.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 9561eca9067..a8f22206952 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: wily
-# Version required: 0.13.36
-# Date created: Tue Oct 21 16:06:30 BST 1997
-# Whom: agc@netbsd.org (Alistair Crooks)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 22:30:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:45 agc Exp $
#
DISTNAME= wily-0.13.36
@@ -16,4 +11,4 @@ MAINTAINER= agc@netbsd.org
GNU_CONFIGURE= yes
MAN1= wily.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 95e8278f1f0..916d5386107 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: X-Emacs
-# Version required: 20.3
-# Date created: 26 August 1997
-# Whom: Michael Elbel (me)
-#
-# $NetBSD: Makefile,v 1.19 1998/02/24 23:37:55 tron Exp $
+# $NetBSD: Makefile,v 1.20 1998/04/15 10:38:23 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
#
@@ -75,4 +70,4 @@ post-install:
${WRKSRC}/lib-src/gzip-el.sh ${PREFIX}/lib/xemacs-20.3/lisp; \
fi
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 5abfca89a94..459ff5a671b 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xvile
-# Version required: 7.3
-# Date created: Wed Nov 26, 1996
-# Whom: pgf
-#
-# $NetBSD: Makefile,v 1.4 1997/12/22 07:45:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:23 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
#
@@ -37,4 +32,4 @@ post-install:
@echo "And also take a look at README.MENU !"
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/Makefile b/emulators/Makefile
index 56906f1ab59..6a2feb4a7dc 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/03/19 14:17:10 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:23 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/07/31 07:23:58 max Exp
#
@@ -28,4 +28,4 @@
# SUBDIR += xgs
SUBDIR += xmame
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/emulators/compat11/Makefile b/emulators/compat11/Makefile
index 19e538fe089..e2db42df6a4 100644
--- a/emulators/compat11/Makefile
+++ b/emulators/compat11/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: compat11
-# Version required: 1.1
-# Date created: 17 Mar 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.3 1998/03/26 17:35:39 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:23 agc Exp $
#
DISTNAME= compat11
@@ -34,7 +29,7 @@ pre-configure:
post-install:
${LDCONFIG} || ${TRUE}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
# for sun3x in 1.3.x, get sun3 package
.if (${ARCH} == "sun3x")
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index 747fe6daf1c..75ea522c448 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: compat12
-# Version required: 1.2
-# Date created: 17 Mar 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.3 1998/03/26 17:35:39 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:23 agc Exp $
#
DISTNAME= compat12
@@ -30,7 +25,7 @@ pre-configure:
post-install:
${LDCONFIG} || ${TRUE}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
# for sun3x in 1.3.x, get sun3 package
.if (${ARCH} == "sun3x")
diff --git a/emulators/linux_lib/Makefile b/emulators/linux_lib/Makefile
index ef6f481d198..5d1cce397b5 100644
--- a/emulators/linux_lib/Makefile
+++ b/emulators/linux_lib/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: linux_lib
-# Version required: 2.1
-# Date created: 1997/12/04
-# Whom: erich@FreeBSD.org
-#
-# $NetBSD: Makefile,v 1.6 1998/03/05 12:22:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:23 agc Exp $
# FreeBSD Id: Makefile,v 1.19 1997/12/04 17:34:28 asami Exp
#
@@ -38,4 +33,4 @@ post-install:
${MKDIR} ${PREFIX}/dev
ln -s /dev/sound ${PREFIX}/dev/dsp
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 65593907514..94f01653608 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for: wine
-# Version required: 980215
-# Date created: 15 March 1998
-# Whom: mycroft
-#
-# $NetBSD: Makefile,v 1.4 1998/03/16 11:20:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:24 agc Exp $
DISTNAME= wine980215
PKGNAME= wine-980215
@@ -23,4 +18,4 @@ MAN1= wine.1
post-install:
${LDCONFIG} || ${TRUE}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 75c1c34cb1d..91a97f8017c 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,4 @@
-# Makefile for: xmame
-# Version required: 0.30.1
-#
-# $NetBSD: Makefile,v 1.3 1998/03/20 07:02:51 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:24 agc Exp $
#
DISTNAME= xmame-0.30.1_src
@@ -34,4 +31,4 @@ post-install:
${CP} ${WRKSRC}/doc/xmamerc ${PREFIX}/lib/mame/xmamerc
@echo Remember to set MAMEDIR to ${PREFIX}/lib/mame.
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index 58d800fc721..0e1eca65324 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: libXg
-# Version required: ????? arbitrarily picked 1.0 for version
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 22:15:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
#
@@ -17,4 +12,4 @@ MAINTAINER= erich@FreeBSD.org
NO_WRKSUBDIR= yes
USE_X11= yes
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/Makefile b/games/Makefile
index 2640eb8a7e2..6f8dc61922a 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/02/08 23:42:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:24 agc Exp $
# FreeBSD Id: Makefile,v 1.87 1997/10/15 04:58:31 max Exp
#
@@ -98,4 +98,4 @@
# SUBDIR += yamsweeper
# SUBDIR += ztrack
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index e24349086be..71d800c374c 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: kdegames
-# Version required: Beta3
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.7 1998/04/11 23:11:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:24 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
#
@@ -45,4 +40,4 @@ CONFIGURE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
WRKSRC= ${WRKDIR}/kdegames
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 22ef3df1311..c4ea5363757 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xblast
-# Version required: 2.2.1
-# Date Created: 30 January 1998
-# Whom: root@garbled.futureone.com
-#
-# $NetBSD: Makefile,v 1.1 1998/02/08 23:37:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:24 agc Exp $
#
DISTNAME= xblast-2.2
@@ -21,4 +16,4 @@ USE_IMAKE= yes
post-patch:
cd ${WRKSRC} ; ${SED} '/file_appl_def/s@/usr/lib/X11@'${PREFIX}'/lib/X11@' defaults.h >xx ; ${MV} xx defaults.h
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index f33ccba5ae0..17033a2a020 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xdemineur
-# Version required: 2.0
-# Date created: 29 Jan 1998
-# Whom: bouyer
-#
-# $NetBSD: Makefile,v 1.4 1998/02/11 12:35:26 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:24 agc Exp $
#
DISTNAME= xdemineur-2.1
@@ -20,4 +15,4 @@ USE_IMAKE= yes
CAT1= xdemineur.0
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 2393b3cf972..c789c2e4c59 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xkobo
-# Version required: 1.11
-# Date created: 18 Jul 1995
-# Whom: jkh
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 05:12:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:25 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1997/11/12 09:57:17 tg Exp
#
@@ -20,4 +15,4 @@ ALL_TARGET+= xkobo all
CAT1= xkobo.0
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
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"
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"
diff --git a/mail/Makefile b/mail/Makefile
index 2bc04cfd0ac..eaabe45c7e6 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/02/28 11:37:20 tron Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:30 agc Exp $
# FreeBSD Id: Makefile,v 1.45 1997/08/13 18:35:22 andreas Exp
#
@@ -36,4 +36,4 @@
# SUBDIR += xlbiff
# SUBDIR += youbin
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 38becfa8df3..171af756989 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for: elm
-# See also: http://www.ozone.fmi.fi/KEH/
-# Version required: 2.4.25.ME+32
-# Date created: 26 June 1995
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 14:29:45 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:30 agc Exp $
# FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
#
@@ -43,4 +37,4 @@ post-install:
${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \
fi
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 770639ad762..be255fff914 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: exmh2
-# Version required: 2.0.1
-# Date created: 1 Jan 97
-# Whom: Peter Wemm <peter@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/02/28 10:37:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:30 agc Exp $
# FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
#
@@ -61,4 +56,4 @@ do-install:
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index d69c2a65a20..11cfd804115 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for: faces-1.6.1
-# Version required: 1.6.1
-# Date created: 09 December 96
-# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
-# Andreas Klemm <andreas@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/10 14:32:54 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:30 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp
#
@@ -36,4 +30,4 @@ post-install:
@${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \
-e 's|@x11base@|'${X11BASE}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 600eb936f1d..d2de289e068 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: fetchmail
-# Version required: 4.3.6
-# Date created: 26 Oct 1996
-# Whom: Ville Eerola <ve@sci.fi>
-#
-# $NetBSD: Makefile,v 1.4 1998/03/16 08:24:49 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:31 agc Exp $
# $FreeBSD Id: Makefile,v 1.55 1998/01/29 17:13:07 ache Exp
#
@@ -33,4 +28,4 @@ post-install:
fetchmail-FAQ.html fetchmail-features.html \
design-notes.html ${FDOC}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index d2c0678440e..d9d9d778e29 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: metamail
-# Version required: 2.7
-# Date created: 17 Oct 1994
-# Whom: torstenb
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 20:29:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:31 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1996/11/21 11:27:26 asami Exp
#
@@ -27,4 +22,4 @@ MAN4= mailcap.4
post-patch:
${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 48103f557ea..633b8a04cd7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,10 +1,4 @@
-#
-# New ports collection makefile for: mutt
-# Version required: mutt-0.91i
-# Date Created: 11 April 1998
-# Whom: tron
-#
-# $NetBSD: Makefile,v 1.4 1998/04/12 23:34:21 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:31 agc Exp $
DISTNAME= mutt-0.91i
CATEGORIES= mail
@@ -31,4 +25,4 @@ post-install:
${CP} ${WRKSRC}/doc/manual.txt ${PREFIX}/share/doc/mutt
${CP} ${WRKSRC}/doc/pgp-Notes.txt ${PREFIX}/share/doc/mutt
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index a75fffb8ec6..50a772b61d1 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: nmh
-# Version required: 0.23
-# Date created: 26 July 1997
-# Whom: Scott Blachowicz <Scott.Blachowicz@seaslug.org>
-#
-# $NetBSD: Makefile,v 1.13 1998/02/23 14:21:27 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/15 10:38:31 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
#
@@ -41,4 +36,4 @@ post-patch:
post-install:
@PKG_PREFIX='${PREFIX}' sh -f ${PKGDIR}/INSTALL
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 000e95c6bce..d98b1203e7c 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for: pine
-# http://www.washington.edu/pine/
-# Version required: 3.96
-# Date created: 03 September 1994
-# Whom: mr
-#
-# $NetBSD: Makefile,v 1.9 1998/03/19 02:32:29 cjs Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:31 agc Exp $
# FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
#
# Note: If you want to have pine's default behaviour of not allowing
@@ -58,4 +52,4 @@ post-install:
cd ${WRKSRC} && \
${INSTALL_DATA} doc/tech-notes.txt ${PREFIX}/share/doc/pine
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 454c31d854e..f08e8ff96bf 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: procmail
-# Version required: 3.11pre7
-# Date created: 24 September 1994
-# Whom: adam
-#
-# $NetBSD: Makefile,v 1.2 1998/02/27 23:53:08 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:31 agc Exp $
# $FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
#
@@ -19,4 +14,4 @@ INSTALL_TARGET= install-suid install.man
MAN1= procmail.1 formail.1 lockfile.1
MAN5= procmailex.5 procmailrc.5 procmailsc.5
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 4a6b272068a..5334b390b5d 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: qpopper
-# Version required: 2.41beta1
-# Date created: February 12, 1998
-# Whom: Ted Lemon <mellon@fugue.com>
-#
-# $NetBSD: Makefile,v 1.3 1998/02/15 22:25:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:32 agc Exp $
#
DISTNAME= qpopper2.41beta1
@@ -36,4 +31,4 @@ do-install:
${INSTALL} -o ${MANOWN} -c -g ${MANGRP} -m ${MANMODE} popper.0 \
${LOCALBASE}/man/cat8/qpopper.0 )
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/math/Makefile b/math/Makefile
index ecdb68a4bc1..290fee7a43c 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/04/13 15:40:16 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:32 agc Exp $
# FreeBSD Id: Makefile,v 1.38 1998/04/13 00:51:58 jseger Exp
#
@@ -35,4 +35,4 @@
# SUBDIR += xplot
# SUBDIR += xspread
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index ea860c29c05..8ceaf632a00 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: Numeric Python
-# Version required: 1.1
-# Date created: 18 March 1998
-# Whom: tsarna@endicor.com
-#
-# $NetBSD: Makefile,v 1.3 1998/04/12 23:19:32 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:32 agc Exp $
DISTNAME= NumPy-11
PKGNAME= py-Numeric-1.1
@@ -35,4 +30,4 @@ post-install:
@${MKDIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/Doc/*.html ${DOCDIR}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/Makefile b/mbone/Makefile
index b73f2cd106f..da3b871d6e8 100644
--- a/mbone/Makefile
+++ b/mbone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/03/19 14:20:10 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $
# Id: Makefile,v 1.5 1996/12/03 10:41:49 asami Exp
#
@@ -13,4 +13,4 @@
SUBDIR += vic
# SUBDIR += wb
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index c0171759d1d..2621ccf814e 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: imm
-# Version required: 3.6a1
-# Date created: 1997/11/24
-# Whom: is
-#
-# $NetBSD: Makefile,v 1.6 1998/02/09 00:09:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $
#
# NetBSD "imm" package
# The original was based on the imm-3.5a1 FreeBSD port maintained
@@ -23,4 +18,4 @@ LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80
ALL_TARGET= netbsd
MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 1ad29b51277..4c181f2c3cb 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: nte
-# Version required: 1.5a23
-# Date created: 5 September 1996
-# Whom: mycroft
-#
-# $NetBSD: Makefile,v 1.2 1998/03/20 07:22:05 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:32 agc Exp $
#
DISTNAME= nt.1.5a23
@@ -29,15 +24,15 @@ MAKE_ENV= TK_SRC=${TK_SRC}
do-configure:
cd ${WRKSRC}/netbsd && sh configure
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
#DISGUSTING HACK ALERT
#Although nte includes an hsearch.c for those who don't have it in
# libc, there's no way to get the default Makefile to build it.
# So we build it here.
-#This is below the .include <bsd.port.mk> since variable names in
+#This is below the .include "../../mk/bsd.pkg.mk" since variable names in
# targets or dependencies are evaluated when they are read so
-# bsd.port.mk must have defined ${WRKSRC} already.
+# bsd.pkg.mk must have defined ${WRKSRC} already.
pre-build: ${WRKSRC}/netbsd/hsearch.o
${WRKSRC}/netbsd/hsearch.o: ${WRKSRC}/src/hsearch.c
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 1ededde2d8e..f14c1a6bc81 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rat
-# Version required: 3.0.23
-# Date created: 5 March 1998
-# Whom: mycroft
-#
-# $NetBSD: Makefile,v 1.2 1998/03/06 02:12:00 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:32 agc Exp $
#
DISTNAME= rat-3.0
@@ -31,4 +26,4 @@ do-install:
install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
man/man1/rat.1 ${LOCALBASE}/man/man1/rat.1 )
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index a5a6e5c9256..55096db040a 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,17 +1,6 @@
-# Packages collection makefile for: sdr
-# Version required: 2.3a1
-# Date created: 18 November 1997
-# By: Ignatios Souvatzis <is@netbsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/01/30 13:57:55 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp
#
-# Based on:
-# New ports collection makefile for: sdr
-# Version required: 2.3a1
-# Date created: 5 September 1996
-# Whom: Bill Fenner <fenner@FreeBSD.ORG>
-#
DISTNAME= sdr.V2.3a1
PKGNAME= sdr-2.3a1
@@ -33,4 +22,4 @@ USE_X11= yes
post-extract:
-@rm ${WRKSRC}/src/libs.tcl
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 166c18a206c..13891673d74 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: vat
-# Version required: 4.0b2
-# Date created: 2 November 1996
-# Whom: fenner
-#
-# $NetBSD: Makefile,v 1.7 1998/03/16 08:01:58 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp
#
@@ -32,4 +27,4 @@ MAN1= vat.1
post-install:
@strip ${PREFIX}/bin/vat
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 4e0daf522d6..c0db6323cac 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: vic
-# Version required: 2.8
-# Date created: 1997 Nov 19
-# Whom: is
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:57 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
#
@@ -24,4 +19,4 @@ post-install:
strip ${PREFIX}/bin/vic
strip ${PREFIX}/bin/histtolut
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/Makefile b/misc/Makefile
index c2aaac153dd..5a06f30933c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/02/17 19:35:57 tron Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.117 1997/10/13 04:41:07 max Exp
SUBDIR += amanda
@@ -47,4 +47,4 @@
# SUBDIR += xtar # needs Motif/Lesstif - HF
SUBDIR += zorro
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 933b3fa6b7a..caf36f6e175 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: amanda
-# Version required: 2.3.0
-# Date created: 28th Feb 1995
-# Whom: gpalmer
-#
-# $NetBSD: Makefile,v 1.5 1998/01/24 20:52:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -29,4 +24,4 @@ post-install:
${MKDIR} ${PREFIX}/share/examples/amanda
${CP} -R ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 96311b1cbd8..8395319456d 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,13 +1,4 @@
-# New ports collection makefile for: astrolog
-#
-# http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
-# http://www.magitech.com/~cruiser1/astrolog.htm
-#
-# Version required: 5.30
-# Date created: 31 July 1995
-# Whom: faulkner@cactus.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 20:55:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
#
@@ -51,4 +42,4 @@ do-install:
@echo "See the file ${PREFIX}/share/doc/astrolog/Helpfile.530 for help"
@echo "and tune ${PREFIX}/lib/astrolog/astrolog.dat"
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 2d31dbe5c2d..c4190680003 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: buffer
-# Version required: 1.17
-# Date created: 17 Nov 1995
-# Whom: markm
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 14:41:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1996/11/17 09:05:15 obrien Exp
#
@@ -16,4 +11,4 @@ MAINTAINER= markm@FreeBSD.ORG
NO_WRKSUBDIR= yes
MAN1= buffer.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/cal/Makefile b/misc/cal/Makefile
index f7907756bfa..36624742638 100644
--- a/misc/cal/Makefile
+++ b/misc/cal/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: cal
-# Version required: 3.5
-# Date created: 2 April 1997
-# Whom: Andrey Zakhvatov <andy@icc.surw.chel.su>
-#
-# $NetBSD: Makefile,v 1.2 1997/10/24 00:47:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/05/12 06:33:23 max Exp
#
@@ -27,4 +22,4 @@ do-install:
if [ ! -f ${PREFIX}/etc/cal/calcol ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${PREFIX}/etc/cal/calcol; fi
if [ ! -f ${PREFIX}/etc/cal/caldat ]; then ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${PREFIX}/etc/cal/caldat; fi
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index 804edcac251..31b89e42e9f 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: chard
-# Version required: 3.6
-# Date created: 24 April 1995
-# Whom: Satoshi Asami
-#
-# $NetBSD: Makefile,v 1.2 1997/10/24 00:55:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/04/30 03:18:06 asami Exp
#
@@ -17,4 +12,4 @@ MAINTAINER= asami@FreeBSD.ORG
MANCOMPRESSED= yes
MAN1= chord.1 a2crd.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 43a4d2a2637..766f1796601 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: colorls
-# Version required: FreeBSD-current (around January '97)
-# Date created: 8 March 1995
-# Whom: Satoshi Asami
-#
-# $NetBSD: Makefile,v 1.4 1998/02/23 15:25:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/04/30 03:18:06 asami Exp
#
@@ -23,4 +18,4 @@ CAT1= colorls.0
pre-patch:
${CP} ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index fb1b6be695d..a27d7ed4962 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: dotfile
-# Version required: 2.0
-# Date created: 11/12/96
-# Whom: oly@world.std.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:21 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
#
@@ -25,4 +20,4 @@ do-build:
post-install:
@${CAT} ${PKGDIR}/MESSAGE
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index e987fe40c56..48b095a3041 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: FD
-# Version required: 1.01h
-# Date created: 20 Feb 1996
-# Whom: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:01:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/01/06 06:38:33 max Exp
#
@@ -34,4 +29,4 @@ post-install:
@strip ${PREFIX}/bin/fd
cd ${WRKSRC} ; [ -f .fdrc ] && ${CP} .fdrc ${PREFIX}/etc/fdrc
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 5ce3ffb54ef..deb6abebbf6 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: fep
-# Version required: 1.0
-# Date created: 20 Feb 1996
-# Whom: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:02:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
#
@@ -18,4 +13,4 @@ NO_WRKSUBDIR= yes
MANCOMPRESSED= yes
MAN1= fep.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 293d50ea79d..b30bde8f8f4 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: figlet
-# Version required: 2.2
-# Date created: Sat July 20, 1996
-# Whom: David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.2 1997/10/24 01:16:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:35 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/06/29 09:56:32 obrien Exp
#
@@ -17,4 +12,4 @@ MAINTAINER= obrien@FreeBSD.org
MAN6= figlet.6
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 97edde382eb..fec9560d42e 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: git
-# Version required: 4.3.11
-# Date created: 12 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
-#
-# $NetBSD: Makefile,v 1.7 1998/03/28 21:37:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:35 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
#
@@ -31,4 +26,4 @@ post-install:
${MKDIR} ${PREFIX}/share/doc
${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index db777b44f74..34ac8180b09 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: Linux-style colorized `ls'
-# Version required: 3.12.0.2 (GNU fileutils 3.12)
-# Date created: 06 January 1996
-# Whom: bmc@WillsCreek.COM
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:06:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp
#
@@ -22,4 +17,4 @@ MAINTAINER= bmc@WillsCreek.COM
GNU_CONFIGURE= yes
MAN1= linuxls.1 dircolors.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/ical/Makefile b/misc/ical/Makefile
index ae262cfe275..36e319ff431 100644
--- a/misc/ical/Makefile
+++ b/misc/ical/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ical
-# Version required: 2.1
-# Date created: Mon Aug 28 13:35:31 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.2 1998/02/17 19:33:47 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:35 agc Exp $
# $FreeBSD Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp
#
@@ -28,4 +23,4 @@ MAN1= ical.1
post-install:
@strip ${PREFIX}/bin/${DISTNAME}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index e53e782bff8..4123aea1dd6 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,10 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for: jive
-# Version required: 1.0
-# Date created: Mon Feb 17, 1997
-# Whom: David O'Brien (obrien@NUXI.com)
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:08:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/04/02 07:58:25 obrien Exp
#
@@ -22,4 +16,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 9965f30b325..960b76b9b3c 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: kdeutils
-# Version required: Beta3
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.7 1998/04/11 22:13:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:35 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
#
@@ -43,4 +38,4 @@ CONFIGURE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
WRKSRC= ${WRKDIR}/kdeutils
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 1445dbfcf93..1eaffefd7c2 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: kp
-# Version required: 0.96
-# Date created: 8 May 1995
-# Whom: asami
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:10:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
#
@@ -24,4 +19,4 @@ pre-configure:
done
${RM} ${WRKDIR}/prefix-list
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index c380e90fd5f..8ed22e5cd84 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: libutf
-# Version required: 2.10
-# Date created: Thu Oct 23 20:22:27 BST 1997
-# Whom: Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:11:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
#
DISTNAME= libutf-2.10
@@ -16,4 +11,4 @@ MAN3= ure.3 utf.3
GNU_CONFIGURE= yes
ALL_TARGET= tst
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/lile/Makefile b/misc/lile/Makefile
index d6cca016939..14a8edb3d7c 100644
--- a/misc/lile/Makefile
+++ b/misc/lile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ile
-# Version required: 2.0
-# Date created: 25 Jun 1997
-# Whom: jmz
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:12:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/08/15 16:47:08 jmz Exp
#
@@ -22,4 +17,4 @@ do-configure:
${SED} -e s:/usr/local:${PREFIX}: <Makefile.old > Makefile; \
${ECHO} all: ile >> Makefile; ${ECHO} CC=cc ${CFLAGS} >> Makefile)
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/linuxls/Makefile b/misc/linuxls/Makefile
index db777b44f74..34ac8180b09 100644
--- a/misc/linuxls/Makefile
+++ b/misc/linuxls/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: Linux-style colorized `ls'
-# Version required: 3.12.0.2 (GNU fileutils 3.12)
-# Date created: 06 January 1996
-# Whom: bmc@WillsCreek.COM
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:06:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp
#
@@ -22,4 +17,4 @@ MAINTAINER= bmc@WillsCreek.COM
GNU_CONFIGURE= yes
MAN1= linuxls.1 dircolors.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index 2102e582fa8..a8acbaec53b 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: logsurfer
-# Version required: 1.41
-# Date created: 28 Jul 1996
-# Whom: shanee@rabbit.augusta.de
-#
-# $NetBSD: Makefile,v 1.5 1998/02/04 20:41:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/10/26 23:56:58 fenner Exp
#
@@ -22,4 +17,4 @@ MANCOMPRESSED= yes
MAN1= logsurfer.1
MAN4= logsurfer.conf.4
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index d526c87f719..fc60baaf959 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mc
-# Version required: 4.1
-# Date created: 24 Oct 1997
-# Whom: hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
#
@@ -22,4 +17,4 @@ MAN8= mcserv.8
post-install:
@ ${RMDIR} ${PREFIX}/lib/mc/icons
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 1dae317fed6..ba3fc45ef5b 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: most
-# Version required: 4.7
-# Date created: 31 May 1997
-# Whom: rhwang@bigpanda.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/30 13:57:23 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/06/03 21:52:01 asami Exp
#
@@ -21,4 +16,4 @@ GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/most
MAN1= most.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index b651b2bbfba..13da9dc08de 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-Array-PrintCols
-# Version required: 1.2
-# Date created: October 17th 1996
-# Whom: James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:22:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
#
@@ -22,4 +17,4 @@ WRKSRC= ${WRKDIR}/Array-PrintCols
MAN3= Array::PrintCols.3p
MANPREFIX= ${PREFIX}/lib/perl5
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index df8d84105e6..d28113685b9 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-Business-CreditCard
-# Version required: 0.1
-# Date created: October 20th 1996
-# Whom: James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:22:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
#
@@ -25,4 +20,4 @@ do-install:
@ ${INSTALL_DATA} ${WRKSRC}/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/
@ ln -sf ${PREFIX}/lib/perl5/site_perl/Business/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/CreditCard.pm
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index cef5ffa6d2c..a3930e896df 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-Locale-Codes
-# Version required: 0.003
-# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:23:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
#
@@ -23,4 +18,4 @@ MAN3= Locale::Country.3 Locale::Language.3
do-configure:
@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index 1b229c7798d..5bc243e22aa 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-Search
-# Version required: 0.2
-# Date created: October 17th 1996
-# Whom: James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:25:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
#
@@ -23,4 +18,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/misc/rpm/Makefile b/misc/rpm/Makefile
index 5aef891f6d4..03310754ee8 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,7 +1,4 @@
-# Makefile for: rpm
-# Version required: 2.4.12
-#
-# $NetBSD: Makefile,v 1.8 1998/03/20 05:54:42 mycroft Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:37 agc Exp $
#
DISTNAME= rpm-2.4.12
@@ -21,4 +18,4 @@ MAN8= rpm.8 rpm2cpio.8
pre-install:
${MKDIR} ${PREFIX}/include/rpm
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index fa88e80dac3..5e11c8bc3d9 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: screen
-# Version required: 3.7.4
-# Date created: 25 Nov 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.6 1998/02/16 08:52:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:37 agc Exp $
# FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
#
@@ -25,4 +20,4 @@ post-install:
@${MKDIR} ${PREFIX}/share/examples/screen
${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/share/examples/screen/screenrc
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index dbb81e4c76e..6c4219427a4 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: Splitvt
-# Version required: 1.6.1
-# Date created: Fri Oct 4, 1996
-# Whom: David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 21:29:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:37 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/02 08:39:12 obrien Exp
#
@@ -23,4 +18,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/team/Makefile b/misc/team/Makefile
index 6eadd540d09..0947cc3e28e 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: team
-# Version required: 3.1 (From the RCS Id line of team.c)
-# Date created: 1 July 1995
-# Whom: joerg
-#
-# $NetBSD: Makefile,v 1.7 1998/02/04 22:46:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:37 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/04/30 03:18:06 asami Exp
#
@@ -16,4 +11,4 @@ MAINTAINER= joerg@FreeBSD.org
MAN1= team.1
CAT1= team.0
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/xfinans/Makefile b/misc/xfinans/Makefile
index 44242aee682..49f90af5f8f 100644
--- a/misc/xfinans/Makefile
+++ b/misc/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/misc/zorro/Makefile b/misc/zorro/Makefile
index 47a1d097692..56a7de3d45b 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: zorro
-# Version required: 1.1p8
-# Date created: 03 Aug 1996
-# Whom: shanee@rabbit.augusta.de
-#
-# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:28 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:38 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp
#
@@ -30,4 +25,4 @@ do-install:
@echo "Take a look at ${PREFIX}/share/zorro/DOTzorrorc"
@echo ""
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/Makefile b/net/Makefile
index 2f49db874b0..51467a3e51e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1998/03/30 10:07:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 1998/04/15 10:38:38 agc Exp $
# FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp
#
@@ -86,4 +86,4 @@
# SUBDIR += zircon
SUBDIR += zephyr
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/net/bing/Makefile b/net/bing/Makefile
index a3f91e4ad87..daac41b3645 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: bing
-# Version required: 1.0.4
-# Date created: 28 December 1996
-# Whom: jseger@scds.com
-#
-# $NetBSD: Makefile,v 1.2 1997/11/19 16:02:31 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:38 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/10/13 09:14:49 tg Exp
#
@@ -21,4 +16,4 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/bing
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/icb/Makefile b/net/icb/Makefile
index 3c91528d316..185982befdd 100644
--- a/net/icb/Makefile
+++ b/net/icb/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: icb client
-# Version required: 5.0.5
-# Date created: 18 March 1998
-# Whom: cjs
-#
-# $NetBSD: Makefile,v 1.4 1998/03/28 21:59:06 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:38 agc Exp $
#
DISTNAME= icb-5.0.5
@@ -26,4 +21,4 @@ do-install:
${WRKSRC}/contrib/echofile \
${PREFIX}/libdata/icb
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/ircII/Makefile b/net/ircII/Makefile
index 2ed705cbed3..862198333ba 100644
--- a/net/ircII/Makefile
+++ b/net/ircII/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: IrcII Client
-# Version required: 2.9
-# Date created: 18 Oct 1994
-# Whom: torstenb
-#
-# $NetBSD: Makefile,v 1.11 1998/03/10 15:25:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:38 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
#
@@ -34,4 +29,4 @@ post-install:
find ${PREFIX}/lib/irc/help -type f -print | xargs ${GZIP_CMD}; \
fi
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 2a36a12888d..f910d6ae895 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: kdenetwork
-# 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:50 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:38 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
#
@@ -46,4 +41,4 @@ CONFIGURE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
WRKSRC= ${WRKDIR}/kdenetwork
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index 93db8892bff..1a76d0fbbc6 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mirror
-# Version required: 2.8
-# Date created: 15 May 1995
-# Whom: torstenb
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:37:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:39 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp
#
@@ -31,4 +26,4 @@ post-configure:
pre-install:
${MKDIR} ${PREFIX}/lib/mirror
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index da0a42c0c12..074660185bf 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ncftp2
-# Version required: 2.4.3
-# Date created: 4 Nov 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.4 1998/03/23 19:29:38 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:39 agc Exp $
# $FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
#
@@ -23,4 +18,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 2708e73ae45..7cfbcacaa3d 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-Net
-# Version required: 1.0505
-# Date created: September 30th 1996
-# Whom: James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 21:38:41 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:39 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
#
@@ -27,4 +22,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/net/rsync/Makefile b/net/rsync/Makefile
index 5d23d902273..afc53a40777 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rsync
-# Version required: 1.6.9
-# Date created: Sat Aug 3, 1996
-# Whom: David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.3 1998/02/02 21:02:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:39 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1998/01/03 10:14:21 obrien Exp
#
@@ -26,4 +21,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9df1f5aeb88..9cf70964001 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: samba
-# Version required: 1.9.18p3
-# Date created: 11th Feb 1995
-# Whom: gpalmer
-#
-# $NetBSD: Makefile,v 1.6 1998/02/21 21:20:09 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:39 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
#
@@ -69,4 +64,4 @@ post-install:
chown root.wheel ${PREFIX}/bin/smbpasswd
chmod 4111 ${PREFIX}/bin/smbpasswd
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 6446a8d262e..78e0e5f5f7a 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: scotty
-# Version required: 2.1.6
-# Date created: 18 Februar 1995
-# Whom: Gennady Sorokopud <gena@netvision.net.il>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/07 22:11:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:39 agc Exp $
# FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp
#
@@ -36,4 +31,4 @@ PLIST_SRC=${PLIST}.tmp
pre-clean:
@${RM} -f ${PKGDIR}/PLIST.tmp
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/sirc/Makefile b/net/sirc/Makefile
index 3a1ba9b5d54..d3b79a5a6b5 100644
--- a/net/sirc/Makefile
+++ b/net/sirc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: sirc
-# Version required: 2.21
-# Date created: 1997/11/11
-# Whom: hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:42:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:40 agc Exp $
DISTNAME= sirc-2.21
CATEGORIES= net
@@ -41,4 +36,4 @@ do-install:
${ECHO} "" ; \
) | ./install
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 4171b9c8ae0..f969b18d1a6 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for: sniffit
-# Version required: 0.3.5
-# Date created: 28 Mar 1998
-# Whom: bsdx
-#
-# $NetBSD: Makefile,v 1.2 1998/03/30 09:57:56 hubertf Exp $
-# FreeBSD
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:40 agc Exp $
#
DISTNAME= sniffit.0.3.5
@@ -25,4 +19,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index da76d479cf3..427f2a2f0e2 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: socks5
-# Version required: beta-0.17.2-exportable
-# Date created: 24 Apr 1996
-# Whom: pst
-#
-# $NetBSD: Makefile,v 1.8 1998/02/02 08:59:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:40 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
#
@@ -42,4 +37,4 @@ post-install:
ln -fs ${PREFIX}/lib/libsocks5_sh.so ${PREFIX}/lib/libsocks5_sh.so.0.0
${LDCONFIG} || ${TRUE}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 567d1bec335..8f34e852459 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: tcptrace
-# Version required: 4.1.3
-# Date created: 3 March 1997
-# Whom: fenner
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:47:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:40 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
#
@@ -29,4 +24,4 @@ do-install:
.endfor
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/tkirc/Makefile b/net/tkirc/Makefile
index 97751ba0faf..2ab528e080e 100644
--- a/net/tkirc/Makefile
+++ b/net/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/net/ttcp/Makefile b/net/ttcp/Makefile
index ba70ee43f99..f5401b1223a 100644
--- a/net/ttcp/Makefile
+++ b/net/ttcp/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ttcp
-# Version required: 1.12
-# Date created: 14 December 1997
-# Whom: thorpej
-#
-# $NetBSD: Makefile,v 1.9 1998/03/20 22:04:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:40 agc Exp $
#
DISTNAME= ttcp
@@ -20,4 +15,4 @@ NO_WRKSUBDIR= yes
# Do not list MAN/CAT pages here. It will confuse if MANZ is set.
# The pkg uses BSD-style-Makefiles itself, so it does the right thing.
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/Makefile b/net/wget/Makefile
index a774aeebb02..5de8538b07e 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: wget
-# Version required: 1.4.5
-# Date created: 31 December 1996
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 15:30:38 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:40 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
#
@@ -25,4 +20,4 @@ post-install:
fi
-install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 6a45224d656..6bc45ce2f20 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: wu-ftpd
-# Version required: 2.4.2-beta-16
-# Date created: 18 Oct 1994
-# Whom: torstenb
-#
-# $NetBSD: Makefile,v 1.3 1998/03/30 18:40:25 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:41 agc Exp $
# $FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
#
# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
@@ -25,4 +20,4 @@ MAN8= ftpd.8 ftpshut.8
do-build:
cd ${WRKSRC} && ./build nbs PREFIX=${PREFIX}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 5e69cb5280e..146f2496f33 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,7 +1,4 @@
-# Makefile for: zephyr
-# Version required: 2.0.4
-#
-# $NetBSD: Makefile,v 1.6 1998/04/09 19:49:16 sommerfe Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:41 agc Exp $
#
DISTNAME= zephyr-2.0.4
@@ -40,4 +37,4 @@ post-install:
done
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/news/Makefile b/news/Makefile
index 9d18e7078fb..986b38c1afd 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/03/25 19:56:13 tv Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:41 agc Exp $
# FreeBSD Id: Makefile,v 1.28 1997/06/27 23:02:54 brian Exp
#
@@ -24,4 +24,4 @@
# SUBDIR += trn
# SUBDIR += xvnews
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 6d411a94534..1a22013fbf0 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for: knews
-# Version required: 0.9.8
-# Date created: 30th November 1997
-# Whom: tron
-#
-# $NetBSD: Makefile,v 1.5 1998/01/30 13:57:34 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:41 agc Exp $
#
DISTNAME= knews-0.9.8
@@ -33,4 +28,4 @@ post-patch:
"#define DOMAIN_NAME \"${DOMAIN_NAME}\""
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index f04086c2af2..bab3f8c89d4 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,10 +1,4 @@
-# New ports collection Makefile for: nntpclnt
-# Version required: 1.6.1
-#
-# Date created: 25 March 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.3 1998/03/28 19:48:28 cjs Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:41 agc Exp $
#
DISTNAME= nntpclnt-1.6.1
@@ -33,4 +27,4 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/etc/nntp
${CAT} ${PKGDIR}/MESSAGE
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
index 0775633d76c..a4d16222830 100644
--- a/plan9/9menu/Makefile
+++ b/plan9/9menu/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: 9menu
-# Version required: 1.5
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:03:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:41 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp
#
@@ -27,4 +22,4 @@ EXTRACT_CMD= zcat
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= |sh
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/9term/Makefile b/plan9/9term/Makefile
index 7ef2d9c3571..1ed1949c497 100644
--- a/plan9/9term/Makefile
+++ b/plan9/9term/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: 9term
-# Version required: 1.6.3
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/01/24 22:05:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
#
@@ -27,4 +22,4 @@ MAN1= 9term.1
NO_WRKSUBDIR= yes
MAKE_ENV+= WRKDIR=${WRKDIR}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
index a92431bb68f..ff5456b87ab 100644
--- a/plan9/9wm/Makefile
+++ b/plan9/9wm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: 9wm
-# Version required: 1.1
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/03/10 15:48:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
#
@@ -22,4 +17,4 @@ USE_IMAKE= yes
CAT1= 9wm.0
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/Makefile b/plan9/Makefile
index bf39c0d60de..8870e1e3eb3 100644
--- a/plan9/Makefile
+++ b/plan9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1997/10/24 09:51:35 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:41 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/26 08:57:54 asami Exp
#
@@ -10,4 +10,4 @@
SUBDIR += sam
SUBDIR += wily
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/plan9/Xg/Makefile b/plan9/Xg/Makefile
index 58d800fc721..0e1eca65324 100644
--- a/plan9/Xg/Makefile
+++ b/plan9/Xg/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: libXg
-# Version required: ????? arbitrarily picked 1.0 for version
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 22:15:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
#
@@ -17,4 +12,4 @@ MAINTAINER= erich@FreeBSD.org
NO_WRKSUBDIR= yes
USE_X11= yes
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/rc/Makefile b/plan9/rc/Makefile
index 45b2a8d7f45..67a6758ed52 100644
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rc
-# Version required: 1.5b1
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/02/27 13:21:23 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
#
@@ -18,4 +13,4 @@ NO_WRKSUBDIR= yes
MANCOMPRESSED= yes
MAN1= rc.1 history.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index 913f9bce427..117b7c3b99a 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: sam
-# Version required: 4.3
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:28:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
#
@@ -30,4 +25,4 @@ MAN3= add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 graphics.3 rgbpix.3
MAN4= font.4 keyboard.4 utf.4
MAN6= bitmap.6 regexp.6
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/wily/Makefile b/plan9/wily/Makefile
index 9561eca9067..a8f22206952 100644
--- a/plan9/wily/Makefile
+++ b/plan9/wily/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: wily
-# Version required: 0.13.36
-# Date created: Tue Oct 21 16:06:30 BST 1997
-# Whom: agc@netbsd.org (Alistair Crooks)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 22:30:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:45 agc Exp $
#
DISTNAME= wily-0.13.36
@@ -16,4 +11,4 @@ MAINTAINER= agc@netbsd.org
GNU_CONFIGURE= yes
MAN1= wily.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/Makefile b/print/Makefile
index 71c314aec09..e81e070bd97 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/01 21:07:49 tron Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.52 1997/12/14 00:58:08 asami Exp
#
@@ -45,4 +45,4 @@
# SUBDIR += xmbibtex
# SUBDIR += xmgr
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 630009234c9..f9a8629fadc 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: a2ps
-# Version required: 4.9.9
-# Date created: 18 August 1997
-# Whom: Chuck Robey (chuckr@freebsd.org)
-#
-# $NetBSD: Makefile,v 1.6 1998/02/23 11:47:07 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp
#
@@ -52,4 +47,4 @@ pre-configure:
${FALSE}; \
fi)
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 87af43fc680..e4d1849fb2f 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: enscript
-# Version required: 1.5.0
-# Date created: 24 Jul, 1997
-# Whom: kline
-#
-# $NetBSD: Makefile,v 1.3 1998/02/23 14:27:51 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/27 08:10:30 tg Exp
#
@@ -50,4 +45,4 @@ post-install:
strip ${PREFIX}/bin/${file}
.endfor
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 36478d3e387..50fd647e26e 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ghostscript
-# Version required: 5.10
-# Date created: Tue Jun 10 21:58:54 CEST 1997
-# Whom: Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $NetBSD: Makefile,v 1.10 1998/02/23 11:43:22 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/10/13 11:22:43 asami Exp
#
@@ -90,4 +85,4 @@ pre-clean:
@cd ${PORTSDIR}/graphics/jpeg && ${MAKE} clean
@cd ${PORTSDIR}/graphics/png && ${MAKE} clean
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 99c5c0e74a6..e9da399669e 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: gv
-# Version required: gv-3.5.8
-# Date created: Nov 1997
-# Whom: soren@t.dk
-#
-# $NetBSD: Makefile,v 1.6 1998/02/11 07:29:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
#
@@ -26,4 +21,4 @@ post-install:
.endif
@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 057fe178849..8ace8ce0600 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: lyx
-# Version required: 0.12.0
-# Date created: Sa 12 Okt 1996 19:20:51 MET DST
-# Whom: Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $NetBSD: Makefile,v 1.4 1998/03/20 12:37:50 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
#
@@ -27,4 +22,4 @@ CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/inc
MAN1= lyx.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index cbd3e867093..b99856784cb 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mpage
-# Version required: 2.5
-# Date created: 19 February 1998
-# Whom: Kapil Chowksey
-#
-# $NetBSD: Makefile,v 1.2 1998/04/01 21:06:09 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:46 agc Exp $
# $FreeBSD Id: Makefile,v 1.1.1.1 1998/02/20 04:37:31 steve Exp
DISTNAME= mpage-2.5
@@ -16,4 +11,4 @@ MAINTAINER= kchowksey@hss.hns.com
MAN1= mpage.1
ALL_TARGET= default
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 2ea8271f3d3..82b912714be 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: psutils
-# Version required: 1.16
-# Date created: 21 September 1994
-# Whom: jmz & David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $NetBSD: Makefile,v 1.3 1998/02/23 14:02:29 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp
#
@@ -46,4 +41,4 @@ post-install:
strip ${PREFIX}/bin/${file}
.endfor
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 1596bf8a5a6..b30e7500cda 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: teTeX
-# Version required: 0.4
-# Date created: 5 December 1996
-# Whom: Bernd Rosauer <br@schiele-ct.de>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/02 20:13:00 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
@@ -63,4 +58,4 @@ post-install:
-type d -print | xargs chmod 1777
@${SETENV} PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index c41491af3a7..9570987d8bf 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: transfig
-# Version required: 3.2
-# Date Created: 30 January 1998
-# Whom: root@garbled.futureone.com
-#
-# $NetBSD: Makefile,v 1.1 1998/02/08 23:20:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:46 agc Exp $
#
DISTNAME= transfig.3.2
@@ -20,4 +15,4 @@ LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \
USE_IMAKE= yes
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/Makefile b/security/Makefile
index 8a80f3b27b2..9fc3898b231 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/03/19 14:26:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.23 1997/11/09 10:17:02 asami Exp
#
@@ -27,4 +27,4 @@
# SUBDIR += vscan
# SUBDIR += xinetd
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 96c2a6bf3bc..9e2dbc27441 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-MD5
-# Version required: 1.7
-# Date created: September 30th 1996
-# Whom: James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 22:48:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:47 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:23 jfitz Exp
#
@@ -23,4 +18,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/security/pgp2/Makefile b/security/pgp2/Makefile
index f388a47ed05..5b4e61a21c7 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: pgp2
-# Version required: 2.6.3(i)a
-# Date created: 8 Jul 1995 (ache@FreeBSD.ORG)
-# Whom: tv@NetBSD.ORG
-#
-# $NetBSD: Makefile,v 1.4 1998/03/26 10:48:32 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:47 agc Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
#
@@ -91,4 +86,4 @@ do-install:
[ -f ${PGPLIB}/pgp.hlp ] || \
${INSTALL_DATA} ${WRKDIR}/en.hlp ${PGPLIB}/pgp.hlp
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 88959a0b01e..6f62a39243e 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rsaref
-# Version required: 2.0
-# Date created: 17 Feb 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.5 1998/04/12 22:03:05 tv Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:47 agc Exp $
#
DISTNAME= rsaref20
@@ -53,4 +48,4 @@ do-install:
cd ${WRKDIR}/doc && \
${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 759f1ddcde7..c2bb2310c28 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ssh
-# Version required: 1.2.22
-# Date created: 19971214
-# Whom: hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.15 1998/03/19 02:20:53 tv Exp $
+# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:47 agc Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -23,8 +18,8 @@ GNU_CONFIGURE= YES
# Include local make config file here. It is essential to have this
# precede any override targets (those that override defaults in
-# <bsd.port.mk> that test variables that may be set here. Note that
-# this inclusion is otherwise redundant, since <bsd.port.mk> includes
+# <bsd.pkg.mk> that test variables that may be set here. Note that
+# this inclusion is otherwise redundant, since <bsd.pkg.mk> includes
# <bsd.own.mk>, which includes it.
# XXX: FIXME ! We need a simple way of doing this in many dozen pkgs.
@@ -149,7 +144,7 @@ post-install:
pre-clean:
@${RM} -f ${PKGDIR}/PLIST ${PKGDIR}/MESSAGE ${PKGDIR}/DEINSTALL
-# Include <bsd.port.mk> here. It is essential to have all the override
+# Include <bsd.pkg.mk> here. It is essential to have all the override
# targets precede inclusion of this.
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 63c09482b56..781b3f07497 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: sudo
-# Version required: 1.5.3
-# Date created: Sun Dec 14 23:01:32 MET 1997
-# Whom: soren@t.dk
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:52:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:47 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
#
@@ -24,4 +19,4 @@ MAN8= sudo.8 visudo.8
post-install:
cd ${WRKSRC} ; ${CP} sample.sudoers ${PREFIX}/etc/sudoers.example
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/Makefile b/shells/Makefile
index 450aa3ff6b0..72614efa4a3 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/02/09 00:54:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:47 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/01/03 00:40:55 max Exp
#
@@ -10,4 +10,4 @@
SUBDIR += tcsh
SUBDIR += zsh
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index a76827cd48b..2cc0a70b2ae 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: bash
-# Version required: 2.01
-# Date created: 21 August 1994
-# Whom: jkh
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 23:11:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:48 agc Exp $
# FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp
#
@@ -50,4 +45,4 @@ post-install:
${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 6725f85c2bb..a876afc14ad 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: es
-# Version required: 0.9a1
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 23:13:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:48 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp
#
@@ -17,4 +12,4 @@ MAINTAINER= erich@FreeBSD.org
MANCOMPRESSED= yes
MAN1= es.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 45b2a8d7f45..67a6758ed52 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rc
-# Version required: 1.5b1
-# Date created: Sun Aug 13 12:36:14 CDT 1995
-# Whom: erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.5 1998/02/27 13:21:23 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
#
@@ -18,4 +13,4 @@ NO_WRKSUBDIR= yes
MANCOMPRESSED= yes
MAN1= rc.1 history.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index ce283931b0c..c67bd4b580e 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: scsh
-# Version required: 0.5.1
-# Date created: Jul, 15, 1997
-# Whom: cracauer@cons.org "Martin Cracauer"
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 16:23:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:48 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp
#
@@ -31,4 +26,4 @@ post-install:
${RM} -f ${PREFIX}/share/doc/scsh
${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index a1f037bd704..80ad0b4aa0e 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: tcsh
-# Version required: 6.07.02
-# Date created: 22 August 1994
-# Whom: jkh
-#
-# $NetBSD: Makefile,v 1.7 1998/03/07 21:24:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:48 agc Exp $
# FreeBSD Id: Makefile,v 1.17 1996/12/17 05:18:09 asami Exp
#
@@ -38,4 +33,4 @@ post-install:
cd ${WRKSRC}; ${INSTALL_DATA} tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
${ECHO} "updating /etc/shells"; ${CP} /etc/shells /etc/shells.bak; (grep -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 90ce7decdfb..babdf4d7450 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: zsh
-# Version required: 3.0.5
-# Date created: 11 Feb. 1995
-# Whom: torstenb
-#
-# $NetBSD: Makefile,v 1.5 1998/04/14 18:35:59 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:48 agc Exp $
# FreeBSD Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp
#
@@ -43,4 +38,4 @@ post-install:
fi
@${PREFIX}/bin/install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 59d2b121b74..45081a85183 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/01 15:03:32 frueauf Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:48 agc Exp $
# FreeBSD Id: Makefile,v 1.23 1997/09/30 06:14:59 asami Exp
#
@@ -35,4 +35,4 @@
# SUBDIR += xsysinfo
# SUBDIR += xsysstats
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile
index 933b3fa6b7a..caf36f6e175 100644
--- a/sysutils/amanda/Makefile
+++ b/sysutils/amanda/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: amanda
-# Version required: 2.3.0
-# Date created: 28th Feb 1995
-# Whom: gpalmer
-#
-# $NetBSD: Makefile,v 1.5 1998/01/24 20:52:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -29,4 +24,4 @@ post-install:
${MKDIR} ${PREFIX}/share/examples/amanda
${CP} -R ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 10e1bddea2f..10318dff71d 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: cdrecord
-# Version required: 1.5
-# Date created: 2 November 1997
-# Whom: jmz
-#
-# $NetBSD: Makefile,v 1.7 1998/03/10 16:26:34 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:49 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp
#
@@ -34,4 +29,4 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
# @cd /dev && ${LN} -sf /dev/rworm0.ctl sgx
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 885fc419721..51930d0b013 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: crashme
-# Version required: 2.4
-# Date created: Fri Nov 14 08:39:08 GMT 1997
-# Whom: Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 23:29:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:49 agc Exp $
#
DISTNAME= crashme-2.4
@@ -21,4 +16,4 @@ MAKEFILE= makefile
MAN1= crashme.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/depot/Makefile b/sysutils/depot/Makefile
index 82857b67568..b066aeda5b5 100644
--- a/sysutils/depot/Makefile
+++ b/sysutils/depot/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: depot
-# Version required: 5.14
-# Date created: 10 Feb 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/02/15 10:51:56 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:49 agc Exp $
#
DISTNAME= depot-5.14
@@ -22,4 +17,4 @@ do-install:
@cd ${WRKSRC}/man/man1 && ${MAKE} DESTDIR=${PREFIX} install
@cd ${WRKSRC}/man/man5 && ${MAKE} DESTDIR=${PREFIX} install
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 8c19da5a642..52b69e6b600 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: lsof
-# Version required: 4.29
-# Date created: Sat July 20, 1996
-# Whom: David O'Brien (obrien@FreeBSD.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/04/02 09:35:38 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:49 agc Exp $
# FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
#
@@ -56,4 +51,4 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof
@chmod 0444 ${PREFIX}/share/lsof/00*
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index d526c87f719..fc60baaf959 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mc
-# Version required: 4.1
-# Date created: 24 Oct 1997
-# Whom: hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 21:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:36 agc Exp $
# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
#
@@ -22,4 +17,4 @@ MAN8= mcserv.8
post-install:
@ ${RMDIR} ${PREFIX}/lib/mc/icons
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 2497d7f8fb6..8d7df131256 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mkisofs
-# Version required: 1.11
-# Date created: 07 Aug 1996
-# Whom: jkh
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 23:32:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:49 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/28 11:30:44 joerg Exp
#
@@ -17,4 +12,4 @@ GNU_CONFIGURE= yes
MAKE_FLAGS= XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"'`uname -s | ${TR} [a-z] [A-Z]`'\"' -f
MAN8= mkisofs.8
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index adcb62fc3e6..8cb773f436f 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,9 +1,4 @@
-# Packages collection makefile for: mtools
-# Version required: 3.6
-# Date created: 22 Jan 1998
-# Whom: is
-#
-# $NetBSD: Makefile,v 1.5 1998/02/16 07:41:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:49 agc Exp $
#
DISTNAME= mtools-3.8
@@ -29,4 +24,4 @@ MAN5= mtools.5
post-install:
${PREFIX}/bin/install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 33789746438..49d90ba7da8 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,11 +1,4 @@
-# New ports collection makefile for: rtty
-# Version required: 3.2
-# Date created: 24 Aug 1996
-# Whom: jkh
-#
-# Author: Paul Vixie / Internet Software Consortium
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 23:33:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:49 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
#
@@ -26,4 +19,4 @@ pre-configure:
done
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index 8770ad2dfa3..b72f205ca6b 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: socket
-# Version required: 1.1
-# Date created: 14 August 1996
-# Whom: wosch
-#
-# $NetBSD: Makefile,v 1.2 1998/02/24 00:44:24 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:50 agc Exp $
# $FreeBSD Id: Makefile,v 1.7 1997/08/16 10:14:56 wosch Exp
#
@@ -17,4 +12,4 @@ MAN1= socket.1
MAKE_ENV+= INSTALLBASE=${PREFIX}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index 66868405f5e..2361990251f 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: top
-# Version required: 3.5beta7
-# Date created: 25 Sep 1994
-# Whom: swallace
-#
-# $NetBSD: Makefile,v 1.10 1998/03/04 07:56:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:50 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
#
@@ -40,4 +35,4 @@ pre-configure:
.endif
chmod a-x ${WRKSRC}/install
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 546dff3b7c0..2b8ad93f64a 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xosview
-# Version required: 1.5.1
-# Date created: Fri Oct 24 10:03:55 BST 1997
-# Whom: Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.8 1998/03/18 13:42:15 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:50 agc Exp $
#
DISTNAME= xosview-1.5.1
@@ -19,4 +14,4 @@ MAN1= xosview.1
MAKE_ENV+= UVM=${UVM}
MAKE_FLAGS= ARCH=${ARCH} -f
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
index 37d18c9d774..0f9b52ddd86 100644
--- a/sysutils/xosview/patches/patch-ae
+++ b/sysutils/xosview/patches/patch-ae
@@ -4,7 +4,7 @@
CXXFLAGS += -I@top_srcdir@
-+.include <bsd.port.subdir.mk>
++.include "../../../../../mk/bsd.pkg.subdir.mk"
+.if (${ARCH} == "hp300")
+CXXFLAGS += -D_HP300_CPU_H_
+.endif
diff --git a/textproc/Makefile b/textproc/Makefile
index 229377765f3..c7ca016acfb 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/03/31 13:07:02 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:50 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/10/13 11:11:32 itojun Exp
#
@@ -22,4 +22,4 @@
SUBDIR += unroff
# SUBDIR += wdiff
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 9028e759e58..6873bf83ea5 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: glimpse
-# Version required: 3.6
-# Date created: 25 August 1996
-# Whom: chuckr@freebsd.org
-#
-# $NetBSD: Makefile,v 1.2 1997/10/30 01:40:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:50 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
#
@@ -28,4 +23,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glimpse
${INSTALL_PROGRAM} ${WRKSRC}/index/wgconvert ${PREFIX}/bin
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index d9f19d3d46d..9f6ff0cd98d 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ispell
-# Version required: 3.1.20
-# Date created: 6 November 1994
-# Whom: jmz
-#
-# $NetBSD: Makefile,v 1.4 1998/02/22 00:14:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:50 agc Exp $
# FreeBSD Id: Makefile,v 1.21 1997/08/13 23:29:52 jmz Exp
#
@@ -60,4 +55,4 @@ french:
pre-install:
@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/par/Makefile b/textproc/par/Makefile
index 5e57e6988bc..0137971c94d 100644
--- a/textproc/par/Makefile
+++ b/textproc/par/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: Par
-# Version required: 1.50
-# Date created: 6 Aug 1997
-# Whom: mark@grondar.za
-#
-# $NetBSD: Makefile,v 1.2 1998/01/12 11:52:16 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:51 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/08/13 06:33:51 asami Exp
#
@@ -24,4 +19,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/par ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/par.1 ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 61f91411b83..d684071905d 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rman
-# Version required: 3.0.4
-# Date created: 27 Dec 1994
-# Whom: Thomas Gellekum <tg@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/01/24 23:44:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:51 agc Exp $
# FreeBSD Id: Makefile,v 1.17 1997/12/08 15:45:27 tg Exp
#
@@ -21,4 +16,4 @@ MAN1= rman.1
post-install:
@strip ${PREFIX}/bin/rman
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index c6877113d2a..d3da350307e 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: unroff
-# Version required: 1.0
-# Date created: 18 Feb 1996
-# Whom: Thomas Gellekum <tg@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.2 1998/03/31 13:00:52 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:51 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/04/27 00:11:48 asami Exp
#
@@ -42,4 +37,4 @@ pre-patch:
post-patch:
@(cd ${WRKSRC} && find . -name '*.orig' -print | xargs rm -f)
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/Makefile b/www/Makefile
index 38eaddb4148..3f25bb6c526 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/09 08:30:17 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:51 agc Exp $
# FreeBSD Id: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp
#
@@ -54,4 +54,4 @@
# SUBDIR += wwwcount
# SUBDIR += wwwstat
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 44424decd43..4f25aa7697b 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for: apache
-# http://www.apache.org
-# Version required: 1.3b5
-# Date created: 18 Mar 1998
-# Whom: cjs@netbsd.org
#
-# $NetBSD: Makefile,v 1.5 1998/03/24 20:34:57 cjs Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:51 agc Exp $
# FreeBSD Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp
#
@@ -90,4 +85,4 @@ do-install:
${INSTALL_DATA} $$file ${CONF_DIR}/$${file}-dist ; \
done
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 9da9ddc769e..93e5bc9123b 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for: lynx
-# http://sol.slcc.edu/lynx/current/
-# Version required: 2.8rel2
-# Date created: 15 Dec 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.6 1998/03/10 23:03:02 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:51 agc Exp $
# FreeBSD Id: Makefile,v 1.71 1997/11/24 19:35:30 ache Exp
#
@@ -28,4 +22,4 @@ MAN1= lynx.1
post-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/etc/lynx_help
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index a2dedc0c885..c184f357252 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,9 +1,4 @@
-# New packages collection Makefile for: mozilla
-# Version required: 5.0b1 (3/31/98)
-# Date created: 08 Apr 1998
-# Whom: fvdl
-#
-# $NetBSD: Makefile,v 1.6 1998/04/11 00:07:21 fvdl Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:52 agc Exp $
#
DISTNAME= unix_19980408
@@ -35,4 +30,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/bin/*.so* ${MOZ_LIBDIR}
${INSTALL_DATA} ${WRKSRC}/dist/${MOZ_OBJDIR}/lib/*.so* ${MOZ_LIBDIR}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index f3a5daa3672..3f88cac3d19 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: p5-libwww
-# Version required: 5.12
-# Date created: September 30th 1996
-# Whom: James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 23:55:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:52 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 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/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"