[Lunar-commits] r26283 - moonbase/trunk/wifi/kismet

[Dennis Veatch]

Author: stumbles
Date: 2007-10-19 15:43:55 +0200 (Fri, 19 Oct 2007)
New Revision: 26283

Added:
   moonbase/trunk/wifi/kismet/BUILD.x86_64
Modified:
   moonbase/trunk/wifi/kismet/BUILD
   moonbase/trunk/wifi/kismet/DEPENDS
   moonbase/trunk/wifi/kismet/DETAILS
Log:

Version bump. Adding a BUILD.x86_64 for now and a little
tidying up here and there.



Modified: moonbase/trunk/wifi/kismet/BUILD
===================================================================
--- moonbase/trunk/wifi/kismet/BUILD	2007-10-19 13:19:12 UTC (rev 26282)
+++ moonbase/trunk/wifi/kismet/BUILD	2007-10-19 13:43:55 UTC (rev 26283)
@@ -11,18 +11,18 @@
     fi
 
     if ! module_installed gpsdrive ; then
-        OPTS="$OPTS --disable-gps"
+        OPTS="$OPTS --disable-gpsmap"
     fi &&
 
-    ./configure --prefix=/usr             \
-                --build=$BUILD                  \
-                --sysconfdir=/etc/kismet  \
-                --mandir=/usr/share/man   \
-                --infodir=/usr/share/info \
-                --datadir=/usr/share          \
-                --localstatedir=/var      \
-                 $OPTS                     &&
-    make dep                                  && 
+    ./configure --prefix=/usr              \
+                --build=$BUILD             \
+                --sysconfdir=/etc/kismet   \
+                --mandir=/usr/share/man    \
+                --infodir=/usr/share/info  \
+                --datadir=/usr/share       \
+                --localstatedir=/var       \
+                 $OPTS                    &&
+    make dep                              && 
     make                                  &&
     prepare_install                       &&
     $MAKE_INSTALL

Added: moonbase/trunk/wifi/kismet/BUILD.x86_64
===================================================================
--- moonbase/trunk/wifi/kismet/BUILD.x86_64	                        (rev 0)
+++ moonbase/trunk/wifi/kismet/BUILD.x86_64	2007-10-19 13:43:55 UTC (rev 26283)
@@ -0,0 +1,31 @@
+(
+
+    if [ $WITH_ACPI == "y" ]; then
+      OPTS="$OPTS --enable-acpi"
+    fi
+
+    if [ $SUIDINSTALL == "y" ]; then
+      MAKE_INSTALL="make suidinstall"
+    else
+      MAKE_INSTALL="make install"
+    fi
+
+# At some point this should be revisited for x86_64.
+    if module_installed gpsdrive ; then
+        OPTS="$OPTS --disable-gpsmap"
+    fi &&
+
+    ./configure --prefix=/usr              \
+                --build=$BUILD             \
+                --sysconfdir=/etc/kismet   \
+                --mandir=/usr/share/man    \
+                --infodir=/usr/share/info  \
+                --datadir=/usr/share       \
+                --localstatedir=/var       \
+                 $OPTS                    &&
+    make dep                              &&
+    make                                  &&
+    prepare_install                       &&
+    $MAKE_INSTALL
+
+) > $C_FIFO 2>&1

Modified: moonbase/trunk/wifi/kismet/DEPENDS
===================================================================
--- moonbase/trunk/wifi/kismet/DEPENDS	2007-10-19 13:19:12 UTC (rev 26282)
+++ moonbase/trunk/wifi/kismet/DEPENDS	2007-10-19 13:43:55 UTC (rev 26283)
@@ -1,5 +1,6 @@
-depends libpcap &&
-optional_depends "gpsdrive" "" "" "GPS support" &&
-optional_depends "ImageMagick" "" "" "Needed for gpsmap map generation" &&
-optional_depends "expat" "" "" "Needed for gpsmap map generation" &&
+depends libpcap
+
+optional_depends "gpsdrive" "" "" "GPS support"
+optional_depends "ImageMagick" "" "" "Needed for gpsmap map generation"
+optional_depends "expat" "" "" "Needed for gpsmap map generation"
 optional_depends "gmp" "" "" "Needed for gpsmap map generation"

Modified: moonbase/trunk/wifi/kismet/DETAILS
===================================================================
--- moonbase/trunk/wifi/kismet/DETAILS	2007-10-19 13:19:12 UTC (rev 26282)
+++ moonbase/trunk/wifi/kismet/DETAILS	2007-10-19 13:43:55 UTC (rev 26283)
@@ -1,11 +1,11 @@
           MODULE=kismet
-         VERSION=2007-01-R1b
+         VERSION=2007-10-R1
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://www.kismetwireless.net/code/
-      SOURCE_VFY=sha1:d09256e744ec0ca924f80863feaba8e548d4b4bf
+      SOURCE_VFY=sha1:a1c682797ad6842b53f9e0f038254aa8326e0fb4
         WEB_SITE=http://www.kismetwireless.net/
          ENTERED=20040207
-         UPDATED=20070311
+         UPDATED=20071018
       MAINTAINER=ratler at lunar-linux.org
            SHORT="An 802.11 layer2 wireless network sniffer"