[Lunar-commits] r19525 - moonbase/trunk/net/net-tools

[Jerry Lundström]

Author: prox
Date: 2006-03-30 10:36:49 +0000 (Thu, 30 Mar 2006)
New Revision: 19525

Modified:
   moonbase/trunk/net/net-tools/BUILD
   moonbase/trunk/net/net-tools/CONFIGURE
   moonbase/trunk/net/net-tools/DETAILS
Log:
add auto configure (or rather just pick net-tools defaults), added fixes from debians patchset that just fixed things and didnt change behaviour.

Modified: moonbase/trunk/net/net-tools/BUILD
===================================================================
--- moonbase/trunk/net/net-tools/BUILD	2006-03-30 04:45:46 UTC (rev 19524)
+++ moonbase/trunk/net/net-tools/BUILD	2006-03-30 10:36:49 UTC (rev 19525)
@@ -1,12 +1,18 @@
 (
 
-  patch_it  $SOURCE_CACHE/$SOURCE2 1                &&
-  patch_it  $SOURCE_CACHE/$SOURCE3 0                &&
+  patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 0 &&
+  patch_it $SOURCE4 1 &&
+  patch_it $SOURCE5 1 &&
 
   if [ -f $CONFIG_CACHE/net-tools.config.h ]; then
     cp $CONFIG_CACHE/net-tools.config.h config.h
   else
-    ./configure.sh config.in
+    if [ "$(get_module_config AUTOCONF)" == "y" ]; then
+      NET_TOOLS_AUTOCONF=1 ./configure.sh config.in
+    else
+      ./configure.sh config.in
+    fi &&
     cp config.h $CONFIG_CACHE/net-tools.config.h
   fi                                                &&
 

Modified: moonbase/trunk/net/net-tools/CONFIGURE
===================================================================
--- moonbase/trunk/net/net-tools/CONFIGURE	2006-03-30 04:45:46 UTC (rev 19524)
+++ moonbase/trunk/net/net-tools/CONFIGURE	2006-03-30 10:36:49 UTC (rev 19525)
@@ -1,9 +1,16 @@
 if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
 
   if  [  -f  $CONFIG_CACHE/net-tools.config.h  ];  then  
-    if    query  "Reconfigure net-tools?" n
-       then  rm  -f  $CONFIG_CACHE/net-tools.config.h
+    if    query  "Reconfigure net-tools?" n; then
+      rm  -f  $CONFIG_CACHE/net-tools.config.h
+      if query "Auto configure net-tools?" n; then
+        echo 'AUTOCONF="y"' >> $MODULE_CONFIG
+      fi
     fi
+  else
+    if query "Auto configure net-tools?" n; then
+      echo 'AUTOCONF="y"' >> $MODULE_CONFIG
+    fi
   fi
 
   if query "Do you want to configure your network?" n; then

Modified: moonbase/trunk/net/net-tools/DETAILS
===================================================================
--- moonbase/trunk/net/net-tools/DETAILS	2006-03-30 04:45:46 UTC (rev 19524)
+++ moonbase/trunk/net/net-tools/DETAILS	2006-03-30 10:36:49 UTC (rev 19525)
@@ -3,16 +3,22 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
 	 SOURCE2=$MODULE-$VERSION-gcc-3.3-fix1.patch.bz2
 	 SOURCE3=gcc34_net-tools_lunar.patch
+     SOURCE4=$MODULE-autoconf.patch.gz
+     SOURCE5=$MODULE-$VERSION-fixes.patch.gz
    SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/
   SOURCE2_URL[0]=$PATCH_URL/
      SOURCE3_URL=$PATCH_URL/
-      SOURCE_VFY=md5:888774accab40217dde927e21979c165
-     SOURCE2_VFY=md5:652206929f12b77d34d8f1225113f952
-     SOURCE3_VFY=md5:e75b18aecef34b82371d80b8b094ee1d
+     SOURCE4_URL=$PATCH_URL/
+     SOURCE5_URL=$PATCH_URL/
+      SOURCE_VFY=sha1:944fb70641505d5d1139dba3aeb81ba124574b83
+     SOURCE2_VFY=sha1:44ee3a0c517a4e67d8d746cd05683bd9f10836b7
+     SOURCE3_VFY=sha1:b23cc7946f2b4e8cfac1adfa6a1ea29e11ba18fa
+     SOURCE4_VFY=sha1:cdd26d5729491a5a12a45b657e6ca4f85cbda7a5
+     SOURCE5_VFY=sha1:61336ad568a415385f24788b30039f746977d28c
         WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
       MAINTAINER=kc8apf at kc8apf.net
          ENTERED=20010922
-         UPDATED=20050603
+         UPDATED=20060330
            SHORT="net-tools contains essential tools for networking."
 cat << EOF
 The Net-tools package contains the arp, hostname, ifconfig, netstat,