pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Convert to use the features framework.
details: https://anonhg.NetBSD.org/pkgsrc/rev/396d2a79d783
branches: trunk
changeset: 533134:396d2a79d783
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Sep 08 21:57:57 2007 +0000
description:
Convert to use the features framework.
diffstat:
archivers/gtar-base/Makefile | 6 ++----
archivers/pax/Makefile | 5 +++--
devel/bmake/Makefile | 5 +++--
graphics/netpbm/Makefile | 7 ++-----
graphics/xpm/Makefile | 8 ++++----
mail/incm/Makefile | 9 ++-------
net/xtraceroute/Makefile | 4 ++--
news/cg/Makefile | 13 ++-----------
news/leafnode/Makefile | 7 +++----
news/suck/Makefile | 7 ++-----
pkgtools/libnbcompat/inplace.mk | 15 +++++++--------
pkgtools/pax/Makefile | 5 +++--
pkgtools/pbulk/Makefile | 4 ++--
pkgtools/pkg_filecheck/Makefile | 12 +++---------
pkgtools/pkg_filecheck/files/pkg_filecheck.c | 8 +-------
pkgtools/pkg_install/Makefile | 5 +++--
pkgtools/pkgfind/Makefile | 16 +++++-----------
pkgtools/pkgfind/files/pkgfind.c | 2 +-
pkgtools/rcorder/Makefile | 4 ++--
sysutils/mtree/Makefile | 5 +++--
sysutils/news/Makefile | 10 +++-------
textproc/aspell/Makefile | 15 ++++++++-------
textproc/catdoc/Makefile.common | 15 +++------------
textproc/groff/Makefile | 7 ++-----
textproc/libxml2/Makefile | 10 ++--------
textproc/libxml2/buildlink3.mk | 7 ++-----
textproc/nbsed/Makefile | 4 ++--
time/remind/Makefile | 10 ++--------
time/remind/distinfo | 4 ++--
time/remind/patches/patch-ac | 16 ++++++----------
www/mini_httpd/Makefile | 10 +++++-----
www/privoxy/Makefile | 6 ++----
www/sitecopy/Makefile | 7 ++-----
x11/xsnow/Makefile | 6 +++---
34 files changed, 99 insertions(+), 175 deletions(-)
diffs (truncated from 912 to 300 lines):
diff -r 35d45ece3553 -r 396d2a79d783 archivers/gtar-base/Makefile
--- a/archivers/gtar-base/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/archivers/gtar-base/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2007/09/06 21:51:52 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2007/09/08 21:57:57 jlam Exp $
DISTNAME= tar-1.15.1
PKGNAME= gtar-base-1.15.1
@@ -16,6 +16,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_FEATURES= snprintf
USE_TOOLS+= msgfmt
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -65,8 +66,5 @@
${LN} -sf ${DESTDIR}${GTAR_PROGRAM_PREFIX}tar ${DESTDIR}${PREFIX}/bin/"gtar"
.endif
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # vnsprintf()
-.endif
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 archivers/pax/Makefile
--- a/archivers/pax/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/archivers/pax/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/08 21:57:58 jlam Exp $
+
+USE_FEATURES= nbcompat
.include "Makefile.common"
@@ -13,5 +15,4 @@
CONFLICTS+= gtar-base-[0-9]*
.endif
-.include "../../pkgtools/libnbcompat/inplace.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 devel/bmake/Makefile
--- a/devel/bmake/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/devel/bmake/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/09/06 19:23:25 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/08 21:57:58 jlam Exp $
#
DISTNAME= bmake-20051105
@@ -20,6 +20,8 @@
NO_CHECKSUM= yes
NO_MTREE= yes
+USE_FEATURES= nbcompat
+
makesyspath= ${PREFIX}/share/mk
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
@@ -47,5 +49,4 @@
${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/bmake.1 ${PREFIX}/${PKGMANDIR}/man1
-.include "../../pkgtools/libnbcompat/inplace.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/graphics/netpbm/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.155 2007/09/08 21:57:58 jlam Exp $
DISTNAME= netpbm-10.34
PKGREVISION= 1
@@ -15,6 +15,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= bash:run gmake lex perl
+USE_FEATURES= snprintf
INSTALL_TARGET= install-dev install-run
MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
@@ -66,10 +67,6 @@
CPPFLAGS+= -DSGI_IDO_CC
.endif
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf()
-.endif
-
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
diff -r 35d45ece3553 -r 396d2a79d783 graphics/xpm/Makefile
--- a/graphics/xpm/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/graphics/xpm/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2007/09/08 21:57:58 jlam Exp $
DISTNAME= xpm-3.4k
PKGREVISION= 7
@@ -14,6 +14,7 @@
CONFLICTS+= libXpm-[0-9]*
+USE_FEATURES= snprintf
USE_IMAKE= yes
.include "../../mk/bsd.prefs.mk"
@@ -26,13 +27,12 @@
.endif
.if !empty(LOWER_OPSYS:Mirix5*)
-SUBST_CLASSES+= sodots
+SUBST_CLASSES+= sodots
SUBST_STAGE.sodots= post-configure
SUBST_FILES.sodots= lib/Makefile
SUBST_SED.sodots= -e 's,\.so$$(SOXPMLIBREV),.so.$$(SOXPMLIBREV),g'
-. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf()
-IMAKEOPTS+= -DExtraLibraries=-lnbcompat
+IMAKEOPTS+= -DExtraLibraries=${LIBS:Q}
IMAKEOPTS+= -DInstallCmd=${INSTALL:Q}
post-configure:
diff -r 35d45ece3553 -r 396d2a79d783 mail/incm/Makefile
--- a/mail/incm/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/mail/incm/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/08 21:57:58 jlam Exp $
#
DISTNAME= incm-0.5
@@ -11,6 +11,7 @@
CONFLICTS= mew-[0-9]*
+USE_FEATURES= utimes
GNU_CONFIGURE= YES
INSTALLATION_DIRS= bin
@@ -18,10 +19,4 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/incm ${PREFIX}/bin/
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-. include "../../pkgtools/libnbcompat/inplace.mk" # utimes()
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 net/xtraceroute/Makefile
--- a/net/xtraceroute/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/net/xtraceroute/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/08 21:57:58 jlam Exp $
#
DISTNAME= xtraceroute-0.8.14
@@ -15,6 +15,7 @@
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt
+USE_FEATURES= snprintf
CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
# XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE
@@ -27,7 +28,6 @@
.if !empty(LOWER_OPSYS:Mirix5*)
CONFIGURE_ARGS+= --with-traceroute=/usr/etc/traceroute
-. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf()
.endif
post-install:
diff -r 35d45ece3553 -r 396d2a79d783 news/cg/Makefile
--- a/news/cg/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/news/cg/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/08 21:57:58 jlam Exp $
#
DISTNAME= cg-0.4
@@ -11,16 +11,7 @@
GNU_CONFIGURE= YES
USE_TOOLS+= lex
+USE_FEATURES= regcomp
TEST_TARGET= check
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # <regex.h>
-SUBST_CLASSES+= regex_h
-SUBST_STAGE.regex_h= post-patch
-SUBST_FILES.regex_h= checkgroup.c
-SUBST_SED.regex_h= -e "s,<regex\.h>,<nbcompat/regex.h>,"
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 news/leafnode/Makefile
--- a/news/leafnode/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/news/leafnode/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/09/07 22:12:21 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/08 21:57:58 jlam Exp $
DISTNAME= leafnode-1.11.3.rel
PKGNAME= ${DISTNAME:S/.rel//}
@@ -39,6 +39,8 @@
FILES_SUBST+= LEAFNODE_HOME=${LEAFNODE_HOME:Q}
MESSAGE_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
+USE_FEATURES= snprintf vsnprintf
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-spooldir=${LEAFNODE_SPOOL:Q}
CONFIGURE_ARGS+= --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck
@@ -71,8 +73,5 @@
${WRKSRC}/README-daemontools \
${WRKSRC}/README.FIRST ${PREFIX}/share/doc/leafnode
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # {,v}snprintf()
-.endif
.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 news/suck/Makefile
--- a/news/suck/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/news/suck/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/09/06 21:51:53 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/08 21:57:59 jlam Exp $
#
DISTNAME= suck-4.3.2
@@ -13,8 +13,8 @@
COMMENT= Feed a local news server without a dedicated newsfeed
GNU_CONFIGURE= yes
+USE_FEATURES= snprintf
-.include "../../mk/bsd.prefs.mk"
.include "options.mk"
post-patch:
@@ -27,8 +27,5 @@
${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck
${CHMOD} 644 ${PREFIX}/share/examples/suck/*
-.if !empty(LOWER_OPSYS:Mirix5*)
-. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf()
-.endif
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 35d45ece3553 -r 396d2a79d783 pkgtools/libnbcompat/inplace.mk
--- a/pkgtools/libnbcompat/inplace.mk Sat Sep 08 21:57:13 2007 +0000
+++ b/pkgtools/libnbcompat/inplace.mk Sat Sep 08 21:57:57 2007 +0000
@@ -1,20 +1,19 @@
-# $NetBSD: inplace.mk,v 1.4 2007/08/02 07:22:31 tron Exp $
+# $NetBSD: inplace.mk,v 1.5 2007/09/08 21:57:59 jlam Exp $
#
# This Makefile fragment builds a working copy of libnbcompat inside
-# ${WRKDIR} and adds the appropriate paths to CPPFLAGS and LDFLAGS.
-# This can be used in place of libnbcompat/buildlink3.mk where it is
-# included by a bootstrap package Makefile.
+# ${WRKDIR}.
+#
.include "../../mk/bsd.prefs.mk"
LIBNBCOMPAT_FILESDIR= ${.CURDIR}/../../pkgtools/libnbcompat/files
LIBNBCOMPAT_SRCDIR= ${WRKDIR}/libnbcompat
-CPPFLAGS+= -I${LIBNBCOMPAT_SRCDIR}
-LDFLAGS+= -L${LIBNBCOMPAT_SRCDIR}
-LIBS+= -lnbcompat
+CPPFLAGS.nbcompat= -DHAVE_NBCOMPAT_H=1 -I${LIBNBCOMPAT_SRCDIR}
+LDFLAGS.nbcompat= -L${LIBNBCOMPAT_SRCDIR}
+LDADD.nbcompat= -lnbcompat
-do-extract: libnbcompat-extract
+post-extract: libnbcompat-extract
libnbcompat-extract:
${_PKG_SILENT}${_PKG_DEBUG} \
${CP} -R ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_SRCDIR}
diff -r 35d45ece3553 -r 396d2a79d783 pkgtools/pax/Makefile
--- a/pkgtools/pax/Makefile Sat Sep 08 21:57:13 2007 +0000
+++ b/pkgtools/pax/Makefile Sat Sep 08 21:57:57 2007 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2007/07/10 15:19:18 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/08 21:57:59 jlam Exp $
Home |
Main Index |
Thread Index |
Old Index