pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc bl3ify



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a1c0e7c6a58
branches:  trunk
changeset: 465742:8a1c0e7c6a58
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 12:48:30 2004 +0000

description:
bl3ify

diffstat:

 devel/libmm/Makefile        |   6 ++++--
 devel/ncurses/Makefile      |   6 ++++--
 sysutils/cdrecord/Makefile  |  15 +++++++--------
 sysutils/etcupdate/Makefile |   7 ++++++-
 sysutils/lsof/Makefile      |   6 +++++-
 sysutils/psmisc/Makefile    |   8 +++++---
 sysutils/xosview/Makefile   |  10 +++++++---
 wm/pwm/Makefile             |   6 ++++--
 www/bozohttpd/Makefile      |   8 ++++++--
 9 files changed, 48 insertions(+), 24 deletions(-)

diffs (251 lines):

diff -r 6c218618b48d -r 8a1c0e7c6a58 devel/libmm/Makefile
--- a/devel/libmm/Makefile      Mon Jan 05 12:36:41 2004 +0000
+++ b/devel/libmm/Makefile      Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:31:35 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/05 12:53:31 jlam Exp $
 #
 
 DISTNAME=      mm-1.2.2
@@ -10,7 +10,9 @@
 HOMEPAGE=      http://www.ossp.org/pkg/lib/mm/
 COMMENT=       Portable abstraction layer for shared memory
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 
 USE_LIBTOOL=           YES
diff -r 6c218618b48d -r 8a1c0e7c6a58 devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Mon Jan 05 12:36:41 2004 +0000
+++ b/devel/ncurses/Makefile    Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2003/12/20 08:49:27 reed Exp $
+# $NetBSD: Makefile,v 1.54 2004/01/05 12:53:10 jlam Exp $
 
 DISTNAME=              ncurses-${NC_VERS}
 NC_VERS=               5.3
@@ -12,7 +12,9 @@
 HOMEPAGE=              http://dickey.his.com/ncurses/ncurses.html
 COMMENT=               CRT screen handling and optimization package
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 USE_GCC_SHLIB=         YES
 USE_LIBTOOL=           YES
 
diff -r 6c218618b48d -r 8a1c0e7c6a58 sysutils/cdrecord/Makefile
--- a/sysutils/cdrecord/Makefile        Mon Jan 05 12:36:41 2004 +0000
+++ b/sysutils/cdrecord/Makefile        Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/07/17 22:53:28 grant Exp $
+# $NetBSD: Makefile,v 1.52 2004/01/05 12:48:30 jlam Exp $
 
 DISTNAME=      cdrtools-2.00.3
 PKGNAME=       cdrecord-2.00.3
@@ -11,17 +11,14 @@
 
 CONFLICTS=     mkisofs-[0-9]*
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                # defined
 USE_GMAKE=             # defined
 TBL?=                  tbl
 
-.if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM=   r:/opt/schily
-BUILDLINK_TRANSFORM+=  r:/opt/schily
-.endif
-
 # avoid picking up a bad ${ARCH} during the build
 MAKE_ENV+=      ARCH=""
 MAKE_ENV+=      MAKEPROG="gmake"
@@ -48,6 +45,8 @@
 CDRECORD_CONF_FILES=   cdrecord/defaults.c cdrecord/cdrecord.1
 CDRECORD_CONF_FILES+=  readcd/readcd.1
 
+INSTALLATION_DIRS=     bin man/man1 man/man8
+
 post-patch:
        @cd ${WRKSRC}; for file in ${CDRECORD_CONF_FILES}; do           \
                ${MV} ${WRKSRC}/$$file ${WRKSRC}/$${file}.old &&        \
