From b2677a2cb0d685822071dbac41558e75e1bc7c6a Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 30 Aug 2003 22:51:11 +0000 Subject: Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if USE_PKGINSTALL is "YES". bsd.pkg.install.mk will no longer automatically pick up a INSTALL/DEINSTALL script in the package directory and assume that you want it for the corresponding *_EXTRA_TMPL variable. --- audio/gqmpeg/Makefile | 4 +++- audio/oss/Makefile | 5 ++++- audio/xmcd/Makefile | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'audio') diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index 28c189c1772..d4f90afd792 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2003/08/30 20:22:50 jlam Exp $ +# $NetBSD: Makefile,v 1.75 2003/08/30 22:51:11 jlam Exp $ DISTNAME= gqmpeg-0.20.0 PKGREVISION= 2 @@ -21,6 +21,8 @@ USE_PKGLOCALEDIR= YES USE_X11= YES GNU_CONFIGURE= YES +DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL + .include "../../mk/bsd.prefs.mk" .if !defined(GQMPEG_NO_JAPANESE) diff --git a/audio/oss/Makefile b/audio/oss/Makefile index 9c5a7a24ad7..512381b710e 100644 --- a/audio/oss/Makefile +++ b/audio/oss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/07/23 21:52:29 jmc Exp $ +# $NetBSD: Makefile,v 1.22 2003/08/30 22:51:12 jlam Exp $ DISTNAME= oss-${OSS_VERSION} # Overridden below PKGNAME= oss-${OSS_VERSION} @@ -34,6 +34,9 @@ USE_BUILDLINK2= yes USE_PKGINSTALL= yes NO_CONFIGURE= yes +DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL +INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL + .if ${OPSYS} == "NetBSD" MODSTAT= /usr/bin/modstat .else diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index 9eb59c6499a..1d6dc81d857 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2003/07/17 21:23:50 grant Exp $ +# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:12 jlam Exp $ DISTNAME= xmcd-3.0.2 PKGREVISION= 3 @@ -16,6 +16,10 @@ PATCH_DIST_STRIP= -p1 USE_BUILDLINK2= yes USE_PKGINSTALL= yes + +DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL +INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL + USE_IMAKE= yes MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11 -- cgit v1.2.3