Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20657446 migrate nmap from Python 2.6 to 2.7 s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 05 Mar 2015 15:53:36 -0800
branchs11-update
changeset 4238 59cf6fd337ea
parent 4237 3517b6c3873e
child 4239 b0b944824f84
20657446 migrate nmap from Python 2.6 to 2.7
components/nmap/Makefile file | annotate | diff | comparison | revisions
components/nmap/nmap.p5m file | annotate | diff | comparison | revisions 
--- a/components/nmap/Makefile	Thu Mar 05 15:29:46 2015 -0800
+++ b/components/nmap/Makefile	Thu Mar 05 15:53:36 2015 -0800
@@ -48,7 +48,7 @@
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
 
-PYTHON_VERSION =	2.6
+PYTHON_VERSION =	2.7
 
 PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
 
@@ -58,7 +58,7 @@
 CONFIGURE_OPTIONS  +=   CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS  +=   LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS  +=   LIBS="-lsocket -lnsl"
-CONFIGURE_OPTIONS  +=   PYTHON="$(PYTHON)"
+CONFIGURE_OPTIONS  +=   PYTHON="$(PYTHON.$(PYTHON_VERSION))"
 CONFIGURE_OPTIONS  +=   --srcdir=$(BUILD_DIR_32)
 CONFIGURE_OPTIONS  +=   --localstatedir=/var 
 CONFIGURE_OPTIONS  +=   --without-localdirs 
@@ -71,9 +71,9 @@
 CONFIGURE_OPTIONS  +=   --with-ndiff
 
 # pkgdepend doesn't like the first line of a Python script to be:
-# '#!/usr/bin/env python' so turn it into '#!/usr/bin/python2.6'
+# '#!/usr/bin/env python' so turn it into '#!/usr/bin/python$(PYTHON_VERSION)'
 COMPONENT_POST_INSTALL_ACTION += \
-        $(GSED) -i -e 's?env python?python2.6?' \
+        $(GSED) -i -e "s?env python?python$(PYTHON_VERSION)?" \
                 $(PROTOUSRBINDIR)/uninstall_zenmap
 
 ASLR_MODE = $(ASLR_ENABLE)
@@ -85,13 +85,11 @@
 
 test:		$(NO_TESTS)
 
-
 REQUIRED_PACKAGES += library/pcre
-REQUIRED_PACKAGES += library/python-2/pygobject-26
-REQUIRED_PACKAGES += library/python-2/pygtk2-26
+REQUIRED_PACKAGES += library/python/pygobject-27
+REQUIRED_PACKAGES += library/python/pygtk2-27
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/lua
-REQUIRED_PACKAGES += runtime/python-26
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/gcc-3-runtime
--- a/components/nmap/nmap.p5m	Thu Mar 05 15:29:46 2015 -0800
+++ b/components/nmap/nmap.p5m	Thu Mar 05 15:53:36 2015 -0800
@@ -51,12 +51,7 @@
 file path=usr/bin/uninstall_zenmap
 link path=usr/bin/xnmap target=zenmap
 file path=usr/bin/zenmap
-dir  path=usr/lib
-dir  path=usr/lib/python$(PYVER)
-dir  path=usr/lib/python$(PYVER)/vendor-packages
-dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/__init__.py
-dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/boxes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/buttons.py
@@ -66,7 +61,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/labels.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/textview.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/windows.py
-dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/ArgvHandle.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Coordinate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Graph.py
@@ -74,7 +68,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Interpolation.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/XMLHandler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/__init__.py
-dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Application.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/ControlWidget.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Dialogs.py
@@ -86,14 +79,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/SaveDialog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Toolbar.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/__init__.py
-dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/drawing.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/geometry.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/integration.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/misc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmap-$(COMPONENT_VERSION)-py$(PYVER).egg-info
-dir  path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/BasePaths.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/Diff.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/I18N.py
@@ -119,7 +110,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/UmitOptionParser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/Version.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/__init__.py
-dir  path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/About.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/App.py \
     pkg.depend.bypass-generate=.*
@@ -157,7 +147,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/TargetCombo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/TopologyPage.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/__init__.py
-dir  path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/gtkutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higboxes.py
@@ -176,8 +165,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higwindows.py
 file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/utils.py
-dir  path=usr/share
-dir  path=usr/share/applications
 file path=usr/share/applications/zenmap-root.desktop
 file path=usr/share/applications/zenmap.desktop
 dir  path=usr/share/man
upstream/oracle/userland-gate