@@ -89,5 +88,5 @@
                ${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin;          \
                ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
 
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6c218618b48d -r 8a1c0e7c6a58 sysutils/etcupdate/Makefile
--- a/sysutils/etcupdate/Makefile       Mon Jan 05 12:36:41 2004 +0000
+++ b/sysutils/etcupdate/Makefile       Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/12/03 06:44:45 martti Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/05 12:48:30 jlam Exp $
 
 DISTNAME=      etcupdate-20031112
 WRKSRC=                ${WRKDIR}
@@ -12,11 +12,16 @@
 
 ONLY_FOR_PLATFORM=     NetBSD-*-*
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 EXTRACT_ONLY=  # defined
 NO_CHECKSUM=   # defined
+NO_BUILDLINK=  # defined
 NO_CONFIGURE=  # defined
 NO_BUILD=      # defined
 
+INSTALLATION_DIRS=     bin man/man8
+
 do-install:
        ${INSTALL_SCRIPT} ${FILESDIR}/etcupdate ${PREFIX}/bin/etcupdate
        ${INSTALL_MAN} ${FILESDIR}/etcupdate.8 ${PREFIX}/man/man8
diff -r 6c218618b48d -r 8a1c0e7c6a58 sysutils/lsof/Makefile
--- a/sysutils/lsof/Makefile    Mon Jan 05 12:36:41 2004 +0000
+++ b/sysutils/lsof/Makefile    Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2003/11/22 23:19:47 christos Exp $
+# $NetBSD: Makefile,v 1.69 2004/01/05 12:48:30 jlam Exp $
 #
 
 DISTNAME=              lsof_4.69
@@ -27,6 +27,9 @@
 TMPWRK=                        ${WRKDIR}/${DISTNAME}
 SRCBALL_NAME=          ${DISTNAME}_src
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+USE_BUILDLINK3=                yes
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
@@ -34,6 +37,7 @@
 .elif ${OPSYS} == "SunOS"
 MAKE_ENV+=             CPPFLAGS=
 .endif
+INSTALLATION_DIRS=     man/man8 sbin
 
 LSOF_MORE_SECURE?= 0
 
diff -r 6c218618b48d -r 8a1c0e7c6a58 sysutils/psmisc/Makefile
--- a/sysutils/psmisc/Makefile  Mon Jan 05 12:36:41 2004 +0000
+++ b/sysutils/psmisc/Makefile  Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/21 17:24:23 martti Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/05 12:48:30 jlam Exp $
 
 DISTNAME=              psmisc-20.1
 CATEGORIES=            sysutils
@@ -11,7 +11,9 @@
 
 CONFLICTS+=            pstree<=2.16
 
-USE_BUILDLINK2=                # defined
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                # defined
 GNU_CONFIGURE=         # defined
 LIBS+=                 ${LIBGETOPT}
 
@@ -20,5 +22,5 @@
        ${RM} -f ${PREFIX}/bin/pidof
        ${LN} -f ${PREFIX}/bin/killall ${PREFIX}/bin/pidof
 
-.include "../../devel/libgetopt/buildlink2.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6c218618b48d -r 8a1c0e7c6a58 sysutils/xosview/Makefile
--- a/sysutils/xosview/Makefile Mon Jan 05 12:36:41 2004 +0000
+++ b/sysutils/xosview/Makefile Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/11/11 07:57:42 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2004/01/05 12:48:30 jlam Exp $
 
 DISTNAME=      xosview-1.8.1
 CATEGORIES=    sysutils
@@ -8,7 +8,9 @@
 HOMEPAGE=      http://xosview.sourceforge.net/
 COMMENT=       X11 graphical display of OS statistics
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 USE_X11BASE=           YES
 
 HAS_CONFIGURE=         YES
@@ -16,6 +18,8 @@
 CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
 CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib
 
+INSTALLATION_DIRS=     bin lib/X11/app-defaults man/man1
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
@@ -32,5 +36,5 @@
 LIBS+=         -lsocket -lnsl
 .endif
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6c218618b48d -r 8a1c0e7c6a58 wm/pwm/Makefile
--- a/wm/pwm/Makefile   Mon Jan 05 12:36:41 2004 +0000
+++ b/wm/pwm/Makefile   Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/15 18:51:21 salo Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/05 12:49:42 jlam Exp $
 #
 
 DISTNAME=      pwm-20030617
@@ -10,7 +10,9 @@
 HOMEPAGE=      http://modeemi.fi/~tuomov/pwm/
 COMMENT=       Window manager that frames multiple client windows in a single frame
 
-USE_BUILDLINK2=        YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 USE_X11=       YES
 USE_GMAKE=     YES
diff -r 6c218618b48d -r 8a1c0e7c6a58 www/bozohttpd/Makefile
--- a/www/bozohttpd/Makefile    Mon Jan 05 12:36:41 2004 +0000
+++ b/www/bozohttpd/Makefile    Mon Jan 05 12:48:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/10/06 01:16:47 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/05 12:50:34 jlam Exp $
 #
 
 DISTNAME=      bozohttpd-20031005
@@ -12,7 +12,9 @@
 
 BUILD_DEFS+=   USE_INET6
 
-USE_BUILDLINK2=        YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        YES
 
 MAKE_ENV+=     BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man
 
@@ -24,6 +26,8 @@
 
 CPPFLAGS+=     -Wno-error
 
+INSTALLATION_DIRS=     libexec man/cat8 man/man8
+
 pre-build:
        cd ${WRKSRC}; for file in bozohttpd.8; do                       \
                ${SED}  -e "s|/usr/pkg/|${PREFIX}/|g"                   \



Home | Main Index | Thread Index | Old Index