[39004] trunk/dports/net/umit
raimue at macports.org
raimue at macports.org
Tue Aug 5 18:37:05 PDT 2008
Revision: 39004
http://trac.macosforge.org/projects/macports/changeset/39004
Author: raimue at macports.org
Date: 2008-08-05 18:37:05 -0700 (Tue, 05 Aug 2008)
Log Message:
-----------
net/umit:
Maintainer update to version 0.9.5, closes #16232.
Modified Paths:
--------------
trunk/dports/net/umit/Portfile
trunk/dports/net/umit/files/patch-base.diff
trunk/dports/net/umit/files/patch-setup.diff
Modified: trunk/dports/net/umit/Portfile
===================================================================
--- trunk/dports/net/umit/Portfile 2008-08-06 00:58:17 UTC (rev 39003)
+++ trunk/dports/net/umit/Portfile 2008-08-06 01:37:05 UTC (rev 39004)
@@ -4,7 +4,7 @@
PortGroup python25 1.0
name umit
-version 0.9.5-RC2
+version 0.9.5
categories net
maintainers luis.kop at gmail.com
description A graphical tool to scanner networks
@@ -15,9 +15,9 @@
patchfiles patch-base.diff patch-setup.diff
master_sites sourceforge:umit
-checksums md5 d781b415b7d9398cc6c1f41631f8a7f5 \
- sha1 8c2a244149ef5da8f1492755161651bde93adcee \
- rmd160 48121916e6d469072da669de8099a075d336ebc2
+checksums md5 f4c63b19d22e9f7d78458b3409d440ad \
+ sha1 0d49f306e7482a83924966559d0f711cd82b57bd \
+ rmd160 ad03c62e7e2fe8884945b74f24601c913dd0ab18
depends_lib port:coreutils\
port:nmap \
Modified: trunk/dports/net/umit/files/patch-base.diff
===================================================================
--- trunk/dports/net/umit/files/patch-base.diff 2008-08-06 00:58:17 UTC (rev 39003)
+++ trunk/dports/net/umit/files/patch-base.diff 2008-08-06 01:37:05 UTC (rev 39004)
@@ -1,19 +1,11 @@
---- umitCore/BasePaths.py.orig 2008-07-03 17:30:17.000000000 +0100
-+++ umitCore/BasePaths.py 2008-07-03 17:48:56.000000000 +0100
-@@ -36,14 +36,16 @@
+--- umitCore/BasePaths.py.orig 2008-08-06 02:07:28.000000000 +0100
++++ umitCore/BasePaths.py 2008-08-06 02:10:53.000000000 +0100
+@@ -36,14 +36,14 @@
# directory.
main_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
if hasattr(sys, "frozen"):
- main_dir = os.path.dirname(sys.executable)
+ main_dir = dirname(sys.executable)
-+
-+CONFIG_DIR = "__PREFIX__/share/umit/config"
-+LOCALE_DIR = "__PREFIX__/share/locale"
-+MISC_DIR = "__PREFIX__/share/umit/misc"
-+ICONS_DIR = "__PREFIX__/share/icons/umit"
-+PIXMAPS_DIR = "__PREFIX__/share/pixmaps/umit"
-+DOCS_DIR = "__PREFIX__/share/doc/umit"
-+
-CONFIG_DIR = os.path.join(main_dir, "share", "umit", "config")
-LOCALE_DIR = os.path.join(main_dir, "share", "locale")
@@ -21,62 +13,12 @@
-ICONS_DIR = os.path.join(main_dir, "share", "icons", "umit")
-PIXMAPS_DIR = os.path.join(main_dir, "share", "pixmaps", "umit")
-DOCS_DIR = os.path.join(main_dir, "share", "doc", "umit")
++CONFIG_DIR = "__PREFIX__/share/umit/config"
++LOCALE_DIR = "__PREFIX__/share/locale"
++MISC_DIR = "__PREFIX__/share/umit/misc"
++ICONS_DIR = "__PREFIX__/share/icons/umit"
++PIXMAPS_DIR = "__PREFIX__/share/pixmaps/umit"
++DOCS_DIR = "__PREFIX__/share/doc/umit"
base_paths = dict(config_file = 'umit.conf',
config_dir = '.umit',
-@@ -56,17 +58,17 @@
- options = 'options.xml',
- umit_opf = 'umit.opf',
- umit_opt = 'umit.opt',
-- pixmaps_dir = PIXMAPS_DIR,
-- i18n_dir = LOCALE_DIR,
-+ pixmaps_dir = os.path.join('share', 'pixmaps'),
-+ i18n_dir = os.path.join('share','locale'),
- i18n_message_file = 'umit.mo',
- scan_results_extension = 'usr', # comes from umit scan result
- scan_profile_extension = 'usp', # comes from umit scan profile
- user_home = HOME,
- basic_search_sequence = [HOME, CURRENT_DIR],
- config_search_sequence = [HOME, CURRENT_DIR],
-- pixmaps_search_sequence = [os.path.join(CURRENT_DIR, PIXMAPS_DIR),
-+ pixmaps_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'pixmaps'),
- HOME],
-- i18n_search_sequence = [os.path.join(CURRENT_DIR, LOCALE_DIR), HOME],
-+ i18n_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'locale'), HOME],
- umitdb = "umit.db",
- services = "nmap-services",
- services_dump = "services.dmp",
-@@ -83,25 +85,27 @@
- '/opt/umit', HOME, CURRENT_DIR],
- config_search_sequence = [os.path.join(HOME, base_paths['config_dir']),
- CURRENT_DIR, '/etc'],
-- pixmaps_search_sequence = [os.path.join(CURRENT_DIR, PIXMAPS_DIR),
-- '/usr/share/pixmaps/umit',
-+ pixmaps_search_sequence = [os.path.join(CURRENT_DIR,
-+ 'share',
-+ 'pixmaps'),
-+ '/usr/share/pixmaps',
- '/opt/umit', HOME],
-- i18n_search_sequence = [os.path.join(CURRENT_DIR, LOCALE_DIR),
-+ i18n_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'locale'),
- '/usr/share/locale',
- HOME, CURRENT_DIR]))
- elif PLATFORM == 'win32':
- PROGRAM_FILES = os.environ.get("PROGRAMFILES", "\\")
- UMIT_DIR = os.path.join(PROGRAM_FILES, "Umit")
-- PIXMAPS_DIR = os.path.join(UMIT_DIR, PIXMAPS_DIR)
-+ PIXMAPS_DIR = os.path.join(UMIT_DIR, 'share', 'pixmaps')
-
- base_paths.update(dict(\
- basic_search_sequence = [UMIT_DIR, PROGRAM_FILES, HOME, CURRENT_DIR],
- config_search_sequence = [UMIT_DIR, PROGRAM_FILES, HOME, CURRENT_DIR],
- pixmaps_search_sequence = [PIXMAPS_DIR, PROGRAM_FILES,
-- os.path.join(CURRENT_DIR, PIXMAPS_DIR),
-+ os.path.join(CURRENT_DIR, 'share', 'pixmaps'),
- HOME],
- i18n_search_sequence = [UMIT_DIR, PROGRAM_FILES,
-- os.path.join(CURRENT_DIR, LOCALE_DIR), HOME],))
-+ os.path.join(CURRENT_DIR, 'share', 'locale'), HOME],))
-
- elif PLATFORM == 'darwin':
- base_paths.update(dict(user_home = HOME,
Modified: trunk/dports/net/umit/files/patch-setup.diff
===================================================================
--- trunk/dports/net/umit/files/patch-setup.diff 2008-08-06 00:58:17 UTC (rev 39003)
+++ trunk/dports/net/umit/files/patch-setup.diff 2008-08-06 01:37:05 UTC (rev 39004)
@@ -1,8 +1,6 @@
-Index: setup.py
-===================================================================
---- setup.py (revision 2980)
-+++ setup.py (working copy)
-@@ -105,7 +105,7 @@
+--- setup.py.orig 2008-08-06 02:05:01.000000000 +0100
++++ setup.py 2008-08-06 02:06:49.000000000 +0100
+@@ -141,7 +141,7 @@
self.set_perms()
self.set_modules_path()
@@ -11,10 +9,3 @@
self.create_uninstaller()
self.finish_banner()
-@@ -270,4 +270,4 @@
- packages = ['', 'umitCore', 'umitGUI', 'higwidgets'],
- data_files = data_files,
- cmdclass = {"install":umit_install,
-- "sdist":umit_sdist})
-\ No newline at end of file
-+ "sdist":umit_sdist})
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080805/a6d6e877/attachment.html
More information about the macports-changes
mailing list