summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/libmm/Makefile6
-rw-r--r--devel/ncurses/Makefile6
-rw-r--r--sysutils/cdrecord/Makefile15
-rw-r--r--sysutils/etcupdate/Makefile7
-rw-r--r--sysutils/lsof/Makefile6
-rw-r--r--sysutils/psmisc/Makefile8
-rw-r--r--sysutils/xosview/Makefile10
-rw-r--r--wm/pwm/Makefile6
-rw-r--r--www/bozohttpd/Makefile8
9 files changed, 48 insertions, 24 deletions
diff --git a/devel/libmm/Makefile b/devel/libmm/Makefile
index 6f000968485..ae64f963eab 100644
--- a/devel/libmm/Makefile
+++ b/devel/libmm/Makefile
@@ -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 @@ MAINTAINER= cjones@NetBSD.org
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 --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 543696d99a9..ee9f2062418 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -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 @@ MAINTAINER= jlam@NetBSD.org
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 --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 152c2552419..c123a881a55 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -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 @@ COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs
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 @@ MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF}
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 @@ do-install:
${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 --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile
index 70c643efb48..f4e23da078c 100644
--- a/sysutils/etcupdate/Makefile
+++ b/sysutils/etcupdate/Makefile
@@ -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 @@ COMMENT= Script to update the configuration and startup files in /etc
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 --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index afd777cae5f..b41bf6d3649 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -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 @@ OSVERSION_SPECIFIC= yes
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 @@ REAL_GROUP= -g kmem
.elif ${OPSYS} == "SunOS"
MAKE_ENV+= CPPFLAGS=
.endif
+INSTALLATION_DIRS= man/man8 sbin
LSOF_MORE_SECURE?= 0
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 40e90bca5ff..e1d16e13560 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -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 @@ COMMENT= Miscellaneous procfs tools: killall, pidof, and pstree
CONFLICTS+= pstree<=2.16
-USE_BUILDLINK2= # defined
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= # defined
GNU_CONFIGURE= # defined
LIBS+= ${LIBGETOPT}
@@ -20,5 +22,5 @@ post-install:
${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 --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index df9ca6a9646..e3782104322 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -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 @@ MAINTAINER= bgrayson@NetBSD.org
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+= --prefix=${PREFIX}
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 @@ CPPFLAGS+= -I${X11BASE}/include
LIBS+= -lsocket -lnsl
.endif
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 863697f7335..7890b4d85f4 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -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 @@ MAINTAINER= salo@NetBSD.org
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 --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 5a5b83b6415..789a6d3631d 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -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 @@ COMMENT= Bozotic HTTP server; small and secure
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+= -DINET6
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" \