diff options
34 files changed, 99 insertions, 175 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index a74c454d60e..431b540905d 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -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 @@ CONFLICTS= gcpio-[0-9]* 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 @@ post-install: ${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 --git a/archivers/pax/Makefile b/archivers/pax/Makefile index f1de1b03bb9..2b23c68bc40 100644 --- a/archivers/pax/Makefile +++ b/archivers/pax/Makefile @@ -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+= gcpio-[0-9]* CONFLICTS+= gtar-base-[0-9]* .endif -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index 54bbe93b223..11e902216ce 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -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 @@ WRKSRC= ${WRKDIR}/bmake NO_CHECKSUM= yes NO_MTREE= yes +USE_FEATURES= nbcompat + makesyspath= ${PREFIX}/share/mk INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 @@ -47,5 +49,4 @@ do-install: ${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 --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index fe426a32d85..98c15441171 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -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 @@ MAKE_JOBS_SAFE= no 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 @@ MAKE_ENV+= NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so" 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 --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index e5df2f84f73..cce50b954f4 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews CONFLICTS+= libXpm-[0-9]* +USE_FEATURES= snprintf USE_IMAKE= yes .include "../../mk/bsd.prefs.mk" @@ -26,13 +27,12 @@ post-install: .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 --git a/mail/incm/Makefile b/mail/incm/Makefile index f0015e9e46c..13f51bd6f2d 100644 --- a/mail/incm/Makefile +++ b/mail/incm/Makefile @@ -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 @@ COMMENT= Tool to get mail from mbox file or maildir CONFLICTS= mew-[0-9]* +USE_FEATURES= utimes GNU_CONFIGURE= YES INSTALLATION_DIRS= bin @@ -18,10 +19,4 @@ INSTALLATION_DIRS= bin 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 --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 58e9f9ed639..d27a735f4ff 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -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 @@ COMMENT= Graphical version of traceroute, which traces the route IP packets go 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 @@ CONFIGURE_ARGS+= --with-lib-MesaGL .if !empty(LOWER_OPSYS:Mirix5*) CONFIGURE_ARGS+= --with-traceroute=/usr/etc/traceroute -. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf() .endif post-install: diff --git a/news/cg/Makefile b/news/cg/Makefile index b6bae7a3877..c11506f09b6 100644 --- a/news/cg/Makefile +++ b/news/cg/Makefile @@ -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 @@ COMMENT= Semi-automatic newsgroup binary downloader 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 --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 39f7fb9b031..8f148608e3e 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -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_LOCKDIR=${LEAFNODE_LOCKDIR:Q} 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 @@ post-install: ${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 --git a/news/suck/Makefile b/news/suck/Makefile index b2ececb5f4f..2ae247f0ff8 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -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 @@ HOMEPAGE= http://home.comcast.net/~bobyetman/ 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 @@ post-install: ${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 --git a/pkgtools/libnbcompat/inplace.mk b/pkgtools/libnbcompat/inplace.mk index 7d2e9a5e694..c84e824d042 100644 --- a/pkgtools/libnbcompat/inplace.mk +++ b/pkgtools/libnbcompat/inplace.mk @@ -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 --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile index 6dd1c401347..9562801bee8 100644 --- a/pkgtools/pax/Makefile +++ b/pkgtools/pax/Makefile @@ -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 $ # # This version of pax installs into ${PKG_TOOLS_BIN}. # +USE_FEATURES= nbcompat + .include "../../archivers/pax/Makefile.common" PKGREVISION= 1 @@ -10,5 +12,4 @@ CATEGORIES= pkgtools NO_PKGTOOLS_REQD_CHECK= yes -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 1794014eac3..884b4a0eb86 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/08/16 13:02:05 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2007/09/08 21:57:59 jlam Exp $ DISTNAME= pbulk-0.13 CATEGORIES= pkgtools @@ -15,6 +15,7 @@ WRKSRC= ${WRKDIR}/pbulk EXTRACT_ONLY= # empty NO_CHECKSUM= YES +USE_FEATURES= nbcompat USE_TOOLS+= awk:run bzip2:run digest:run gzip:run ident:run make:run \ mail:run tar:run DEPENDS+= rsync-[0-9]*:../../net/rsync @@ -65,5 +66,4 @@ CPPFLAGS+= -D_GNU_SOURCE .endif .include "../../devel/libevent/buildlink3.mk" -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile index 87a61cf8551..4968c5b22db 100644 --- a/pkgtools/pkg_filecheck/Makefile +++ b/pkgtools/pkg_filecheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/09/08 21:57:59 jlam Exp $ # DISTNAME= pkg_filecheck-0.4 @@ -12,6 +12,7 @@ COMMENT= Check for files not owned by any package WRKSRC= ${WRKDIR} USE_TOOLS+= perl:run +USE_FEATURES= fts_open EXTRACT_ONLY= # empty NO_CHECKSUM= yes @@ -24,8 +25,6 @@ CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 -.include "../../mk/bdb.buildlink3.mk" - SUBST_CLASSES+= paths SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf SUBST_FILES.paths+= pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1 @@ -57,11 +56,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pkg_filecheck.conf \ ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} != "NetBSD" -CPPFLAGS+= -DUSE_LIBNBCOMPAT -. include "../../pkgtools/libnbcompat/inplace.mk" -.endif +.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_filecheck/files/pkg_filecheck.c b/pkgtools/pkg_filecheck/files/pkg_filecheck.c index 6932e45008a..149dc4f053b 100644 --- a/pkgtools/pkg_filecheck/files/pkg_filecheck.c +++ b/pkgtools/pkg_filecheck/files/pkg_filecheck.c @@ -1,5 +1,5 @@ /* - $NetBSD: pkg_filecheck.c,v 1.5 2007/02/16 22:57:09 tonio Exp $ + $NetBSD: pkg_filecheck.c,v 1.6 2007/09/08 21:57:59 jlam Exp $ pkg_filecheck.c -- check for files not owned by any package Copyright (C) 2001 Dieter Baron @@ -30,18 +30,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(USE_LIBNBCOMPAT) -#include <nbcompat.h> -#endif - #include <sys/types.h> #include <sys/stat.h> #include <db_185.h> #include <errno.h> #include <fcntl.h> -#if !defined(USE_LIBNBCOMPAT) || defined(HAVE_FTS_H) #include <fts.h> -#endif #include <limits.h> #include <stdio.h> #include <stdlib.h> diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 1d269a57c57..8b440525347 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.141 2007/08/29 15:42:39 jlam Exp $ +# $NetBSD: Makefile,v 1.142 2007/09/08 21:57:59 jlam Exp $ # Notes to package maintainers: # @@ -31,6 +31,8 @@ USE_TOOLS+= pax:run tar:run gzcat:run USE_TOOLS+= chmod cmp cp env find grep ln mkdir rm rmdir \ sed sort touch +USE_FEATURES= nbcompat + SKIP_AUDIT_PACKAGES= yes NO_PKGTOOLS_REQD_CHECK= yes NO_CHECKSUM= yes @@ -148,5 +150,4 @@ update: ${MAKE} ${UPDATE_TARGET} ${MAKE} clean -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile index 125d6b8efaf..654205e41d8 100644 --- a/pkgtools/pkgfind/Makefile +++ b/pkgtools/pkgfind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2007/09/08 21:57:59 jlam Exp $ DISTNAME= pkgfind-20050804 CATEGORIES= pkgtools @@ -13,13 +13,16 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CONFIGURE= yes NO_CHECKSUM= yes +USE_FEATURES= err getprogname setprogname snprintf warn + INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} do-build: - ${LINK.c} -o ${WRKSRC}/pkgfind ${WRKSRC}/pkgfind.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKSRC}/pkgfind \ + ${WRKSRC}/pkgfind.c ${LIBS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pkgfind ${PREFIX}/bin/pkgfind @@ -31,13 +34,4 @@ SUBST_FILES.path= pkgfind.c pkgfind.1 SUBST_SED.path= -e "s,/usr/pkgsrc,${PKGSRCDIR},g" SUBST_MESSAGE.path= Adjusting pkgsrc directory. -.include "../../mk/bsd.prefs.mk" - -# need err(1), warn(1), set/getprogname(1) -.if ${OPSYS} != "NetBSD" && ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly" -CFLAGS+= -DNEED_LIBNBCOMPAT -LDFLAGS+= -lnbcompat -. include "../../pkgtools/libnbcompat/inplace.mk" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkgfind/files/pkgfind.c b/pkgtools/pkgfind/files/pkgfind.c index 0704594f39c..8fa0e92c43e 100644 --- a/pkgtools/pkgfind/files/pkgfind.c +++ b/pkgtools/pkgfind/files/pkgfind.c @@ -38,7 +38,7 @@ #include <sys/param.h> #include <sys/stat.h> -#ifdef NEED_LIBNBCOMPAT +#if HAVE_NBCOMPAT_H #include <nbcompat.h> #else #include <err.h> diff --git a/pkgtools/rcorder/Makefile b/pkgtools/rcorder/Makefile index 0203a8c6524..2d698de36d3 100644 --- a/pkgtools/rcorder/Makefile +++ b/pkgtools/rcorder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/09/06 21:29:26 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/09/08 21:58:00 jlam Exp $ # DISTNAME= rcorder-20031013 @@ -12,9 +12,9 @@ COMMENT= Print a dependency ordering of interdependent files NO_CHECKSUM= yes GNU_CONFIGURE= yes +USE_FEATURES= nbcompat do-extract: ${CP} -R ${FILESDIR} ${WRKSRC} -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mtree/Makefile b/sysutils/mtree/Makefile index 15988c5b04a..9076e6a080b 100644 --- a/sysutils/mtree/Makefile +++ b/sysutils/mtree/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2007/09/08 21:58:00 jlam Exp $ + +USE_FEATURES= nbcompat .include "../../pkgtools/mtree/Makefile.common" CATEGORIES= sysutils -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/news/Makefile b/sysutils/news/Makefile index 32b9ce0d566..f1162af81fb 100644 --- a/sysutils/news/Makefile +++ b/sysutils/news/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/09/08 21:58:00 jlam Exp $ # DISTNAME= news-0.2 @@ -9,16 +9,12 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://www.netmeister.org/ COMMENT= System V news(1) +USE_FEATURES= utimes + INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/news ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/news.1 ${PREFIX}/${PKGMANDIR}/man1/ -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Interix" -. include "../../pkgtools/libnbcompat/inplace.mk" # utimes() -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index c710bdeea22..96117cd053f 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2007/09/08 21:58:00 jlam Exp $ # DISTNAME= aspell-0.60.5 @@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS= libpspell-[0-9]* GNU_CONFIGURE= yes +USE_FEATURES= snprintf vsnprintf USE_TOOLS+= gmake # for bin/aspell-import USE_TOOLS+= perl:run @@ -30,6 +31,12 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes .include "../../mk/bsd.prefs.mk" +.if !empty(LOWER_OPSYS:Mirix5*) +CPPFLAGS+= -DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF +# IRIX 5 has an older implementation of signal() +CPPFLAGS+= -DHAVE_OLD_SIGNAL +.endif + # Loadable filter currently don't work on NetBSD, see # https://sourceforge.net/tracker/?func=detail&atid=100245&aid=1336865&group_id=245 # Disable dynamic loading of filters until it is fixed. @@ -53,12 +60,6 @@ NOT_FOR_COMPILER= xlc LIBS.SunOS+= -lm -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # {,v}snprintf() -CPPFLAGS+= -DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF -# IRIX 5 has an older implementation of signal() -CPPFLAGS+= -DHAVE_OLD_SIGNAL -.endif .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common index 93c9945af6c..f139bf33067 100644 --- a/textproc/catdoc/Makefile.common +++ b/textproc/catdoc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile.common,v 1.11 2007/09/08 21:58:00 jlam Exp $ # DISTNAME= catdoc-0.94.2 @@ -12,18 +12,9 @@ COMMENT= Converts MS Word, Excel and Powerpoint files to plain text DISTINFO_FILE= ${.CURDIR}/../../textproc/catdoc/distinfo PATCHDIR= ${.CURDIR}/../../textproc/catdoc/patches -GNU_CONFIGURE= yes +USE_FEATURES= glob nbcompat +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/share CPPFLAGS+= -Dunix -D__unix - -.include "../../mk/bsd.prefs.mk" - -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # <glob.h> -SUBST_CLASSES+= glob_h -SUBST_STAGE.glob_h= post-patch -SUBST_FILES.glob_h= src/fileutil.c -SUBST_SED.glob_h= -e "s,<glob\.h>,<nbcompat/glob.h>," -.endif diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index 96e903ded7e..0dfcc2823ed 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2007/09/08 21:58:00 jlam Exp $ # DISTNAME= groff-1.19.2 @@ -16,6 +16,7 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= YES CONFIGURE_ENV+= PERLPATH=${PERL5:Q} USE_TOOLS+= perl:run sed:run awk:run +USE_FEATURES= getopt_long INFO_FILES= YES @@ -49,10 +50,6 @@ PLIST_SUBST+= GNU_PREFIX_AN_TMAC="g" PLIST_SUBST+= GNU_PREFIX_AN_TMAC="" .endif -.if ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" -. include "../../pkgtools/libnbcompat/inplace.mk" # getopt_long() -.endif - BUILD_DEFS+= PAPERSIZE .if defined(PAPERSIZE) CONFIGURE_ENV+= PAGE=${PAPERSIZE:Q} diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 9c959a6d58d..09562e7161b 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.89 2007/09/08 21:58:00 jlam Exp $ DISTNAME= libxml2-2.6.30 CATEGORIES= textproc @@ -13,6 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake +USE_FEATURES= glob USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= libxml-2.0.pc.in @@ -44,13 +45,6 @@ SUBST_FILES.cat= catalog.c xmlcatalog.c SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g" SUBST_SED.cat+= -e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g" -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # <glob.h> -SUBST_CLASSES+= glob_h -SUBST_STAGE.glob_h= post-patch -SUBST_FILES.glob_h= runtest.c -SUBST_SED.glob_h= -e "s,<glob\.h>,<nbcompat/glob.h>," -.endif .include "../../devel/zlib/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../textproc/xmlcatmgr/catalogs.mk" diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk index 9b50ca64384..47d63bc7c10 100644 --- a/textproc/libxml2/buildlink3.mk +++ b/textproc/libxml2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/09/06 21:51:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2007/09/08 21:58:01 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+ @@ -19,11 +19,8 @@ BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2 BUILDLINK_FILES.libxml2+= bin/xml2-config .endif # LIBXML2_BUILDLINK3_MK -.include "../../mk/bsd.fast.prefs.mk" +USE_FEATURES+= glob -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # glob() -.endif .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/textproc/nbsed/Makefile b/textproc/nbsed/Makefile index 3785a7fb7bb..78a40767420 100644 --- a/textproc/nbsed/Makefile +++ b/textproc/nbsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/09/06 21:29:26 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2007/09/08 21:58:01 jlam Exp $ DISTNAME= nbsed-20040821 PKGREVISION= 1 @@ -12,11 +12,11 @@ COMMENT= NetBSD-current's sed(1) NO_CHECKSUM= yes NO_MTREE= yes +USE_FEATURES= nbcompat GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-transform-name="s,sed,nbsed," do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} -.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/remind/Makefile b/time/remind/Makefile index 43322a1a6ce..5b1249c1952 100644 --- a/time/remind/Makefile +++ b/time/remind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/09/06 21:51:55 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/09/08 21:58:01 jlam Exp $ # DISTNAME= remind-03.00.24 @@ -12,6 +12,7 @@ COMMENT= Calendar/alarm program with interpreted input language GNU_CONFIGURE= yes USE_TOOLS+= perl:run +USE_FEATURES= glob REPLACE_PERL= www/rem2html @@ -47,11 +48,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/www/rem2html \ ${PREFIX}/bin/rem2html -.include "../../mk/bsd.prefs.mk" - -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # <glob.h> -CPPFLAGS+= -DNBCOMPAT_GLOB_H -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/time/remind/distinfo b/time/remind/distinfo index 601b146164a..49abc514686 100644 --- a/time/remind/distinfo +++ b/time/remind/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2006/10/01 08:26:56 schwarz Exp $ +$NetBSD: distinfo,v 1.7 2007/09/08 21:58:01 jlam Exp $ SHA1 (remind-03.00.24.tar.gz) = 7fc8823e4e574fd7630b2ff3e2f5d014003fd26b RMD160 (remind-03.00.24.tar.gz) = 2f84a240dd28b68e352c6f8d13ed241a2626f0d6 Size (remind-03.00.24.tar.gz) = 303964 bytes SHA1 (patch-ab) = c14e78560d091c417a719a1d699b580a84f934e7 -SHA1 (patch-ac) = fa0f512ee5ca4f2167c7fc9c4f25df025c79d63f +SHA1 (patch-ac) = 6a45874750d090d91c0a2a033bdb007ae7287488 SHA1 (patch-ad) = 56feacc6f9af5c59197900fe4591e7d54ff9372c SHA1 (patch-ae) = 4e90c971a519d9ac46992fe5e5ab70300c352262 diff --git a/time/remind/patches/patch-ac b/time/remind/patches/patch-ac index 999e1ebb474..3057ba84aa8 100644 --- a/time/remind/patches/patch-ac +++ b/time/remind/patches/patch-ac @@ -1,20 +1,16 @@ -$NetBSD: patch-ac,v 1.4 2006/10/01 08:26:56 schwarz Exp $ +$NetBSD: patch-ac,v 1.5 2007/09/08 21:58:01 jlam Exp $ ---- src/files.c.orig 2005-09-30 05:29:32.000000000 +0200 -+++ src/files.c 2006-09-17 19:33:26.000000000 +0200 -@@ -19,6 +19,11 @@ +--- src/files.c.orig 2005-09-29 23:29:32.000000000 -0400 ++++ src/files.c +@@ -19,6 +19,7 @@ static char const RCSID[] = "$Id: files. #include <string.h> #include <ctype.h> -+#ifdef NBCOMPAT_GLOB_H -+# include <nbcompat/glob.h> -+#else -+# include <glob.h> -+#endif ++#include <glob.h> #include <sys/stat.h> #ifdef TM_IN_SYS_TIME -@@ -365,16 +370,27 @@ +@@ -365,16 +366,27 @@ int DoInclude(ParsePtr p) { DynamicBuffer buf; int r, e; diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile index c21dd9c1a05..ed1e6cc4ac1 100644 --- a/www/mini_httpd/Makefile +++ b/www/mini_httpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/09/06 21:51:55 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/09/08 21:58:02 jlam Exp $ DISTNAME= mini_httpd-1.19 PKGREVISION= 3 @@ -11,6 +11,8 @@ COMMENT= Small, forking webserver with IPv6 and SSL support DIST_SUBDIR= ${PKGNAME_NOREV} +USE_FEATURES= snprintf + MAKE_ENV+= PKG_CFLAGS=${CFLAGS:M*:Q} .include "../../mk/bsd.prefs.mk" @@ -21,6 +23,8 @@ LDFLAGS+= -lssl -lcrypto -lcrypt LDFLAGS+= -lutil .endif +MAKE_ENV+= LDLIBS=${LIBS:Q} + INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin do-install: @@ -35,9 +39,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/mini_httpd.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_MAN} ${WRKSRC}/htpasswd.1 ${PREFIX}/${PKGMANDIR}/man1/mhtpasswd.1 -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf() -MAKE_ENV+= LDLIBS=${LIBS:Q} -.endif .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 50b1eb2e355..3e47f3bf254 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/09/06 21:51:55 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2007/09/08 21:58:02 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -29,6 +29,7 @@ CPPFLAGS+= -Dunix WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable +USE_FEATURES= snprintf USE_TOOLS+= autoconf213 gmake mktemp MAKE_FILE= GNUmakefile @@ -66,9 +67,6 @@ post-install: ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${EGDIR} ${CHMOD} -R a+r ${EGDIR} -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf() -.endif .include "../../devel/pcre/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 9c49b68c6b1..b5efb136fb3 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/09/06 21:51:55 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2007/09/08 21:58:02 jlam Exp $ DISTNAME= sitecopy-0.16.2 CATEGORIES= www @@ -8,6 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.lyra.org/sitecopy/ COMMENT= Utility for synchronizing remote and local web sites +USE_FEATURES= getopt_long USE_TOOLS+= gmake msgfmt USE_PKGLOCALEDIR= yes @@ -26,10 +27,6 @@ pre-build: ${RM} -f ${WRKSRC:Q}/fnmatch.h ${LN} -sf ${WRKSRC:Q}/lib/fnmatch.h ${WRKSRC:Q}/fnmatch.h -.if !exists(/usr/include/getopt.h) -. include "../../pkgtools/libnbcompat/inplace.mk" -.endif - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile index e37cc0e6bb6..9f265b54040 100644 --- a/x11/xsnow/Makefile +++ b/x11/xsnow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/09/06 21:51:55 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/09/08 21:58:02 jlam Exp $ DISTNAME= xsnow-1.42 PKGREVISION= 2 @@ -9,12 +9,12 @@ MAINTAINER= is@NetBSD.org HOMEPAGE= http://www.euronet.nl/~rja/Xsnow/ COMMENT= Create a snowy and Santa-y desktop +USE_FEATURES= snprintf USE_IMAKE= yes .include "../../mk/bsd.prefs.mk" -.if !empty(LOWER_OPSYS:Mirix5*) -. include "../../pkgtools/libnbcompat/inplace.mk" # snprintf() +.if !empty(MISSING_FEATURES:Msnprintf) IMAKEOPTS+= -DExtraLibraries=${LIBS:Q} .endif |