[40891] trunk/dports/sysutils/smart
afb at macports.org
afb at macports.org
Fri Oct 17 01:06:27 PDT 2008
Revision: 40891
http://trac.macports.org/changeset/40891
Author: afb at macports.org
Date: 2008-10-17 01:06:27 -0700 (Fri, 17 Oct 2008)
Log Message:
-----------
port upgrade: smart 1.0 (while 1.1 is prepared)
Modified Paths:
--------------
trunk/dports/sysutils/smart/Portfile
Removed Paths:
-------------
trunk/dports/sysutils/smart/files/patch-archscore.diff
trunk/dports/sysutils/smart/files/patch-filetools.py
Modified: trunk/dports/sysutils/smart/Portfile
===================================================================
--- trunk/dports/sysutils/smart/Portfile 2008-10-17 08:05:40 UTC (rev 40890)
+++ trunk/dports/sysutils/smart/Portfile 2008-10-17 08:06:27 UTC (rev 40891)
@@ -3,8 +3,7 @@
PortSystem 1.0
name smart
-version 0.52
-revision 1
+version 1.0
platforms darwin freebsd
categories sysutils archivers
maintainers n3npq at mac.com afb at macports.org
@@ -19,12 +18,12 @@
homepage http://smartpm.org
master_sites http://labix.org/download/smart/
-checksums md5 f1681adedd18b86f679a53ad8361c9e9 \
- sha1 56e04b5bc2bfd3eb850da40baad7afc2ee256d0d \
- rmd160 16d692b4cd8c391bbf0b4578b998a54fc1ed6f4a
+checksums md5 f4b43912761ba100548921f34985b1d1 \
+ sha1 d239d08207f9308415cba72b3e87fbfc758463a0 \
+ rmd160 86472b44f56d4a3a1831e970177443e4569bc7e5
use_bzip2 yes
-patchfiles patch-prefix.diff patch-archscore.diff patch-filetools.py patch-deb_base.py
+patchfiles patch-prefix.diff patch-deb_base.py
depends_lib lib:librpm:rpm port:python24
### by default, it will run --shell interface.
Deleted: trunk/dports/sysutils/smart/files/patch-archscore.diff
===================================================================
--- trunk/dports/sysutils/smart/files/patch-archscore.diff 2008-10-17 08:05:40 UTC (rev 40890)
+++ trunk/dports/sysutils/smart/files/patch-archscore.diff 2008-10-17 08:06:27 UTC (rev 40891)
@@ -1,127 +0,0 @@
---- ./smart/backends/rpm/base.py.orig 2007-08-07 18:56:15.000000000 +0200
-+++ ./smart/backends/rpm/base.py 2007-12-21 13:49:53.000000000 +0100
-@@ -41,7 +41,10 @@ except ImportError:
- traceback.print_exc()
- raise Error, _("'rpm' python module is not available")
-
--archscore = rpm.archscore
-+try:
-+ archscore = rpm.archscore
-+except AttributeError:
-+ archscore = None
-
- __all__ = ["RPMPackage", "RPMProvides", "RPMNameProvides", "RPMPreRequires",
- "RPMRequires", "RPMUpgrades", "RPMConflicts", "RPMObsoletes",
-@@ -190,7 +193,7 @@ class RPMPackage(Package):
- otherver, otherarch = splitarch(other.version)
- if selfver != otherver:
- rc = vercmp(self.version, other.version)
-- if rc == 0:
-+ if archscore and rc == 0:
- rc = -cmp(archscore(selfarch), archscore(otherarch))
- return rc == -1
-
---- ./smart/backends/rpm/header.py.orig 2007-08-07 18:56:15.000000000 +0200
-+++ ./smart/backends/rpm/header.py 2007-12-21 13:49:22.000000000 +0100
-@@ -36,6 +36,11 @@ try:
- except ImportError:
- rpmhelper = None
-
-+try:
-+ archscore = rpm.archscore
-+except AttributeError:
-+ archscore = None
-+
- CRPMTAG_FILENAME = 1000000
- CRPMTAG_FILESIZE = 1000001
- CRPMTAG_MD5 = 1000005
-@@ -203,7 +208,7 @@ class RPMHeaderLoader(Loader):
- if h[1106]: # RPMTAG_SOURCEPACKAGE
- continue
- arch = h[1022] # RPMTAG_ARCH
-- if rpm.archscore(arch) == 0:
-+ if archscore and archscore(arch) == 0:
- continue
-
- name = h[1000] # RPMTAG_NAME
---- ./smart/backends/rpm/metadata.py.orig 2007-08-07 18:56:15.000000000 +0200
-+++ ./smart/backends/rpm/metadata.py 2007-12-21 13:49:22.000000000 +0100
-@@ -36,6 +36,11 @@ import posixpath
- import locale
- import os
-
-+try:
-+ archscore = rpm.archscore
-+except AttributeError:
-+ archscore = None
-+
- NS_COMMON = "http://linux.duke.edu/metadata/common"
- NS_RPM = "http://linux.duke.edu/metadata/rpm"
- NS_FILELISTS = "http://linux.duke.edu/metadata/filelists"
-@@ -168,7 +173,7 @@ class RPMMetaDataLoader(Loader):
- skip = None
-
- elif tag == ARCH:
-- if rpm.archscore(elem.text) == 0:
-+ if archscore and archscore(elem.text) == 0:
- skip = PACKAGE
- else:
- arch = elem.text
---- ./smart/backends/rpm/redcarpet.py.orig 2007-08-07 18:56:15.000000000 +0200
-+++ ./smart/backends/rpm/redcarpet.py 2007-12-21 13:49:22.000000000 +0100
-@@ -30,6 +30,11 @@ from xml.parsers import expat
-
- BYTESPERPKG = 3000
-
-+try:
-+ archscore = rpm.archscore
-+except AttributeError:
-+ archscore = None
-+
- class RPMRedCarpetPackageInfo(PackageInfo):
-
- def __init__(self, package, loader, info):
---- ./smart/backends/rpm/synthesis.py.orig 2007-08-07 18:56:15.000000000 +0200
-+++ ./smart/backends/rpm/synthesis.py 2007-12-21 13:49:22.000000000 +0100
-@@ -34,6 +34,10 @@ DEPENDSRE = re.compile("^([^[]*)(\[\*\])
- OPERATIONRE = re.compile("\[([<>=]*) *(.+)?\]")
- EPOCHRE = re.compile("[0-9]+:")
-
-+try:
-+ archscore = rpm.archscore
-+except AttributeError:
-+ archscore = None
-
- class URPMISynthesisPackageInfo(PackageInfo):
- def __init__(self, package, loader, info):
-@@ -165,7 +169,7 @@ class URPMISynthesisLoader(Loader):
- version, arch = version[:dot], version[dot+1:]
- versionarch = "@".join((version, arch))
-
-- if rpm.archscore(arch) == 0:
-+ if archscore and archscore(arch) == 0:
- continue
-
- name = "-".join(rpmnameparts[0:-2])
---- ./smart/backends/rpm/yast2.py.orig 2007-08-07 18:56:15.000000000 +0200
-+++ ./smart/backends/rpm/yast2.py 2007-12-21 13:49:22.000000000 +0100
-@@ -147,6 +147,10 @@ class YaST2Loader(Loader):
- # Wrapping the text added an extra lf as the first char
- return summary, description[1:]
-
-+try:
-+ archscore = rpm.archscore
-+except AttributeError:
-+ archscore = None
-
- def parseEntry(self):
- Pkg = RPMPackage
-@@ -181,7 +185,7 @@ class YaST2Loader(Loader):
- raise Error("Error loading YaST2 channel info. Possibly " \
- "corrupted file.\n%s" % self._pkginfofile)
-
-- if rpm.archscore(arch) <= 0:
-+ if archscore and archscore(arch) <= 0:
- return
- name = nameparts[0]
- self.curpkgname = name
Deleted: trunk/dports/sysutils/smart/files/patch-filetools.py
===================================================================
--- trunk/dports/sysutils/smart/files/patch-filetools.py 2008-10-17 08:05:40 UTC (rev 40890)
+++ trunk/dports/sysutils/smart/files/patch-filetools.py 2008-10-17 08:06:27 UTC (rev 40891)
@@ -1,14 +0,0 @@
---- ./smart/util/filetools.py.jbj 2005-08-27 19:27:09.000000000 -0400
-+++ ./smart/util/filetools.py 2005-08-27 19:28:33.000000000 -0400
-@@ -65,7 +65,10 @@
- pass
-
- def setCloseOnExecAll():
-- for fd in range(3,resource.getrlimit(resource.RLIMIT_NOFILE)[1]):
-+ nfmax = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
-+ if nfmax > 4096:
-+ nfmax = 4096
-+ for fd in range(3,nfmax):
- try:
- flags = fcntl.fcntl(fd, fcntl.F_GETFL, 0)
- flags |= fcntl.FD_CLOEXEC
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081017/0808af6d/attachment.html
More information about the macports-changes
mailing list