cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force rewrite of Paths.pyc before running distutils' install command.

Browse Source 
Fixes checksum complaints on pkg_delete after zenmap has been run by
root (as recommended). Use MODPY_EGG_VERSION while here and bump
PKGNAME.

ok okan@, "looks ok" merdely@
This commit is contained in:
wcmaier 2008-05-16 20:50:55 +00:00
parent 3c0fc93e8c
commit 2023a2f5f3
3 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/nmap/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.76 2008/05/15 18:30:14 okan Exp $
# $OpenBSD: Makefile,v 1.77 2008/05/16 20:50:55 wcmaier Exp $
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
V= 4.62
DISTNAME= nmap-$V
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-$V
MODPY_EGG_VERSION= 4.62
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}p0
CATEGORIES= net security
MASTER_SITES= http://download.insecure.org/nmap/dist/
@ -26,8 +26,6 @@ MULTI_PACKAGES= -main -zenmap
WANTLIB-main= c crypto m pcap ssl stdc++
SUBST_VARS= V
USE_GMAKE= yes
MODULES= lang/python
@ -62,8 +60,4 @@ NO_REGRESS= Yes
post-extract:
@cd ${WRKSRC} && rm -rf libpcap/ libdnet-stripped/ liblua/ libpcre/
post-install:
cd ${WRKINST}${MODPY_SITEPKG} && \
${MODPY_BIN} -c 'import zenmapCore.Paths'
.include <bsd.port.mk>

37
net/nmap/patches/patch-zenmap_setup_py
View File

@ -1,11 +1,38 @@
$OpenBSD: patch-zenmap_setup_py,v 1.1 2008/01/25 01:21:17 okan Exp $
--- zenmap/setup.py.orig Tue Dec 18 15:22:37 2007
+++ zenmap/setup.py Tue Dec 18 15:22:57 2007
@@ -85,7 +85,6 @@ class my_install(install):
$OpenBSD: patch-zenmap_setup_py,v 1.2 2008/05/16 20:50:55 wcmaier Exp $
--- zenmap/setup.py.orig Tue Apr 8 14:14:54 2008
+++ zenmap/setup.py Fri May 16 09:30:42 2008
@@ -80,12 +80,11 @@ os.path.walk(locale_dir, mo_find, data_files)
class my_install(install):
def run(self):
+ self.fix_paths()
install.run(self)
self.set_perms()
self.set_modules_path()
self.fix_paths()
- self.fix_paths()
- self.create_uninstaller()
def create_uninstaller(self):
uninstaller_filename = os.path.join(self.install_scripts, "uninstall_" + APP_NAME)
@@ -178,17 +177,10 @@ print
"PIXMAPS_DIR": os.path.join(self.prefix, pixmaps_dir),
"ICONS_DIR": os.path.join(self.prefix, icons_dir)}
- # Find and read the Paths.py file.
- pcontent = ""
paths_file = os.path.join("zenmapCore", "Paths.py")
- installed_files = self.get_outputs()
- for f in installed_files:
- if re.findall("(%s)" % re.escape(paths_file), f):
- paths_file = f
- pf = open(paths_file)
- pcontent = pf.read()
- pf.close()
- break
+ pf = open(paths_file)
+ pcontent = pf.read()
+ pf.close()
# Replace the path definitions.
for path, replacement in interesting_paths.items():

4
net/nmap/pkg/PLIST-zenmap
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-zenmap,v 1.2 2008/05/15 18:30:14 okan Exp $
@comment $OpenBSD: PLIST-zenmap,v 1.3 2008/05/16 20:50:56 wcmaier Exp $
bin/nmapfe
bin/xnmap
bin/zenmap
@ -41,7 +41,7 @@ lib/python${MODPY_VERSION}/site-packages/higwidgets/higwindows.py
lib/python${MODPY_VERSION}/site-packages/higwidgets/higwindows.pyc
lib/python${MODPY_VERSION}/site-packages/higwidgets/utils.py
lib/python${MODPY_VERSION}/site-packages/higwidgets/utils.pyc
lib/python${MODPY_VERSION}/site-packages/zenmap-${V}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/zenmap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/zenmapCore/
lib/python${MODPY_VERSION}/site-packages/zenmapCore/BasePaths.py
lib/python${MODPY_VERSION}/site-packages/zenmapCore/BasePaths.pyc