summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjlam <jlam>2003-01-28 22:03:00 +0000
committerjlam <jlam>2003-01-28 22:03:00 +0000
commitd9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf (patch)
treed3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /audio
parentebed1329682fd1c81284e9ee1632af9b987050f0 (diff)
downloadpkgsrc-d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf.tar.gz
Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set to "YES". This enforces the requirement that bsd.pkg.install.mk be included at the end of a package Makefile. Idea suggested by Julio M. Merino Vidal <jmmv at menta.net>.
Diffstat (limited to 'audio')
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/nas/Makefile10
-rw-r--r--audio/oss/Makefile8
-rw-r--r--audio/rplay/Makefile4
-rw-r--r--audio/tracker/Makefile6
-rw-r--r--audio/xmcd/Makefile8
-rw-r--r--audio/xmp/Makefile4
7 files changed, 22 insertions, 22 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index aaada47dad1..543d8c58fe0 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/10/30 03:09:25 rh Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:03:02 jlam Exp $
DISTNAME= esound-0.2.29
CATEGORIES= audio
@@ -9,6 +9,7 @@ HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html
COMMENT= the Enlightened sound daemon
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/esound.pc.in
@@ -23,5 +24,4 @@ CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
.include "../../audio/libaudiofile/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 94e9cce9d80..4340283c5f8 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/12/03 09:13:39 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:02 jlam Exp $
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
@@ -13,9 +13,10 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://radscan.com/nas.html
COMMENT= Network Audio System
-USE_BUILDLINK2= # defined
-USE_IMAKE= # defined
-USE_X11BASE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_IMAKE= yes
+USE_X11BASE= yes
PKG_SYSCONFSUBDIR= nas
@@ -45,5 +46,4 @@ PLIST_SRC+= ${PKGDIR}/PLIST.voxware
CONF_FILES= ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
.endif
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 77ec5fe6eaf..6b58c734da8 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/10 20:20:53 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:03 jlam Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -29,8 +29,9 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-USE_BUILDLINK2= # defined
-NO_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+NO_CONFIGURE= yes
.if ${OPSYS} == "NetBSD"
MODSTAT= /usr/bin/modstat
@@ -103,5 +104,4 @@ do-install: chroot
${RM} -f ${WRKSRC}/etc/*.o3 ${WRKSRC}/etc/*.sb
${RM} -f ${WRKSRC}/*.core
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 988502308d9..b56014ab4ed 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/09/19 09:04:02 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:03:03 jlam Exp $
#
DISTNAME= rplay-3.3.2
@@ -11,6 +11,7 @@ HOMEPAGE= http://rplay.doit.org/
COMMENT= Network audio player
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -31,6 +32,5 @@ pre-configure:
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/rx/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 17ed6a40cca..7f9148edd57 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/12/22 12:22:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:04 jlam Exp $
# FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp
#
@@ -24,10 +24,11 @@ MAKE_FLAGS= MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \
COMPRESSION_FILE_EG=${EGDIR}/compression_methods
+USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/tracker
CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods
-INFO_FILES= tracker.info
+INFO_FILES= tracker.info
pre-install:
cd ${WRKSRC}/Docs && \
@@ -41,5 +42,4 @@ post-install:
${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 7c3fa6f6e8a..86ca7d8dfc3 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/01/24 13:36:18 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:04 jlam Exp $
DISTNAME= xmcd-3.0.2
CATEGORIES= audio
@@ -14,9 +14,10 @@ PATCH_DIST_STRIP= -p1
WRKSRC= ${WRKDIR}/xmcd-3.0
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_NCURSES= # cursor_normal, cursor_invisible (in ncurses in term.h)
-USE_IMAKE= # defined
+USE_IMAKE= yes
MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin
MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11
MAKE_ENV+= BATCH_MANDIR=${PREFIX}/man/man1
@@ -53,5 +54,4 @@ post-install:
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/motif.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index bb606c68f04..1cc31a6a223 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/22 17:05:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:05 jlam Exp $
# FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp
#
@@ -12,6 +12,7 @@ MAINTAINER= rxg@ms25.url.com.tw
HOMEPAGE= http://xmp.sourceforge.net/
COMMENT= Player for many different Amiga and PC module formats
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-alsa \
--disable-oss \
@@ -28,5 +29,4 @@ CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"