diff options
| author | jlam <jlam@pkgsrc.org> | 2007-09-07 22:12:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-09-07 22:12:10 +0000 |
| commit | a6528057d95199e0923e568235a5e7e885938dc1 (patch) | |
| tree | e65f4ff0343b21db10e01b4ee2a8fa56a72846a8 /www/bozohttpd | |
| parent | bff458328b6e6f475335adef9ba607a77d0b2c9e (diff) | |
| download | pkgsrc-a6528057d95199e0923e568235a5e7e885938dc1.tar.gz | |
Convert packages that test and use USE_INET6 to use the options framework
and to support the "inet6" option instead.
Remaining usage of USE_INET6 was solely for the benefit of the scripts
that generate the README.html files. Replace:
BUILD_DEFS+= USE_INET6
with
BUILD_DEFS+= IPV6_READY
and teach the README-generation tools to look for that instead.
This nukes USE_INET6 from pkgsrc proper. We leave a tiny bit of code
to continue to support USE_INET6 for pkgsrc-wip until it has been nuked
from there as well.
Diffstat (limited to 'www/bozohttpd')
| -rw-r--r-- | www/bozohttpd/Makefile | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index a3be0305729..9554f0d4bbb 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2007/05/24 14:00:38 jlam Exp $ +# $NetBSD: Makefile,v 1.58 2007/09/07 22:12:24 jlam Exp $ # DISTNAME= bozohttpd-20060517 @@ -10,23 +10,13 @@ MAINTAINER= mrg@eterna.com.au HOMEPAGE= http://www.eterna.com.au/bozohttpd/ COMMENT= Bozotic HTTP server; small and secure -BUILD_DEFS+= USE_INET6 - PKG_INSTALLATION_TYPES= overwrite pkgviews MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE} PKG_OPTIONS_VAR= PKG_OPTIONS.bozohttpd -PKG_SUPPORTED_OPTIONS= bozohttpd-do-htpasswd - -.include "../../mk/bsd.prefs.mk" - -.if defined(USE_INET6) && ${USE_INET6} == "YES" -CPPFLAGS+= -DINET6 -.endif -CPPFLAGS+= -Wno-error -MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR} +PKG_SUPPORTED_OPTIONS= bozohttpd-do-htpasswd inet6 .include "../../mk/bsd.options.mk" @@ -34,6 +24,13 @@ MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR} CPPFLAGS+= -DDO_HTPASSWD .endif +.if !empty(PKG_OPTIONS:Minet6) +CPPFLAGS+= -DINET6 +.endif + +CPPFLAGS+= -Wno-error +MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR} + INSTALLATION_DIRS= libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 .include "../../security/openssl/buildlink3.mk" |