pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Convert packages that test and use USE_INET6 to use th...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c5b4e773940
branches:  trunk
changeset: 533071:3c5b4e773940
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Sep 07 22:12:10 2007 +0000

description:
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:

 audio/tremor-tools/Makefile       |   5 ++---
 audio/vorbis-tools/Makefile       |   5 ++---
 chat/cgiirc/Makefile              |  11 ++++++-----
 chat/eggdrop/Makefile             |  12 +++++++-----
 chat/ircII/Makefile               |   7 +++----
 chat/sirc/Makefile                |   6 +++---
 games/gtetrinet/Makefile          |  11 ++++++-----
 games/quake6/Makefile             |  10 +++-------
 games/quakeforge/Makefile         |  12 ++++++++----
 inputmethod/canna/Makefile.common |  12 +-----------
 inputmethod/skkfep/Makefile       |   4 ++--
 inputmethod/skkinput/Makefile     |   4 ++--
 inputmethod/skkserv/Makefile      |   4 ++--
 lang/php5/Makefile.php            |   4 +---
 mail/mini_sendmail/Makefile       |   4 ++--
 mail/nail/Makefile                |  13 ++++++-------
 mail/smtpfeed/Makefile            |  21 +++++++++++----------
 mbone/sdr/Makefile                |  19 +++++++++++--------
 mk/bsd.prefs.mk                   |  19 +++++++++----------
 mk/defaults/mk.conf               |  18 +-----------------
 mk/misc/toplevel.mk               |   4 ++--
 mk/scripts/mkreadme               |   4 ++--
 net/bind9/Makefile                |  13 ++++++-------
 net/cftp/Makefile                 |   4 ++--
 net/hf6to4/Makefile               |   8 ++++++--
 net/ipv6calc/Makefile             |   6 ++++--
 net/irrd/Makefile                 |  28 +++++++++++++---------------
 net/libdnet/Makefile              |   4 ++--
 net/mDNSResponder/Makefile        |  10 +++++++---
 net/nsd/Makefile                  |  12 ++++++++----
 net/oidentd/Makefile              |  12 ++++++++----
 net/p5-Socket6/Makefile           |   6 +++---
 net/pchar/Makefile                |  12 ++++++------
 net/ripe-whois/Makefile           |   4 ++--
 net/trafshow/Makefile             |   9 +++++----
 net/vnc/Makefile                  |   4 ++--
 news/inn/Makefile                 |   8 ++------
 news/inn/options.mk               |  15 +++++++++++----
 news/knews/Makefile               |  11 ++++++++---
 news/leafnode/Makefile            |  10 ++++++----
 security/openssh+gssapi/Makefile  |   4 ++--
 security/openssh/Makefile         |   4 ++--
 security/putty/Makefile           |   9 ++++++---
 security/ssh2/Makefile            |   4 ++--
 security/tcp_wrappers/Makefile    |   9 +++++----
 sysutils/cfengine2/Makefile       |   4 ++--
 sysutils/free/Makefile            |   7 ++++---
 sysutils/socket/Makefile          |  16 +++++++++-------
 www/apache2/Makefile              |   4 ++--
 www/apache22/Makefile             |   4 ++--
 www/bozohttpd/Makefile            |  21 +++++++++------------
 www/curl/Makefile                 |   4 ++--
 www/lhs/Makefile                  |   4 ++--
 www/php4/Makefile.php             |   4 +---
 www/thttpd/Makefile               |   6 +++---
 www/thy/Makefile                  |   6 ++----
 56 files changed, 248 insertions(+), 247 deletions(-)

diffs (truncated from 1424 to 300 lines):

diff -r 133fa1d7eb37 -r 3c5b4e773940 audio/tremor-tools/Makefile
--- a/audio/tremor-tools/Makefile       Fri Sep 07 22:07:31 2007 +0000
+++ b/audio/tremor-tools/Makefile       Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=      vorbis-tools-1.0
 PKGNAME=       tremor-tools-1.0.0.8
@@ -10,8 +10,7 @@
 HOMEPAGE=      http://www.vorbis.com/
 COMMENT=       Ogg Vorbis encoder and player
 
-# list it into IPv6-ready packages
-BUILD_DEFS+=   USE_INET6
+BUILD_DEFS+=   IPV6_READY
 
 CONFLICTS=     vorbis-[0-9]*
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 audio/vorbis-tools/Makefile
--- a/audio/vorbis-tools/Makefile       Fri Sep 07 22:07:31 2007 +0000
+++ b/audio/vorbis-tools/Makefile       Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2007/06/08 17:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=      vorbis-tools-1.1.1
 PKGREVISION=   5
