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/290c63a95f5e
branches: trunk
changeset: 465737:290c63a95f5e
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jan 05 11:53:39 2004 +0000
description:
bl3ify
diffstat:
comms/conserver/Makefile | 8 +++++---
graphics/freetype2/Makefile | 8 +++++---
graphics/xpm/Makefile | 25 ++++++-------------------
lang/nawk/Makefile | 9 +++++++--
mail/metamail/Makefile | 10 +++++++---
mail/procmail/Makefile | 8 +++++---
misc/screen/Makefile | 6 ++++--
security/tcp_wrappers/Makefile | 8 +++++---
8 files changed, 44 insertions(+), 38 deletions(-)
diffs (228 lines):
diff -r 03ecbfc42997 -r 290c63a95f5e comms/conserver/Makefile
--- a/comms/conserver/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/comms/conserver/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:26:35 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 12:05:54 jlam Exp $
#
DISTNAME= conserver-7.2.7
@@ -9,7 +9,9 @@
HOMEPAGE= http://www.conserver.com/
COMMENT= Application that allows multiple users to watch serial consoles
-USE_BUILDLINK2= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
@@ -35,5 +37,5 @@
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
-.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 03ecbfc42997 -r 290c63a95f5e graphics/freetype2/Makefile
--- a/graphics/freetype2/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/graphics/freetype2/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/12/19 13:45:59 adam Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/05 11:54:07 jlam Exp $
#
DISTNAME= freetype-2.1.5
@@ -17,7 +17,9 @@
HOMEPAGE= http://www.freetype.org/
COMMENT= Font rendering engine and library API
-USE_BUILDLINK2= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
CONFIGURE_DIRS= ${WRKSRC}/builds/unix
@@ -36,5 +38,5 @@
${MKDIR} ${WRKSRC}/.libs
.endif
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 03ecbfc42997 -r 290c63a95f5e graphics/xpm/Makefile
--- a/graphics/xpm/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/graphics/xpm/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/08/11 13:28:08 seb Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/05 11:53:39 jlam Exp $
DISTNAME= xpm-3.4k
PKGREVISION= 1
@@ -10,28 +10,15 @@
HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html
COMMENT= The X Pixmap library
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= # defined
USE_IMAKE= # defined
-.include "../../mk/bsd.prefs.mk"
+BUILDLINK_CHECK_BUILTIN.xpm= YES
-# Check if we got Xpm distributed with XFree86 4.x or Solaris 9.
-.if ${OPSYS} != "SunOS"
-. if exists(${X11BASE}/include/X11/xpm.h) && \
- exists(${X11BASE}/lib/X11/config/X11.tmpl)
-_IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
-. if ${OPSYS} == "IRIX"
-_IS_BUILTIN_XPM= 1
-. endif
-. else
-_IS_BUILTIN_XPM= 0
-. endif
-.else
-_IS_BUILTIN_XPM!= (/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE}
-.endif
+.include "buildlink3.mk"
-.if ${_IS_BUILTIN_XPM} != "0"
-PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
+.if ${BUILDLINK_IS_BUILTIN.xpm} == "YES"
+#PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
.endif
.if (${OPSYS} == SunOS)
diff -r 03ecbfc42997 -r 290c63a95f5e lang/nawk/Makefile
--- a/lang/nawk/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/lang/nawk/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/06 13:59:18 cjep Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/05 11:56:49 jlam Exp $
#
DISTNAME= awk
@@ -13,10 +13,15 @@
DIST_SUBDIR= ${PKGNAME}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
MAKEFILE= makefile
-MAKEFLAGS+= CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+= CC=${BUILDLINK_CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
ALL_TARGET= a.out
+INSTALLATION_DIRS= bin man/man1
+
post-build:
${SED} -e 's|awk|nawk|g' -e 's/Awk/Nawk/g' \
${WRKSRC}/awk.1 > ${WRKSRC}/nawk.1
diff -r 03ecbfc42997 -r 290c63a95f5e mail/metamail/Makefile
--- a/mail/metamail/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/mail/metamail/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/10/19 21:05:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/05 12:00:10 jlam Exp $
DISTNAME= mm2.7
PKGNAME= metamail-2.7
@@ -13,7 +13,9 @@
CONFLICTS+= elm>=2.5.5 mm-2.7
-USE_BUILDLINK2= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
USE_X11= YES
@@ -23,10 +25,12 @@
EGDIR= ${PREFIX}/share/examples/metamail
CONF_FILES= ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
+INSTALLATION_DIRS= bin man/man1 man/man4
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-CFLAGS+= -DSYSV
+CFLAGS+= -DSYSV
.endif
post-patch:
diff -r 03ecbfc42997 -r 290c63a95f5e mail/procmail/Makefile
--- a/mail/procmail/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/mail/procmail/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/11/03 22:43:38 kim Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/05 12:01:14 jlam Exp $
#
DISTNAME= procmail-3.22
@@ -9,7 +9,9 @@
HOMEPAGE= http://www.procmail.org/
COMMENT= Local mail delivery agent
-USE_BUILDLINK2= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= YES
MAKE_ENV+= SHELL=${SH} CHMOD=${CHMOD}
INSTALL_TARGET= install-suid install.man
@@ -29,7 +31,7 @@
>> ${WRKSRC}/config.h
${ECHO} "#define ETCRCS \"${PKG_SYSCONFDIR}/procmailrcs/\"" \
>> ${WRKSRC}/config.h
-.ifdef(PROCMAIL_MAILSPOOLHOME)
+.if defined(PROCMAIL_MAILSPOOLHOME)
${ECHO} "#define MAILSPOOLHOME \"/${PROCMAIL_MAILSPOOLHOME}\"" \
>> ${WRKSRC}/src/authenticate.h
.endif
diff -r 03ecbfc42997 -r 290c63a95f5e misc/screen/Makefile
--- a/misc/screen/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/misc/screen/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/12/01 15:18:27 ben Exp $
+# $NetBSD: Makefile,v 1.51 2004/01/05 12:10:01 jlam Exp $
DISTNAME= screen-4.0.1
PKGREVISION= 2
@@ -10,7 +10,9 @@
HOMEPAGE= http://www.gnu.org/software/screen/screen.html
COMMENT= Multi-screen window manager
-USE_BUILDLINK2= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
INFO_FILES= screen.info
PLIST_SUBST= DISTNAME=${DISTNAME}
diff -r 03ecbfc42997 -r 290c63a95f5e security/tcp_wrappers/Makefile
--- a/security/tcp_wrappers/Makefile Mon Jan 05 11:42:20 2004 +0000
+++ b/security/tcp_wrappers/Makefile Mon Jan 05 11:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:53:19 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/05 12:04:20 jlam Exp $
DISTNAME= tcp_wrappers_7.6-ipv6.1
PKGNAME= tcp_wrappers-7.6.1
@@ -12,8 +12,10 @@
ONLY_FOR_PLATFORM= IRIX-*-* Darwin-*-* SunOS-*-* Linux-*-* # in NetBSD base system
-USE_BUILDLINK2= # defined
-USE_LIBTOOL= # defined
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
.include "../../mk/bsd.prefs.mk"
Home |
Main Index |
Thread Index |
Old Index