[pkgsrc/trunk]: pkgsrc bl3ify

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/218c39891fca
branches:  trunk
changeset: 465801:218c39891fca
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jan 06 07:17:03 2004 +0000

description:
bl3ify

diffstat:

 audio/esound/Makefile         |  10 ++++++----
 mail/anomy-sanitizer/Makefile |   6 +++++-
 x11/xautolock/Makefile        |  10 +++++++---
 x11/xlockmore/Makefile        |  10 +++++-----
 x11/xlockmore/Makefile.common |   8 +++++---
 x11/xpaste/Makefile           |   5 ++++-
 6 files changed, 32 insertions(+), 17 deletions(-)

diffs (164 lines):

diff -r de2e7cb41717 -r 218c39891fca audio/esound/Makefile
--- a/audio/esound/Makefile     Tue Jan 06 07:05:24 2004 +0000
+++ b/audio/esound/Makefile     Tue Jan 06 07:17:03 2004 +0000
@@ -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 @@
 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 @@
        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 -r de2e7cb41717 -r 218c39891fca mail/anomy-sanitizer/Makefile
--- a/mail/anomy-sanitizer/Makefile     Tue Jan 06 07:05:24 2004 +0000
+++ b/mail/anomy-sanitizer/Makefile     Tue Jan 06 07:17:03 2004 +0000
@@ -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 @@
 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-install:
+       ${INSTALL_SCRIPT_DIR} ${PREFIX}/sbin
        ${INSTALL_SCRIPT} ${WRKSRC}/sanitizer ${PREFIX}/sbin
        ${INSTALL_SCRIPT} ${WRKSRC}/simplify ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${ANOMYDOC}
diff -r de2e7cb41717 -r 218c39891fca x11/xautolock/Makefile
--- a/x11/xautolock/Makefile    Tue Jan 06 07:05:24 2004 +0000
+++ b/x11/xautolock/Makefile    Tue Jan 06 07:17:03 2004 +0000
@@ -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 @@
 MAINTAINER=    tron%NetBSD.org@localhost
 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 @@
 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 -r de2e7cb41717 -r 218c39891fca x11/xlockmore/Makefile
--- a/x11/xlockmore/Makefile    Tue Jan 06 07:05:24 2004 +0000
+++ b/x11/xlockmore/Makefile    Tue Jan 06 07:17:03 2004 +0000
@@ -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 @@
 
 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 -r de2e7cb41717 -r 218c39891fca x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Tue Jan 06 07:05:24 2004 +0000
+++ b/x11/xlockmore/Makefile.common     Tue Jan 06 07:17:03 2004 +0000
@@ -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 @@
 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 @@
 
 .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 -r de2e7cb41717 -r 218c39891fca x11/xpaste/Makefile
--- a/x11/xpaste/Makefile       Tue Jan 06 07:05:24 2004 +0000
+++ b/x11/xpaste/Makefile       Tue Jan 06 07:17:03 2004 +0000
@@ -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 @@
 MAINTAINER=    seb%NetBSD.org@localhost
 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"