[28177] trunk/dports/sysutils/apt-rpm
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 23 12:53:42 PDT 2007
Revision: 28177
http://trac.macosforge.org/projects/macports/changeset/28177
Author: afb at macports.org
Date: 2007-08-23 12:53:42 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
minor version update for testing version
* lots of patches accepted upstream :-)
* added distcheck for download directory
Modified Paths:
--------------
trunk/dports/sysutils/apt-rpm/Portfile
trunk/dports/sysutils/apt-rpm/files/patch-rpmsense.diff
Removed Paths:
-------------
trunk/dports/sysutils/apt-rpm/files/patch-langinfo.diff
trunk/dports/sysutils/apt-rpm/files/patch-ostable.diff
trunk/dports/sysutils/apt-rpm/files/patch-rpmfdigests.diff
trunk/dports/sysutils/apt-rpm/files/patch-rpmpsnum.diff
trunk/dports/sysutils/apt-rpm/files/patch-scandir.diff
Modified: trunk/dports/sysutils/apt-rpm/Portfile
===================================================================
--- trunk/dports/sysutils/apt-rpm/Portfile 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/Portfile 2007-08-23 19:53:42 UTC (rev 28177)
@@ -3,7 +3,7 @@
PortSystem 1.0
name apt-rpm
-version 0.5.15lorg3.92
+version 0.5.15lorg3.93
platforms darwin freebsd
categories sysutils
maintainers afb at macports.org
@@ -18,12 +18,11 @@
master_sites ${homepage}testing/
distname apt-${version}
use_bzip2 yes
-checksums md5 e851d86f9aef7fb519ecc7cfa8aae845
+checksums md5 5437ac203f7fe15b9bbd74b3c99e2b6a
depends_lib lib:librpm:rpm lib:libxml2:libxml2 lib:libsqlite3:sqlite3
-patchfiles patch-ostable.diff patch-genbasedir.diff patch-langinfo.diff patch-scandir.diff \
- patch-rpmsense.diff patch-rpmfdigests.diff patch-rpmpsnum.diff
+patchfiles patch-genbasedir.diff patch-rpmsense.diff
post-patch {
reinplace "s;\"/\";\"${prefix}\";" apt-pkg/init.cc
@@ -50,3 +49,8 @@
${destroot}${prefix}/var/cache/apt/archives/partial \
${destroot}${prefix}/var/lib/apt/lists/partial
}
+
+livecheck.check regex
+# get the last modified tarball
+livecheck.url ${master_sites}?M=D
+livecheck.regex apt-(.*)${extract.suffix}
Deleted: trunk/dports/sysutils/apt-rpm/files/patch-langinfo.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-langinfo.diff 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/files/patch-langinfo.diff 2007-08-23 19:53:42 UTC (rev 28177)
@@ -1,10 +0,0 @@
---- cmdline/cmdline.cc.orig 2007-03-18 20:56:14.000000000 +0100
-+++ cmdline/cmdline.cc 2007-06-20 13:50:35.000000000 +0200
-@@ -12,6 +12,7 @@
- #include <regex.h>
- #include <sys/stat.h>
- #include <fnmatch.h>
-+#include <langinfo.h>
-
- using namespace std;
-
Deleted: trunk/dports/sysutils/apt-rpm/files/patch-ostable.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-ostable.diff 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/files/patch-ostable.diff 2007-08-23 19:53:42 UTC (rev 28177)
@@ -1,13 +0,0 @@
---- buildlib/ostable.orig 2007-02-23 16:36:43.000000000 +0100
-+++ buildlib/ostable 2007-06-20 09:45:36.000000000 +0200
-@@ -11,6 +11,10 @@
- [^-]*-kfreebsd.*-gnu freebsd
- [^-]*-gnu[^-]* hurd
-
-+# These are used by MacPorts
-+[^-]*-darwin.* darwin
-+[^-]*-freebsd.* freebsd
-+
- # These are samples.
- hp-hpux[^-]* hp-ux
- sun-solaris[^-]* solaris
Deleted: trunk/dports/sysutils/apt-rpm/files/patch-rpmfdigests.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-rpmfdigests.diff 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/files/patch-rpmfdigests.diff 2007-08-23 19:53:42 UTC (rev 28177)
@@ -1,19 +0,0 @@
---- ./apt-pkg/rpm/rpmpm.cc.orig 2007-05-29 20:59:09.000000000 +0200
-+++ ./apt-pkg/rpm/rpmpm.cc 2007-06-20 11:28:44.000000000 +0200
-@@ -951,9 +951,15 @@
- *tsFlags |= RPMTRANS_FLAG_JUSTDB;
- else if (Opts->Value == "--test")
- *tsFlags |= RPMTRANS_FLAG_TEST;
--#if RPM_VERSION >= 0x040000
-+#if RPM_VERSION >= 0x040000 && RPM_VERSION < 0x040400
- else if (Opts->Value == "--nomd5")
- *tsFlags |= RPMTRANS_FLAG_NOMD5;
-+#endif
-+#if RPM_VERSION >= 0x040400
-+ else if (Opts->Value == "--nofdigests")
-+ *tsFlags |= RPMTRANS_FLAG_NOFDIGESTS;
-+#endif
-+#if RPM_VERSION >= 0x040000
- else if (Opts->Value == "--repackage")
- *tsFlags |= RPMTRANS_FLAG_REPACKAGE;
- #endif
Deleted: trunk/dports/sysutils/apt-rpm/files/patch-rpmpsnum.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-rpmpsnum.diff 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/files/patch-rpmpsnum.diff 2007-08-23 19:53:42 UTC (rev 28177)
@@ -1,20 +0,0 @@
---- ./apt-pkg/rpm/rpmpm.cc.orig 2007-06-20 13:16:55.000000000 +0200
-+++ ./apt-pkg/rpm/rpmpm.cc 2007-06-20 13:21:31.000000000 +0200
-@@ -850,7 +850,7 @@
- if (_config->FindB("RPM::NoDeps", false) == false) {
- rc = rpmtsCheck(TS);
- probs = rpmtsProblems(TS);
-- if (rc || probs->numProblems > 0) {
-+ if (rc || rpmpsNumProblems(probs) > 0) {
- rpmpsPrint(NULL, probs);
- rpmpsFree(probs);
- _error->Error(_("Transaction set check failed"));
-@@ -906,7 +906,7 @@
-
- if (rc > 0) {
- _error->Error(_("Error while running transaction"));
-- if (probs->numProblems > 0)
-+ if (rpmpsNumProblems(probs) > 0)
- rpmpsPrint(stderr, probs);
- } else {
- Success = true;
Modified: trunk/dports/sysutils/apt-rpm/files/patch-rpmsense.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-rpmsense.diff 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/files/patch-rpmsense.diff 2007-08-23 19:53:42 UTC (rev 28177)
@@ -1,42 +1,25 @@
---- ./apt-pkg/rpm/rpmhandler.cc.orig 2007-06-04 22:02:52.000000000 +0200
-+++ ./apt-pkg/rpm/rpmhandler.cc 2007-06-20 10:58:35.000000000 +0200
-@@ -48,6 +48,11 @@
+--- ./apt-pkg/rpm/rpmhandler.cc.orig 2007-08-17 12:49:37.000000000 +0200
++++ ./apt-pkg/rpm/rpmhandler.cc 2007-08-23 21:44:36.000000000 +0200
+@@ -60,6 +60,12 @@
#define rpmxxInitIterator(a,b,c,d) rpmdbInitIterator(a,b,c,d)
#endif
-+#ifndef _RPMEVR_INTERNAL
++#if RPM_VERSION >= 0x040409 && !defined(_RPMEVR_INTERNAL)
+// rpmevr.h/evrFlags_e
+#define RPMSENSE_ANY 0
++#define RPMSENSE_MISSINGOK (1 << 19)
+#endif
+
// An attempt to deal with false zero epochs from repomd. With older rpm's we
// can only blindly trust the repo admin created the repository with options
// suitable for those versions. For rpm >= 4.2.1 this is linked with
-@@ -231,7 +236,7 @@
- if (Type == pkgCache::Dep::Depends) {
- if (flags & RPMSENSE_PREREQ)
- Type = pkgCache::Dep::PreDepends;
--#if RPM_VERSION >= 0x040403
-+#if RPM_VERSION >= 0x040403 && defined(_RPMEVR_INTERNAL)
- else if (flags & RPMSENSE_MISSINGOK)
- Type = pkgCache::Dep::Suggests;
- #endif
-@@ -308,7 +313,7 @@
- case pkgCache::Dep::Provides:
- deptype = RPMTAG_PROVIDENAME;
- break;
--#if RPM_VERSION >= 0x040403
-+#if RPM_VERSION >= 0x040403 && defined(_RPMEVR_INTERNAL)
- case pkgCache::Dep::Suggests:
- deptype = RPMTAG_SUGGESTNAME;
- break;
---- ./apt-pkg/rpm/rpmversion.cc.orig 2007-05-29 20:59:09.000000000 +0200
+--- ./apt-pkg/rpm/rpmversion.cc.orig 2007-05-14 11:01:55.000000000 +0200
+++ ./apt-pkg/rpm/rpmversion.cc 2007-06-20 13:42:04.000000000 +0200
@@ -32,6 +32,11 @@
#include <rpm/rpmds.h>
#endif
-+#ifndef _RPMEVR_INTERNAL
++#if RPM_VERSION >= 0x040409 && !defined(_RPMEVR_INTERNAL)
+// rpmevr.h/evrFlags_e
+#define RPMSENSE_ANY 0
+#endif
Deleted: trunk/dports/sysutils/apt-rpm/files/patch-scandir.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-scandir.diff 2007-08-23 19:36:22 UTC (rev 28176)
+++ trunk/dports/sysutils/apt-rpm/files/patch-scandir.diff 2007-08-23 19:53:42 UTC (rev 28177)
@@ -1,28 +0,0 @@
---- ./tools/genpkglist.cc.orig 2007-03-18 20:09:42.000000000 +0100
-+++ ./tools/genpkglist.cc 2007-06-20 14:02:05.000000000 +0200
-@@ -334,7 +334,11 @@
- }
-
-
-+#if defined(__APPLE__) || defined(__FREEBSD__)
-+int selectDirent(struct dirent *ent)
-+#else
- int selectDirent(const struct dirent *ent)
-+#endif
- {
- int state = 0;
- const char *p = ent->d_name;
---- tools//gensrclist.cc.orig 2007-03-18 20:09:42.000000000 +0100
-+++ tools//gensrclist.cc 2007-06-20 14:03:32.000000000 +0200
-@@ -55,7 +55,11 @@
- };
- int numTags = sizeof(tags) / sizeof(int);
-
-+#if defined(__APPLE__) || defined(__FREEBSD__)
-+int selectDirent(struct dirent *ent)
-+#else
- int selectDirent(const struct dirent *ent)
-+#endif
- {
- int state = 0;
- const char *p = ent->d_name;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070823/039b2317/attachment.html
More information about the macports-changes
mailing list