@@ -11,8 +11,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-# list it into IPv6-ready packages
-BUILD_DEFS+=   USE_INET6
+BUILD_DEFS+=   IPV6_READY
 
 CONFLICTS=     vorbis-[0-9]*
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 chat/cgiirc/Makefile
--- a/chat/cgiirc/Makefile      Fri Sep 07 22:07:31 2007 +0000
+++ b/chat/cgiirc/Makefile      Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/30 10:06:36 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=      cgiirc-0.5.9
 PKGREVISION=   1
@@ -12,16 +12,17 @@
 USE_TOOLS+=    perl:run
 NO_BUILD=      YES
 
-BUILD_DEFS+=   USE_INET6
-
 CONF_FILES=    ${PREFIX}/share/examples/cgiirc/cgiirc.conf \
                        ${PKG_SYSCONFDIR}/cgiirc.conf
 CONF_FILES+=   ${PREFIX}/share/examples/cgiirc/cgiirc.config \
                        ${CGIIRC}/cgiirc.config
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=       PKG_OPTIONS.cgiirc
+PKG_SUPPORTED_OPTIONS= inet6
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 DEPENDS+=      p5-INET6-[0-9]*:../../net/p5-INET6
 .endif
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 chat/eggdrop/Makefile
--- a/chat/eggdrop/Makefile     Fri Sep 07 22:07:31 2007 +0000
+++ b/chat/eggdrop/Makefile     Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/05/22 16:47:04 lkundrak Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/07 22:12:10 jlam Exp $
 
 DISTNAME=      eggdrop1.6.17
 PKGNAME=       eggdrop-1.6.17
@@ -12,13 +12,15 @@
 COMMENT=       IRC robot with TCL scripting and multi-channel ability
 
 GNU_CONFIGURE=         yes
-BUILD_DEFS+=           USE_INET6
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=                TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=       PKG_OPTIONS.eggdrop
+PKG_SUPPORTED_OPTIONS= inet6
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 PLIST_SUBST+=          NOIPV6="@comment "
 .else
@@ -82,7 +84,7 @@
                compress.so console.so ctcp.so filesys.so irc.so notes.so \
                seen.so server.so share.so transfer.so uptime.so wire.so \
                ${PREFIX}/lib/eggdrop
-.if !defined(USE_INET6) || empty(USE_INET6:M[Yy][Ee][Ss])
+.if empty(PKG_OPTIONS:Minet6)
        cd ${WRKSRC} && ${INSTALL_DATA} dns.so ${PREFIX}/lib/eggdrop
 .endif
        cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
diff -r 133fa1d7eb37 -r 3c5b4e773940 chat/ircII/Makefile
--- a/chat/ircII/Makefile       Fri Sep 07 22:07:31 2007 +0000
+++ b/chat/ircII/Makefile       Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2007/06/26 09:03:50 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/07 22:12:11 jlam Exp $
 
 DISTNAME=              ircii-${VERS}
 PKGNAME=               ircII-${VERS}
@@ -25,9 +25,8 @@
 CONFIGURE_ARGS+=       --with-default-server=${DEFAULT_IRC_SERVER:Q}
 .endif
 
-# Note: this pkg auto-detects IPv6 without regarding USE_INET6.
-# (Leave the line in to still get it into the README-IPv6.html!)
-BUILD_DEFS+=           USE_INET6
+# This pkg auto-detects IPv6.
+BUILD_DEFS+=           IPV6_READY
 
 .include "options.mk"
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 chat/sirc/Makefile
--- a/chat/sirc/Makefile        Fri Sep 07 22:07:31 2007 +0000
+++ b/chat/sirc/Makefile        Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/07 22:12:11 jlam Exp $
 
 DISTNAME=      sirc-2.211
 PKGREVISION=   2
@@ -16,8 +16,8 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-# supports IPv6 (actually, af independent)
-BUILD_DEFS+=   USE_INET6
+# supports IPv6 (actually, AF-independent)
+BUILD_DEFS+=   IPV6_READY
 
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 USE_TOOLS+=    perl:run
diff -r 133fa1d7eb37 -r 3c5b4e773940 games/gtetrinet/Makefile
--- a/games/gtetrinet/Makefile  Fri Sep 07 22:07:31 2007 +0000
+++ b/games/gtetrinet/Makefile  Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/06/05 05:37:26 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/07 22:12:11 jlam Exp $
 #
 
 DISTNAME=      gtetrinet-0.7.11
@@ -15,14 +15,15 @@
 USE_TOOLS+=            gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=      YES
 
-BUILD_DEFS+=           USE_INET6
 MAKE_FLAGS+=           gamesdir=${PREFIX}/bin
 MAKE_FLAGS+=           schemadir=${PREFIX}/share/gconf/schemas
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gtetrinet
+PKG_SUPPORTED_OPTIONS= inet6
 
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 games/quake6/Makefile
--- a/games/quake6/Makefile     Fri Sep 07 22:07:31 2007 +0000
+++ b/games/quake6/Makefile     Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/02/20 12:40:14 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/07 22:12:11 jlam Exp $
 
 DISTNAME=      quake-v6-bsd-kame
 PKGNAME=       quake6-0.0
