summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--archivers/Makefile4
-rw-r--r--archivers/arc/Makefile9
-rw-r--r--archivers/bzip/Makefile9
-rw-r--r--archivers/bzip2/Makefile9
-rw-r--r--archivers/freeze/Makefile9
-rw-r--r--archivers/gcpio/Makefile9
-rw-r--r--archivers/gtar/Makefile9
-rw-r--r--archivers/ha/Makefile9
-rw-r--r--archivers/lha/Makefile9
-rw-r--r--archivers/macutil/Makefile9
-rw-r--r--archivers/rar/Makefile10
-rw-r--r--archivers/unarj/Makefile9
-rw-r--r--archivers/unrar/Makefile9
-rw-r--r--archivers/unzip/Makefile9
-rw-r--r--archivers/zip/Makefile11
-rw-r--r--archivers/zoo/Makefile9
-rw-r--r--audio/Makefile4
-rw-r--r--audio/amp/Makefile7
-rw-r--r--audio/cam/Makefile9
-rw-r--r--audio/cddbd/Makefile9
-rw-r--r--audio/gsm/Makefile9
-rw-r--r--audio/maplay/Makefile9
-rw-r--r--audio/mikmod/Makefile7
-rw-r--r--audio/mpg123/Makefile9
-rw-r--r--audio/nspmod/Makefile7
-rw-r--r--audio/rplay/Makefile9
-rw-r--r--audio/snd/Makefile9
-rw-r--r--audio/sox/Makefile9
-rw-r--r--audio/splay/Makefile9
-rw-r--r--audio/timidity/Makefile8
-rw-r--r--audio/tosha/Makefile9
-rw-r--r--audio/tracker/Makefile9
-rw-r--r--audio/xcd/Makefile9
-rw-r--r--audio/xcdplayer/Makefile9
35 files changed, 70 insertions, 226 deletions
diff --git a/Makefile b/Makefile
index a91c1705869..7059e109ef6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/13 15:41:59 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:06 agc Exp $
# FreeBSD Id: Makefile,v 1.35 1997/08/19 07:10:01 fenner Exp
#
@@ -39,7 +39,7 @@ SUBDIR += x11
PORTSTOP= yes
-.include <bsd.port.subdir.mk>
+.include "mk/bsd.pkg.subdir.mk"
index:
@rm -f ${.CURDIR}/INDEX
diff --git a/archivers/Makefile b/archivers/Makefile
index 1b1b6ec5ab7..e9f0411fcc9 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/03/19 14:10:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:07 agc Exp $
# FreeBSD Id: Makefile,v 1.18 1997/05/16 01:42:31 asami Exp
#
@@ -24,4 +24,4 @@
# SUBDIR += zip.with_encryption
SUBDIR += zoo
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 821a6fab531..715acfe4f0f 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: arc
-# Version required: 5.21e
-# Date created: 31 Dec 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp
#
@@ -18,4 +13,4 @@ MAINTAINER= ache@FreeBSD.ORG
NO_WRKSUBDIR= yes
MAN1= arc.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 425dc487d33..857892a29db 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: bzip
-# Version required: 0.21
-# Date created: Fr 27 Sep 1996 11:47:35 MET DST
-# Whom: Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1996/12/07 09:28:40 max Exp
#
@@ -26,4 +21,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/bzip.1 ${PREFIX}/man/man1/bzip.1
${INSTALL_MAN} ${WRKSRC}/bzip.1 ${PREFIX}/man/man1/bunzip.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index a1b46dcb19c..fc09310fb91 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: bzip2
-# Version required: 0.1pl2
-# Date created: 19 Nov 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/09 09:58:29 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/11/20 08:18:40 tg Exp
#
@@ -23,4 +18,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${PREFIX}/man/man1
ln ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bunzip2.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 7514cbcf7fa..853a7943f93 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: freeze
-# Version required: 2.5
-# Date created: 20 Jul 1996
-# Whom: lukin@okbmei.msk.su
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/18 11:20:59 asami Exp
#
@@ -17,4 +12,4 @@ GNU_CONFIGURE= yes
ALL_TARGET= prog
MAN1= freeze.1 melt.1 unfreeze.1 fcat.1 statist.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 04e5466d60c..ee40348500f 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: gcpio
-# Version required: 2.4.2
-# Date created: 1 March 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/03/05 20:09:46 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $
#
DISTNAME= cpio-2.4.2
@@ -27,4 +22,4 @@ MAN1= gcpio.1
post-install:
install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cpio.info
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index daa8f085cd6..9e264da73eb 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: gtar
-# Version required: 1.12
-# Date created: 1 March 1998
-# Whom: tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 11:57:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:08 agc Exp $
#
DISTNAME= tar-1.12
@@ -26,4 +21,4 @@ MAN1= gtar.1
post-install:
${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 5cbb3c070e4..dd7e85f5197 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: ha
-# Version required: 0.999beta
-# Date created: 24 Jan 1995
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.3 1998/02/09 00:34:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:08 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp
#
@@ -24,4 +19,4 @@ USE_GMAKE= yes
do-install:
cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 471aba4ab23..0dcb6748bd4 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: lha
-# Version required: 1.14C
-# Date created: 26 Dec 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.3 1997/11/18 12:26:05 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:08 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1996/12/15 02:05:58 max Exp
#
@@ -20,4 +15,4 @@ MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
MANLANG= ja_JP.EUC
MAN1= lha.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index 3b92427752d..4e925bc0470 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,9 +1,4 @@
-# New packages collection makefile for: macutil
-# Version required: 2.0b3
-# Date created: 13 March 1998
-# Whom: mycroft
-#
-# $NetBSD: Makefile,v 1.3 1998/03/16 10:44:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:08 agc Exp $
DISTNAME= macutil
PKGNAME= macutil-2.0b3
@@ -40,4 +35,4 @@ do-install:
${WRKSRC}/man/frommac.1 \
${WRKSRC}/man/macutil.1 ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index b5b9aa8dd76..9bb8fa5e2a5 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for: rar
-# http://www.inetpros.net/rar.htm
-# Version required: 2.01
-# Date created: 15 May 1996
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.8 1998/03/07 21:23:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:08 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp
#
@@ -49,4 +43,4 @@ do-install:
${INSTALL_DATA} Dos.SFX \
${PREFIX}/share/rar/dos.sfx
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index c895a6a64cb..a5e2fb36187 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: unarj
-# Version required: 2.41
-# Date created: 28 Dec 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.2 1997/10/27 03:22:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:08 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1996/11/12 02:17:38 obrien Exp
#
@@ -18,4 +13,4 @@ MAINTAINER= ache@FreeBSD.ORG
do-install:
cd ${WRKSRC}; ${INSTALL_PROGRAM} ${DISTNAME} ${PREFIX}/bin
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 3561fe04740..1b76f6b486a 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: unrar
-# Version required: 2.01
-# Date created: 28 Dec 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.3 1998/03/07 21:23:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:09 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1997/08/10 22:31:33 fenner Exp
#
@@ -26,4 +21,4 @@ do-install:
cd ${WRKSRC} && ${INSTALL_MAN} readme.txt license.txt \
${PREFIX}/share/doc/unrar
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 0bcb80dbe27..738cba0c17c 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: unzip
-# Version required: 5.3.2
-# Date created: 17 October 1994
-# Whom: jmz
-#
-# $NetBSD: Makefile,v 1.5 1998/03/07 21:24:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:09 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp
#
@@ -31,4 +26,4 @@ do-install:
cd ${WRKSRC} && \
${INSTALL_DATA} README WHERE COPYING ${PREFIX}/share/doc/unzip
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 9224c50d971..9ab7a086494 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,11 +1,4 @@
-# New packages collection makefile for: zip (without encryption)
-# http://infozip.cdrom.com/pub/infozip/
-#
-# Version required: 2.2
-# Date created: 22 Dec 1994
-# Whom: ache
-#
-# $NetBSD: Makefile,v 1.6 1998/03/16 10:47:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:09 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
#
@@ -30,4 +23,4 @@ do-install:
ln -fs zip.1 ${PREFIX}/man/man1/zipnote.1
ln -fs zip.1 ${PREFIX}/man/man1/zipsplit.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index ba9c2bc15d4..b547481d242 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: zoo
-# Version required: 2.10pl1
-# Date created: 18 October 1994
-# Whom: jmz
-#
-# $NetBSD: Makefile,v 1.4 1998/02/09 00:33:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:09 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp
#
@@ -21,4 +16,4 @@ MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_DATA="${INSTALL_DATA}"
MAN1= fiz.1 zoo.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/Makefile b/audio/Makefile
index bfb060f9a27..71f69eddde6 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/02/22 23:29:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 1998/04/15 10:38:09 agc Exp $
#
SUBDIR += amp
@@ -23,4 +23,4 @@
SUBDIR += xmmix
SUBDIR += xwave
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index 7268b285fed..2d5b64fc65d 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,7 +1,4 @@
-# Makefile for: amp
-# Version required: 0.7.6
-#
-# $NetBSD: Makefile,v 1.4 1998/03/20 06:02:06 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:09 agc Exp $
#
DISTNAME= amp-0.7.6
@@ -19,4 +16,4 @@ do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
@ ${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index afac8b1e1a9..1a33350ff48 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: cam
-# Version required: 1.02
-# Date created: Tue Nov 12 15:54:21 CST 1996
-# Whom: erich@FreeBSD.org
-#
-# $NetBSD: Makefile,v 1.3 1998/01/19 00:50:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:09 agc Exp $
#
DISTNAME= cam-1.02
@@ -19,4 +14,4 @@ BUILD_DEPENDS= ${PREFIX}/lib/libncurses.a:${PORTSDIR}/devel/ncurses
MAN1= cam.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cddbd/Makefile b/audio/cddbd/Makefile
index 28fba8ea91c..d5af0f0fa26 100644
--- a/audio/cddbd/Makefile
+++ b/audio/cddbd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: cddbd
-# Version required: 1.3.1 patch 1
-# Date created: 18 Apr 1997
-# Whom: Brent J. Nordquist <bjn@visi.com>
-#
-# $NetBSD: Makefile,v 1.2 1998/02/02 20:53:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:10 agc Exp $
#
DISTNAME= cddbd-1.3.1
@@ -29,4 +24,4 @@ do-install:
BINPERM=${BINMODE} BINOWNER=${BINOWN} BINGROUP=${BINGRP} \
sh install.sh )
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 078f7b3acad..a7634c4aa5f 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: gsm
-# Version required: gsm-1.0.10
-# Date created: 5 January 1995
-# Whom: pst
-#
-# $NetBSD: Makefile,v 1.7 1998/03/16 07:44:47 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:10 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:39 max Exp
#
@@ -24,4 +19,4 @@ post-install:
@strip ${PREFIX}/bin/toast
${LDCONFIG} || ${TRUE}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index cec8862cd6c..291b6a466b1 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: maplay
-# Version required: 1.2
-# Date created: Feb 13 1995
-# Whom: jkh
-#
-# $NetBSD: Makefile,v 1.2 1997/10/28 23:49:37 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:10 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp
#
@@ -21,4 +16,4 @@ PATCH_STRIP= -p2
pre-configure:
@(cd ${WRKSRC}; make pre-install)
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index fb899edc57e..d6e65fbe7ef 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,7 +1,4 @@
-# Makefile for: mikmod
-# Version required: 2.14
-#
-# $NetBSD: Makefile,v 1.6 1998/03/20 07:08:43 mycroft Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:10 agc Exp $
#
DISTNAME= mikmod-2.14-unix
@@ -29,4 +26,4 @@ do-install:
.endfor
.endif
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 183c67aa4ee..f6890d230b9 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mpg123
-# Version required: mpg123-0.59k
-# Date created: 97-10-25
-# Whom: augustss@cs.chalmers.se
-#
-# $NetBSD: Makefile,v 1.5 1998/03/07 13:55:38 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:10 agc Exp $
#
DISTNAME= mpg123-0.59o
@@ -22,4 +17,4 @@ ALL_TARGET= netbsd
MAKE_FLAGS+= PREFIX="${PREFIX}"
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 0fea9686628..08fb5965158 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,7 +1,4 @@
-# Makefile for: nspmod
-# Version required: 0.1
-#
-# $NetBSD: Makefile,v 1.3 1998/03/20 06:41:17 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:10 agc Exp $
#
DISTNAME= nspmod-0.1
@@ -18,4 +15,4 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nspmod ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${MANPREFIX}/man/man1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 62471025027..6e8e53e80c7 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rplay - Network audio player
-# Version required: 3.2.0b6
-# Date created: 16 March 1995
-# Whom: rmallory@csusb.edu
-#
-# $NetBSD: Makefile,v 1.5 1998/01/30 13:56:55 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:10 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
#
@@ -50,4 +45,4 @@ post-install:
install-info ${PREFIX}/info/rplay.info ${PREFIX}/info/dir
install-info ${PREFIX}/info/librplay.info ${PREFIX}/info/dir
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 85810c62c48..9e6eb5cf270 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: snd
-# Version required: 12-Feb-98
-# Date created: 1998-02-22
-# Whom: hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.2 1998/03/05 15:32:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
#
DISTNAME= snd
@@ -28,4 +23,4 @@ do-install:
${MKDIR} ${PREFIX}/share/doc/snd
cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${PREFIX}/share/doc/snd
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 2563c0455a4..91088510651 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: sox - Sound Exchange
-# Version required: 12p12
-# Date created: 17 Oct 1994
-# Whom: torstenb
-#
-# $NetBSD: Makefile,v 1.2 1997/10/29 01:48:29 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp
#
@@ -22,4 +17,4 @@ do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/sox ${PREFIX}/bin
@${INSTALL_MAN} ${WRKSRC}/sox.man ${PREFIX}/man/man1/sox.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index fb73d5150eb..113e20f61ee 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: splay
-# Version required: 0.3
-# Date created: 1 Apr 1997
-# Whom: junker@jazz.snu.ac.kr
-#
-# $NetBSD: Makefile,v 1.2 1997/11/01 00:56:26 augustss Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/08/09 23:37:33 fenner Exp
#
@@ -17,4 +12,4 @@ MAINTAINER= junker@jazz.snu.ac.kr
GNU_CONFIGURE= yes
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index ecb2f53ab30..04fa1d91ee0 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,4 @@
-# Makefile for: timidity
-# Homepage: http://www.cgs.fi/~tt/timidity/
-# Version required: 0.2i
-#
-# $NetBSD: Makefile,v 1.9 1998/03/20 07:07:31 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:11 agc Exp $
#
DISTNAME= timidity-0.2i
@@ -34,4 +30,4 @@ post-install:
cd ${PREFIX}/lib/timidity/patch && \
unzip -o -q -L ${DISTDIR}/${TIINS}
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index d9cc0126a59..723c7db0eb1 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: tosha
-# Version required: 0.05
-# Date created: 21 May 1997
-# Whom: Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de>
-#
-# $NetBSD: Makefile,v 1.2 1998/01/19 01:13:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/05/25 08:58:43 andreas Exp
#
@@ -15,4 +10,4 @@ MAINTAINER= oliver.fromme@heim3.tu-clausthal.de
MAN1= pcmfade.1 pcmplay.1 tosha.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index e4af02fcb33..a8bc5d34842 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: tracker
-# Version required: 5.3
-# Date created: 2 Oct 1994
-# Whom: swallace
-#
-# $NetBSD: Makefile,v 1.6 1998/03/01 03:27:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:11 agc Exp $
# FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp
#
@@ -37,4 +32,4 @@ post-install:
-${MKDIR} ${PREFIX}/share/doc/tracker
${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 0a1952c8f2f..3775cb53c62 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xcd
-# Version required: 1.6
-# Date created: 22 November 1994
-# Whom: jmz
-#
-# $NetBSD: Makefile,v 1.2 1998/01/19 01:18:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
# FreeBSD Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp
#
@@ -18,4 +13,4 @@ RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80
WRKSRC= ${WRKDIR}/xcd
MAN1= cdplayer.1 xcd.1
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 786b07bf699..5c24e690b88 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xcdplayer
-# Version required: 2.2
-# Date created: 30 Sep 1994
-# Whom: swallace
-#
-# $NetBSD: Makefile,v 1.3 1998/03/10 12:29:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:12 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/04/01 23:08:24 swallace Exp
#
@@ -18,4 +13,4 @@ MAINTAINER= swallace@FreeBSD.org
USE_IMAKE= yes
CAT1= xcdplayer.0
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"