[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (2b13f1f7de07f8dcbdc9e79bb3e3eda60dcc391b)

Pol Vinogradov scm at mail.sourcemage.org
Fri Feb 16 16:53:17 EST 2007


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 net/net-tools/BUILD     |   11 ++++++
 net/net-tools/CONFIGURE |   78 ++++++++++++++++++++++--------------------------
 net/net-tools/DETAILS   |    3 +
 net/net-tools/HISTORY   |    5 +++
 4 files changed, 55 insertions(+), 42 deletions(-)

New commits:
commit b7523cdc297882d039c7b9e0eca47f05cf474da1
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    net/net-tools:
    
    BUILD: added gettext stuff handling
    CONFIGURE: removed GETTEXT query, added missing &&
    DETAILS: added KEYWORDS, PATCHLEVEL++

diff --git a/net/net-tools/BUILD b/net/net-tools/BUILD
index bbd4fde..ff93875 100755
--- a/net/net-tools/BUILD
+++ b/net/net-tools/BUILD
@@ -1,3 +1,14 @@
+source $GRIMOIRE/is_depends_enabled.function  &&
+
+if  is_depends_enabled  $SPELL  gettext
+then
+  CONFIG_OPTS="y\n\
+$CONFIG_OPTS"
+else
+  CONFIG_OPTS="n\n\
+$CONFIG_OPTS"
+fi  &&
+
 echo  -e\n  $CONFIG_OPTS  >  smgl_config_opts                &&
 patch  -p1  <  $SCRIPT_DIRECTORY/gcc-3.4.patch               &&
 patch  -p1  <  $SCRIPT_DIRECTORY/x25_address-fix.patch       &&
diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE
index becb840..08da957 100755
--- a/net/net-tools/CONFIGURE
+++ b/net/net-tools/CONFIGURE
@@ -1,50 +1,47 @@
 # Setting all options default to 'y' so the default can be used
 # on any system.
-# Should use the optional_depends check in DEPENDS for gettext
-config_query  GETTEXT    "Does your system support GNU gettext?"      y
-config_query  UNIX       "UNIX protocol family?"                      y
-config_query  INET       "INET (TCP/IP) protocol familiy?"            y
-config_query  INET6      "INET6 (IPv6) protocol family?"              y
-config_query  NOVELL     "Novell IPX/SPX protocol family?"            y
-config_query  APPLETALK  "Appletalk DDP protocol family?"             y
-config_query  AFAX25     "AX25 (packet radio) protocol family?"       y
-config_query  AFNETROM   "NET/ROM (packet radio) protocol family?"    y
-config_query  AFROSE     "Rose (packet radio) protocol family?"       y
-config_query  AFX25      "X.25 (CCITT) protocol family?"              y
-config_query  AFECONET   "Econet protocol family?"                    y
+config_query  UNIX       "UNIX protocol family?"                      y  &&
+config_query  INET       "INET (TCP/IP) protocol familiy?"            y  &&
+config_query  INET6      "INET6 (IPv6) protocol family?"              y  &&
+config_query  NOVELL     "Novell IPX/SPX protocol family?"            y  &&
+config_query  APPLETALK  "Appletalk DDP protocol family?"             y  &&
+config_query  AFAX25     "AX25 (packet radio) protocol family?"       y  &&
+config_query  AFNETROM   "NET/ROM (packet radio) protocol family?"    y  &&
+config_query  AFROSE     "Rose (packet radio) protocol family?"       y  &&
+config_query  AFX25      "X.25 (CCITT) protocol family?"              y  &&
+config_query  AFECONET   "Econet protocol family?"                    y  &&
 # Disable DECNET as it's broken...
-#config_query  DECNET     "DECnet protocol family?"                    n
-persistent_add DECNET
-DECNET=n
-config_query  AFASH      "Ash protocol family?"                       y
-config_query  ETHERNET   "Ethernet (generic) hardware support?"       y
-config_query  ARCNET     "ARCnet hardware support?"                   y
-config_query  SLIP       "SLIP (serial line) hardware support?"       y
-config_query  PPP        "PPP (serial line) hardware support?"        y
-config_query  IPIP       "IPIP Tunnel hardware support?"              y
-config_query  STRIP      "STRIP (Metricom radio) hardware support?"   y
-config_query  TOKEN      "Token ring (generic) hardware support?"     y
-config_query  HWAX25     "AX25 (packet radio) hardware support?"      y
-config_query  HWROSE     "Rose (packet radio) hardware support?"      y
-config_query  HWNETROM   "NET/ROM (packet radio) hardware support?"   y
-config_query  HWX25      "X.25 (generic) hardware support?"           y
-config_query  FRAME      "DLCI/FRAD (frame relay) hardware support?"  y
-config_query  SIT        "SIT (IPv6-in-IPv4) hardware support?"       y
-config_query  FDDI       "FDDI (generic) hardware support?"           y
-config_query  HIPPI      "HIPPI (generic) hardware support?"          y
-config_query  HWASH      "Ash hardware support?"                      y
-config_query  CISCO      "(Cisco)-HDLC/LAPB hardware support?"        y
-config_query  IRDA       "IrDA hardware support?"                     y
-config_query  HWECONET   "Econet hardware support?"                   y
-config_query  IPMASQ     "IP Masquerading support?"                   y
-config_query  IPTOOLS    "Build iptunnel and ipmaddr?"                y
+#config_query  DECNET     "DECnet protocol family?"                    n  &&
+persistent_add DECNET  &&
+DECNET=n  &&
+config_query  AFASH      "Ash protocol family?"                       y  &&
+config_query  ETHERNET   "Ethernet (generic) hardware support?"       y  &&
+config_query  ARCNET     "ARCnet hardware support?"                   y  &&
+config_query  SLIP       "SLIP (serial line) hardware support?"       y  &&
+config_query  PPP        "PPP (serial line) hardware support?"        y  &&
+config_query  IPIP       "IPIP Tunnel hardware support?"              y  &&
+config_query  STRIP      "STRIP (Metricom radio) hardware support?"   y  &&
+config_query  TOKEN      "Token ring (generic) hardware support?"     y  &&
+config_query  HWAX25     "AX25 (packet radio) hardware support?"      y  &&
+config_query  HWROSE     "Rose (packet radio) hardware support?"      y  &&
+config_query  HWNETROM   "NET/ROM (packet radio) hardware support?"   y  &&
+config_query  HWX25      "X.25 (generic) hardware support?"           y  &&
+config_query  FRAME      "DLCI/FRAD (frame relay) hardware support?"  y  &&
+config_query  SIT        "SIT (IPv6-in-IPv4) hardware support?"       y  &&
+config_query  FDDI       "FDDI (generic) hardware support?"           y  &&
+config_query  HIPPI      "HIPPI (generic) hardware support?"          y  &&
+config_query  HWASH      "Ash hardware support?"                      y  &&
+config_query  CISCO      "(Cisco)-HDLC/LAPB hardware support?"        y  &&
+config_query  IRDA       "IrDA hardware support?"                     y  &&
+config_query  HWECONET   "Econet hardware support?"                   y  &&
+config_query  IPMASQ     "IP Masquerading support?"                   y  &&
+config_query  IPTOOLS    "Build iptunnel and ipmaddr?"                y  &&
 # Turn off MII by default as it fails to build on some machines
 config_query  MII        "Build mii-tool?"                            n
 
-persistent_add  CONFIG_OPTS
+persistent_add  CONFIG_OPTS  &&
 
-CONFIG_OPTS="$GETTEXT\n\
-$UNIX\n\
+CONFIG_OPTS="$UNIX\n\
 $INET\n\
 $INET6\n\
 $NOVELL\n\
@@ -78,4 +75,3 @@ $HWECONET\n\
 $IPMASQ\n\
 $IPTOOLS\n\
 $MII\n"
-
diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index 84a2f84..0965cbd 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -4,10 +4,11 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/$SOURCE
      SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
-      PATCHLEVEL=6
+      PATCHLEVEL=7
       LICENSE[0]=GPL
         WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
          ENTERED=20010922
+        KEYWORDS="tools net"
            SHORT="Essential tools for networking."
 cat << EOF
 The Net-tools package contains the arp, hostname, ifconfig, netstat,
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index f830a90..686473b 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,8 @@
+2007-02-17 Pol Vinogradov <vin.public at gmail.com>
+	* BUILD: added gettext stuff handling
+	* CONFIGURE: removed GETTEXT query, added missing &&
+	* DETAILS: added KEYWORDS, PATCHLEVEL++
+
 2007-02-16 Arjan Bouter <abouter at sourcemage.org>
 	* ifup: removed debug output when syslog is used
 



More information about the SM-Commit mailing list