[105461] trunk/dports/sysutils/smart
afb at macports.org
afb at macports.org
Sun Apr 21 07:08:12 PDT 2013
Revision: 105461
https://trac.macports.org/changeset/105461
Author: afb at macports.org
Date: 2013-04-21 07:08:12 -0700 (Sun, 21 Apr 2013)
Log Message:
-----------
smart: upgrade to 1.4.1, change lib depends to path
Modified Paths:
--------------
trunk/dports/sysutils/smart/Portfile
trunk/dports/sysutils/smart/files/patch-prefix.diff
Removed Paths:
-------------
trunk/dports/sysutils/smart/files/patch-Makefile
Modified: trunk/dports/sysutils/smart/Portfile
===================================================================
--- trunk/dports/sysutils/smart/Portfile 2013-04-21 13:03:22 UTC (rev 105460)
+++ trunk/dports/sysutils/smart/Portfile 2013-04-21 14:08:12 UTC (rev 105461)
@@ -3,8 +3,9 @@
PortSystem 1.0
name smart
-version 1.2
+version 1.4.1
platforms darwin freebsd
+license GPL-2+
categories sysutils archivers
maintainers mac.com:n3npq afb
description Automatic updater and package installer/remover
@@ -16,19 +17,19 @@
over native tools currently in use (APT, APT-RPM, YUM, \
URPMI, etc).
-homepage http://smartpm.org
-master_sites http://labix.org/download/smart/
-checksums md5 233ccbd1e666a9a7c5e1cc7900075d93 \
- sha1 311f79ee381e4c099e3218f0735d2802c689f3f0 \
- rmd160 249b9295a09375ff52395fe783c24709515d08e8
+homepage http://labix.org/smart
+master_sites http://launchpad.net/${name}/trunk/${version}/+download/
+checksums md5 573ef32ba177a6b3c4bf7ef04873fcb6 \
+ sha1 51fae89900c386f7848cf5575f5729042c33e171 \
+ rmd160 d570cdda7a5c69cc0a3a3ea37711388944d88ce2
use_bzip2 yes
-patchfiles patch-prefix.diff patch-Makefile
+patchfiles patch-prefix.diff
-depends_lib lib:librpm:rpm port:python24
+depends_lib path:lib/python2.5/site-packages/rpm/__init__.py:rpm port:python25
### by default, it will run --shell interface.
### to run it with --gui, you will need:
-#depends_run port:py-gtk2
+#depends_run port:py25-gtk
patch {
foreach patch $patchfiles {
@@ -39,23 +40,10 @@
use_configure no
-build.args-append PYTHON="${prefix}/bin/python2.4"
-destroot.args-append PYTHON="${prefix}/bin/python2.4"
-test.args-append PYTHON="${prefix}/bin/python2.4"
+build.args-append PYTHON="${prefix}/bin/python2.5"
+destroot.args-append PYTHON="${prefix}/bin/python2.5"
+test.args-append PYTHON="${prefix}/bin/python2.5"
-variant rpm5 description "use rpm5, not rpm4" {
- # uses RPM 5.2.1, instead of the default RPM 4.4.9
- depends_lib-delete lib:librpm:rpm port:python24
- depends_lib-append lib:librpm-5.2:rpm52 port:python25
- #depends_run port:py25-gtk
- build.args-delete PYTHON="${prefix}/bin/python2.4"
- build.args-append PYTHON="${prefix}/bin/python2.5"
- destroot.args-delete PYTHON="${prefix}/bin/python2.4"
- destroot.args-append PYTHON="${prefix}/bin/python2.5"
- test.args-delete PYTHON="${prefix}/bin/python2.4"
- test.args-append PYTHON="${prefix}/bin/python2.5"
-}
-
post-destroot {
destroot.keepdirs ${destroot}${prefix}/etc/smart/channels \
${destroot}${prefix}/var/lib/smart
@@ -66,4 +54,4 @@
livecheck.name smartpm
livecheck.type regex
livecheck.url ${homepage}
-livecheck.regex /download/smart/${name}-(\[0-9\\.\]+)${extract.suffix}
+livecheck.regex ${name}-(\[0-9\\.\]+)${extract.suffix}
Deleted: trunk/dports/sysutils/smart/files/patch-Makefile
===================================================================
--- trunk/dports/sysutils/smart/files/patch-Makefile 2013-04-21 13:03:22 UTC (rev 105460)
+++ trunk/dports/sysutils/smart/files/patch-Makefile 2013-04-21 14:08:12 UTC (rev 105461)
@@ -1,13 +0,0 @@
---- Makefile.orig 2009-03-09 23:11:41.000000000 +0100
-+++ Makefile 2009-03-09 23:12:18.000000000 +0100
-@@ -45,8 +45,8 @@
- done
-
- test:
-- ./setup.py build_ext -i
-- LANG=C ./test $(TEST)
-+ $(PYTHON) setup.py build_ext -i
-+ LANG=C $(PYTHON) test $(TEST)
-
- .PHONY: clean smart.pot update-po check-po test
-
Modified: trunk/dports/sysutils/smart/files/patch-prefix.diff
===================================================================
--- trunk/dports/sysutils/smart/files/patch-prefix.diff 2013-04-21 13:03:22 UTC (rev 105460)
+++ trunk/dports/sysutils/smart/files/patch-prefix.diff 2013-04-21 14:08:12 UTC (rev 105461)
@@ -24,59 +24,85 @@
USERDATADIR = "~/.smart/"
CONFFILE = "config"
---- ./smart/plugins/detectsys.py.orig 2006-01-24 20:43:55.000000000 +0100
+--- ./smart/plugins/detectsys.py.orig 2010-12-03 23:08:06.000000000 +0100
+++ ./smart/plugins/detectsys.py 2007-06-18 10:43:26.000000000 +0200
-@@ -23,7 +23,7 @@ from smart import *
- import os
+@@ -24,7 +24,7 @@
def detectRPMSystem():
-- dir = os.path.join(sysconf.get("rpm-root", "/"), "var/lib/rpm")
-+ dir = os.path.join(sysconf.get("rpm-root", "/"), "@@PREFIX@@/var/lib/rpm")
- if os.path.isdir(dir):
+ dir = os.path.join(sysconf.get("rpm-root", "/"),
+- sysconf.get("rpm-dbpath", "var/lib/rpm"))
++ sysconf.get("rpm-dbpath", "@@PREFIX@@/var/lib/rpm"))
+ file = os.path.join(dir, "Packages")
+ if os.path.exists(file):
for alias in sysconf.keys("channels"):
- if sysconf.get(("channels", alias, "type")) == "rpm-sys":
-@@ -35,7 +35,7 @@
- })
+@@ -38,7 +38,7 @@
def detectDEBSystem():
-- dir = os.path.join(sysconf.get("deb-root", "/"), "var/lib/dpkg")
-+ dir = os.path.join(sysconf.get("deb-root", "/"), "@@PREFIX@@/var/lib/dpkg")
+ dir = os.path.join(sysconf.get("deb-root", "/"),
+- sysconf.get("deb-admindir", "var/lib/dpkg"))
++ sysconf.get("deb-admindir", "@@PREFIX@@/var/lib/dpkg"))
+ file = os.path.join(dir, "status")
+ if os.path.exists(file):
+ for alias in sysconf.keys("channels"):
+@@ -53,7 +53,7 @@
+ def detectSLACKSystem():
+ dir = os.path.join(sysconf.get("slack-root", "/"),
+ sysconf.get("slack-packages-dir",
+- "var/log/packages"))
++ "@@PREFIX@@/var/log/packages"))
if os.path.isdir(dir):
for alias in sysconf.keys("channels"):
- if sysconf.get(("channels", alias, "type")) == "deb-sys":
---- ./smart/backends/rpm/base.py.orig 2006-11-07 21:22:46.000000000 +0100
+ if sysconf.get(("channels", alias, "type")) == "slack-sys":
+@@ -67,7 +67,7 @@
+ def detectARCHSystem():
+ dir = os.path.join(sysconf.get("arch-root", "/"),
+ sysconf.get("arch-packages-dir",
+- "var/lib/pacman"))
++ "@@PREFIX@@/var/lib/pacman"))
+ if os.path.isdir(dir):
+ for alias in sysconf.keys("channels"):
+ if sysconf.get(("channels", alias, "type")) == "arch-sys":
+--- ./smart/backends/rpm/base.py.orig 2011-10-09 10:50:25.000000000 +0200
+++ ./smart/backends/rpm/base.py 2007-06-18 20:53:43.000000000 +0200
-@@ -53,7 +53,7 @@ def getTS(new=False):
+@@ -55,7 +55,7 @@
getTS.ts = rpm.ts(getTS.root)
if not sysconf.get("rpm-check-signatures", False):
getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
-- dbdir = os.path.join(getTS.root, "var/lib/rpm")
-+ dbdir = os.path.join(getTS.root, "@@PREFIX@@/var/lib/rpm")
+- rpm_dbpath = sysconf.get("rpm-dbpath", "var/lib/rpm")
++ rpm_dbpath = sysconf.get("rpm-dbpath", "@@PREFIX@@/var/lib/rpm")
+ dbdir = os.path.join(getTS.root, rpm_dbpath)
if not os.path.isdir(dbdir):
try:
- os.makedirs(dbdir)
---- ./smart/channels/rpm_sys.py.orig 2006-01-24 20:43:55.000000000 +0100
+--- ./smart/channels/rpm_sys.py.orig 2010-12-03 23:08:06.000000000 +0100
+++ ./smart/channels/rpm_sys.py 2007-06-18 20:53:33.000000000 +0200
-@@ -33,7 +33,7 @@ class RPMSysChannel(PackageChannel):
+@@ -33,7 +33,7 @@
def fetch(self, fetcher, progress):
getTS() # Make sure the db exists.
path = os.path.join(sysconf.get("rpm-root", "/"),
-- "var/lib/rpm/Packages")
-+ "@@PREFIX@@/var/lib/rpm/Packages")
+- sysconf.get("rpm-dbpath", "var/lib/rpm"),
++ sysconf.get("rpm-dbpath", "@@PREFIX@@/var/lib/rpm"),
+ "Packages")
digest = os.path.getmtime(path)
if digest == self._digest:
- return True
---- ./smart/channels/deb_sys.py.orig 2007-08-07 18:56:15.000000000 +0200
+--- ./smart/channels/deb_sys.py.orig 2010-12-03 23:08:06.000000000 +0100
+++ ./smart/channels/deb_sys.py 2008-01-28 11:55:32.000000000 +0100
-@@ -32,7 +32,7 @@ class DebSysChannel(PackageChannel):
+@@ -32,14 +32,14 @@
def fetch(self, fetcher, progress):
path = os.path.join(sysconf.get("deb-root", "/"),
-- "var/lib/dpkg/status")
-+ "@@PREFIX@@/var/lib/dpkg/status")
+- sysconf.get("deb-admindir", "var/lib/dpkg"),
++ sysconf.get("deb-admindir", "@@PREFIX@@/var/lib/dpkg"),
+ "status")
digest = os.path.getmtime(path)
if digest == self._digest:
return True
+ self.removeLoaders()
+ filelistspath = os.path.join(sysconf.get("deb-root", "/"),
+- sysconf.get("deb-admindir", "var/lib/dpkg"),
++ sysconf.get("deb-admindir", "@@PREFIX@@/var/lib/dpkg"),
+ "info")
+ changelogpath = os.path.join(sysconf.get("deb-root", "/"),
+ "usr/share/doc")
--- ./smart/plugins/channelsync.py.orig 2007-08-07 18:56:17.000000000 +0200
+++ ./smart/plugins/channelsync.py 2008-01-28 15:08:12.000000000 +0100
@@ -23,7 +23,7 @@ from smart.channel import *
@@ -88,16 +114,16 @@
def syncChannels(channelsdir, force=None):
---- ./smart/plugins/aptchannelsync.py.orig 2007-08-07 18:56:17.000000000 +0200
+--- ./smart/plugins/aptchannelsync.py.orig 2011-10-09 10:50:25.000000000 +0200
+++ ./smart/plugins/aptchannelsync.py 2008-01-28 15:08:04.000000000 +0100
-@@ -29,8 +29,8 @@ import sys
- if sys.version_info < (2, 4):
- from sets import Set as set
+@@ -35,8 +35,8 @@
+ from smart import *
+
-APT_SOURCES_DIR = "/etc/apt/sources.list.d/"
-APT_SOURCES = "/etc/apt/sources.list"
+APT_SOURCES_DIR = "@@PREFIX@@/etc/apt/sources.list.d/"
+APT_SOURCES = "@@PREFIX@@/etc/apt/sources.list"
- def _readSourcesList(file):
+ def _loadSourcesList(filename):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130421/a55d98ee/attachment-0001.html>
More information about the macports-changes
mailing list