@@ -19,17 +19,13 @@
        cd ${WRKSRC}; ${RM} config.cache
 
 USE_TOOLS+=    gmake
+USE_FEATURES=  inet6
 GNU_CONFIGURE= yes
 
-# This pkg can be built on USE_INET6 platform only
-BUILD_DEFS+=   USE_INET6
 .include "../../mk/bsd.prefs.mk"
-.if !(defined(USE_INET6) && ${USE_INET6} == "YES")
-PKG_FAIL_REASON+=      "${PKGNAME} requires IPv6 support"
-.endif
 
 # "bindir" setting is very non-standard for GNU autoconf
-CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin
+CONFIGURE_ARGS+=       --disable-asmopt --bindir=/bin
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 games/quakeforge/Makefile
--- a/games/quakeforge/Makefile Fri Sep 07 22:07:31 2007 +0000
+++ b/games/quakeforge/Makefile Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/06/30 19:16:26 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=              quakeforge-0.5.5
 PKGREVISION=           7
@@ -23,10 +23,14 @@
 SUBST_FILES.dsp=       libs/audio/targets/snd_oss.c
 SUBST_SED.dsp=         -e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
-BUILD_DEFS+=           USE_INET6
+PKG_OPTIONS_VAR=       PKG_OPTIONS.quakeforge
+PKG_SUPPORTED_OPTIONS= inet6
 
-.include "../../mk/bsd.prefs.mk"
-.if !(defined(USE_INET6) && ${USE_INET6} == "YES")
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --with-ipv6
+.else
 CONFIGURE_ARGS+=       --without-ipv6
 .endif
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 inputmethod/canna/Makefile.common
--- a/inputmethod/canna/Makefile.common Fri Sep 07 22:07:31 2007 +0000
+++ b/inputmethod/canna/Makefile.common Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/07/04 20:54:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/09/07 22:12:12 jlam Exp $
 #
 # Canna common makefile.
 #
@@ -27,16 +27,6 @@
 PKG_GROUPS_VARS+=      CANNA_GROUP
 PKG_USERS_VARS+=       CANNA_USER
 
-# XXX IPv6 support.  To be done.
-#BUILD_DEFS+=  USE_INET6
-#.include "../../mk/bsd.prefs.mk"
-#.if 0 # defined(USE_INET6) && ${USE_INET6} == "YES"
-#INET6=                -DINET6
-#.else
-#INET6=                # empty
-#.endif
-#MAKE_ENV+=    INET6=${INET6}
-
 CANNA_ENV=     CANNA_USER=${CANNA_USER}                                \
                CANNA_GROUP=${CANNA_GROUP}                              \
                CANNA_SPOOL=${CANNA_SPOOL}                              \
diff -r 133fa1d7eb37 -r 3c5b4e773940 inputmethod/skkfep/Makefile
--- a/inputmethod/skkfep/Makefile       Fri Sep 07 22:07:31 2007 +0000
+++ b/inputmethod/skkfep/Makefile       Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=      skkfep0.86c
 PKGNAME=       skkfep-0.86c
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://ei5nazha.yz.yamagata-u.ac.jp/~aito/aito-soft.html
 COMMENT=       Terminal based SKK-like Kana-to-Kanji FrontEnd Processor
 
-BUILD_DEFS+=   USE_INET6
+BUILD_DEFS+=   IPV6_READY
 
 WRKSRC=                ${WRKDIR}/skkfep
 NO_CONFIGURE=  yes
diff -r 133fa1d7eb37 -r 3c5b4e773940 inputmethod/skkinput/Makefile
--- a/inputmethod/skkinput/Makefile     Fri Sep 07 22:07:31 2007 +0000
+++ b/inputmethod/skkinput/Makefile     Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/07 22:12:12 jlam Exp $
 
 DISTNAME=      skkinput-2.06.3
 PKGREVISION=   2
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://skkinput2.sourceforge.jp/
 COMMENT=       X11 frontend for SKK
 
-BUILD_DEFS+=   USE_INET6
+BUILD_DEFS+=   IPV6_READY
 
 USE_IMAKE=     YES
 
diff -r 133fa1d7eb37 -r 3c5b4e773940 inputmethod/skkserv/Makefile
--- a/inputmethod/skkserv/Makefile      Fri Sep 07 22:07:31 2007 +0000
+++ b/inputmethod/skkserv/Makefile      Fri Sep 07 22:12:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/05 07:09:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $



Home | Main Index | Thread Index | Old Index