diff options
author | jlam <jlam> | 2004-01-06 07:17:03 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-01-06 07:17:03 +0000 |
commit | 2b49d91a936805c4f6814fa18b2838594afd66e8 (patch) | |
tree | 737101babd6209a021b8e98d38673e0d94edd405 | |
parent | 7d16cd26f72ff354514d30a8f55a76aa92890290 (diff) | |
download | pkgsrc-2b49d91a936805c4f6814fa18b2838594afd66e8.tar.gz |
bl3ify
-rw-r--r-- | audio/esound/Makefile | 10 | ||||
-rw-r--r-- | mail/anomy-sanitizer/Makefile | 6 | ||||
-rw-r--r-- | x11/xautolock/Makefile | 10 | ||||
-rw-r--r-- | x11/xlockmore/Makefile | 10 | ||||
-rw-r--r-- | x11/xlockmore/Makefile.common | 8 | ||||
-rw-r--r-- | x11/xpaste/Makefile | 5 |
6 files changed, 32 insertions, 17 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 48c2bfc0739..3ca30dbef95 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2003/09/07 10:46:06 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2004/01/06 07:17:03 jlam Exp $ DISTNAME= esound-0.2.32 CATEGORIES= audio @@ -8,7 +8,9 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html COMMENT= The Enlightened sound daemon -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -34,7 +36,7 @@ post-install: cd ${WRKSRC}/docs/html && \ ${PAX} -rw -pp -pm . ${PREFIX}/share/doc/html/esound -.include "../../audio/libaudiofile/buildlink2.mk" -.include "../../mk/ossaudio.buildlink2.mk" +.include "../../audio/libaudiofile/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile index 9c31f7a7952..7bc39a51f71 100644 --- a/mail/anomy-sanitizer/Makefile +++ b/mail/anomy-sanitizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/08/31 13:51:20 mjl Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/06 07:17:57 jlam Exp $ # DISTNAME= anomy-sanitizer-1.63 @@ -13,8 +13,11 @@ COMMENT= Mail message filter and sanitizer DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64 DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 +PKG_INSTALLATION_TYPES= overwrite pkgviews + .include "../../mk/bsd.prefs.mk" +NO_BUILDLINK= # defined NO_CONFIGURE= # defined USE_PERL5= # defined @@ -38,6 +41,7 @@ do-build: ) do-install: + ${INSTALL_SCRIPT_DIR} ${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/sanitizer ${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/simplify ${PREFIX}/sbin ${INSTALL_DATA_DIR} ${ANOMYDOC} diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile index 7b6cc065062..71ff79f0812 100644 --- a/x11/xautolock/Makefile +++ b/x11/xautolock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/08/09 08:32:13 tron Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/06 07:17:13 jlam Exp $ DISTNAME= xautolock-pl15 PKGNAME= xautolock-1.15 @@ -10,7 +10,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= tron@NetBSD.org COMMENT= Activate xlock after a user defined time of inactivity -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES USE_IMAKE= YES .include "../../mk/bsd.prefs.mk" @@ -21,9 +23,11 @@ PLIST_SRC= ${WRKDIR}/PLIST post-install: ${GREP} -v '^man/cat' ${PKGDIR}/PLIST >${PLIST_SRC} .else +INSTALLATION_DIRS= man/man1 + post-install: cd ${WRKSRC}; \ - ${INSTALL_MAN} xautolock.man ${X11PREFIX}/man/man1/xautolock.1 + ${INSTALL_MAN} xautolock.man ${PREFIX}/man/man1/xautolock.1 .endif .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index ec2bf3a1b1f..6b72900aad6 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2003/11/30 22:58:40 jschauma Exp $ +# $NetBSD: Makefile,v 1.64 2004/01/06 07:17:13 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -23,10 +23,10 @@ COMMENT= Like the XLock session-locker/screensaver, but with more CONFIGURE_ARGS+= --with-mesagl -.include "../../audio/esound/buildlink2.mk" -.include "../../graphics/MesaLib/buildlink2.mk" -.include "../../graphics/glu/buildlink2.mk" -.include "../../graphics/xpm/buildlink2.mk" +.include "../../audio/esound/buildlink3.mk" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" +.include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 49b2799cab8..9a447ccda65 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2003/12/31 03:06:37 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.10 2004/01/06 07:17:13 jlam Exp $ # # This Makefile.common is included by: # @@ -23,7 +23,9 @@ DISTINFO_FILE?= ${.CURDIR}/../xlockmore/distinfo PATCHDIR?= ${.CURDIR}/../xlockmore/patches PLIST_SRC?= ${.CURDIR}/../xlockmore/PLIST -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES USE_X11BASE= YES .include "../../mk/bsd.prefs.mk" @@ -49,7 +51,7 @@ CONFIGURE_ARGS+= --without-gtk .if ${OPSYS} == "NetBSD" . if defined(USE_OSS) -. include "../../audio/oss/buildlink2.mk" +. include "../../audio/oss/buildlink3.mk" BUILDLINK_DEPENDS.oss= oss-[0-9]* XLOCK_AUDIOPLAY?= ${BUILDLINK_PREFIX.oss}/bin/ossplay . else diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile index fbe28ea882e..787ec19bcdd 100644 --- a/x11/xpaste/Makefile +++ b/x11/xpaste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/12/04 09:27:01 seb Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/06 07:17:13 jlam Exp $ # DISTNAME= xpaste-1.1 @@ -11,6 +11,9 @@ EXTRACT_SUFX= .shar.gz MAINTAINER= seb@NetBSD.org COMMENT= Display the content of the X11 paste buffer in a window +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= yes USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" |