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 | 07dd3147c68f13b523ce8edfd486a3f4f0d47fe1 (patch) | |
| tree | e65f4ff0343b21db10e01b4ee2a8fa56a72846a8 /mail | |
| parent | cdb276bfa1d6c9954bf0587b81f6152203d30047 (diff) | |
| download | pkgsrc-07dd3147c68f13b523ce8edfd486a3f4f0d47fe1.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 'mail')
| -rw-r--r-- | mail/mini_sendmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/nail/Makefile | 13 | ||||
| -rw-r--r-- | mail/smtpfeed/Makefile | 19 |
3 files changed, 18 insertions, 18 deletions
diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile index c67949b44a3..69d3d4a974e 100644 --- a/mail/mini_sendmail/Makefile +++ b/mail/mini_sendmail/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2006/12/01 10:40:48 martin Exp $ +# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:13 jlam Exp $ # PKGNAME= mini_sendmail-1.3.6 PKGREVISION= 2 -BUILD_DEFS+= USE_INET6 +BUILD_DEFS+= IPV6_READY .include "Makefile.common" diff --git a/mail/nail/Makefile b/mail/nail/Makefile index 3c9ccb805f0..510085591f7 100644 --- a/mail/nail/Makefile +++ b/mail/nail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:41 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2007/09/07 22:12:13 jlam Exp $ DISTNAME= nail-11.25 CATEGORIES= mail @@ -9,15 +9,14 @@ MAINTAINER= cjep@NetBSD.org HOMEPAGE= http://nail.sourceforge.net/ COMMENT= BSD mail utility with MIME extensions -BUILD_DEFS+= USE_INET6 - MAKE_ENV+= "SYSCONFDIR=${PKG_SYSCONFDIR}" -.include "../../mk/bsd.prefs.mk" +PKG_OPTIONS_VAR= PKG_OPTIONS.nail +PKG_SUPPORTED_OPTIONS= inet6 + +.include "../../mk/bsd.options.mk" -# IPv6 support -# -.if ${USE_INET6} == "YES" +.if !empty(PKG_OPTIONS:Minet6) MAKE_ENV+= "IPv6=-DHAVE_IPv6_FUNCS" .endif diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index 2150b87cbd8..933f1075b81 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:44 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2007/09/07 22:12:13 jlam Exp $ DISTNAME= smtpfeed-1.18 PKGREVISION= 1 @@ -16,10 +16,10 @@ COMMENT= SMTP Fast Exploding External Deliverer for Sendmail # require sendmail from pkgsrc. #DEPENDS+= sendmail>=8.9.3:../../mail/sendmail -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec # configure tries to be clever, so force our setting -CONFIGURE_ENV+= my_cv_path_lib_exec=${PREFIX:Q}/libexec +CONFIGURE_ENV+= my_cv_path_lib_exec=${PREFIX:Q}/libexec # use bind8? #CONFIGURE_ARGS+= --with-bind8 @@ -27,16 +27,17 @@ DOCS= COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \ ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \ RELEASE.NOTE SIGNAL SIGNAL.j TODO -BUILD_DEFS+= USE_INET6 +PKG_OPTIONS_VAR= PKG_OPTIONS.smtpfeed +PKG_SUPPORTED_OPTIONS= inet6 -INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed - -.include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.options.mk" -.if defined(USE_INET6) && ${USE_INET6} == YES -CONFIGURE_ARGS+=--enable-ipv6 +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 .endif +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed + post-install: ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/${PKGMANDIR}/man8 for i in ${DOCS}; do \ |