From 2761568ac280270d3e97f7e38922103a7a4ff840 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 8 Sep 2007 21:57:57 +0000 Subject: Convert to use the features framework. --- www/mini_httpd/Makefile | 10 +++++----- www/privoxy/Makefile | 6 ++---- www/sitecopy/Makefile | 7 ++----- 3 files changed, 9 insertions(+), 14 deletions(-) (limited to 'www') 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" -- cgit v1.2.3