Update of /cvsroot/fink/experimental/danielj
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32560

Modified Files:
        nmap.info 
Log Message:
Cleaned up build process.

Index: nmap.info
===================================================================
RCS file: /cvsroot/fink/experimental/danielj/nmap.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nmap.info   4 Dec 2007 23:02:08 -0000       1.1
+++ nmap.info   6 Dec 2007 20:50:56 -0000       1.2
@@ -1,10 +1,10 @@
 Info2: <<
 Package: nmap%type_pkg[-nox]
 Version: 4.23
-Revision: 0.rc3.1003
+Revision: 0.rc3.1004
 GCC: 4.0
 Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
-Type: -nox (boolean)
+Type: -nox (boolean), python (2.5)
 
 BuildDepends: <<
        fink (>= 0.24.12),
@@ -19,12 +19,13 @@
        libpcap-shlibs,
        lua51-shlibs,
        pcre-shlibs,
-       (%type_raw[-nox] = .) python25,
-       (%type_raw[-nox] = .) pygtk2-gtk-py25,
-       (%type_raw[-nox] = .) pysqlite2-py25
+       (%type_raw[-nox] = .) python%type_pkg[python],
+       (%type_raw[-nox] = .) pygtk2-gtk-py%type_pkg[python],
+       (%type_raw[-nox] = .) pysqlite2-py%type_pkg[python]
 <<
 Conflicts: nmap-nox, nmap, (%type_raw[-nox] = .) umit
 Replaces: nmap-nox, nmap, (%type_raw[-nox] = .) umit
+Recommends: (%type_raw[-nox] = .) psyco-py%type_pkg[python]
 
 Source: http://download.insecure.org/%{Ni}/dist/%{Ni}-%vRC3.tar.bz2
 Source-MD5: 5228f94afcec5a60e59c066a49d9fc15
@@ -49,27 +50,23 @@
        --with-openssl=%p/lib/system-openssl \
        --with-libpcre=%p \
        --with-libdnet=%p \
-       --with-liblua=yes \
-       --without-zenmap \
-       --without-nmapfe
+       --with-liblua=yes
 <<
 CompileScript: <<
        #!/bin/bash -ev
-       ./configure %c
-       # This hack is necessary to ensure that the system's openssl is always 
used.
-       make LDFLAGS='-L%p/lib/system-openssl/lib -L%p/lib -L%b/nbase 
-L%b/nsock/src/ $(STATIC)'
        if [ "%type_raw[-nox]" == "." ]; then
-               cd zenmap
-               %p/bin/python2.5 setup.py build
+               ./configure %c --with-zenmap 
PYTHON=%p/bin/python%type_raw[python]
+       else
+               ./configure %c --without-zenmap
        fi
-
+       
+       # This hack is necessary to ensure that the system's openssl is always 
used.
+       make LDFLAGS='-L%p/lib/system-openssl/lib -L%p/lib -L%b/nbase 
-L%b/nsock/src/ $(STATIC)'
 <<
 InstallScript: <<
        #!/bin/bash -ev
-       make install DESTDIR=%d
+       make install DESTDIR=%d 
DEFAULT_PYTHON_PATH='%p/bin/python%type_raw[python]'
        if [ "%type_raw[-nox]" == "." ]; then
-               cd zenmap
-               %p/bin/python2.5 setup.py install --prefix=%p --root=%d
                /bin/rm %i/bin/uninstall_zenmap
        fi
 <<
@@ -83,6 +80,10 @@
        
        Version 3.46 thanks to Alex Barclay <[EMAIL PROTECTED]>.
 <<
+DescUsage: <<
+       On Intel Macs, installing psyco-py%type_pkg[python] will speed up the
+       zenmap front end.
+<<
 DescPackaging: <<
        ConfigureParams installs manpages in correct directories and uses 
installed
        version of libpcap.


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to