[22917] trunk/dports/sysutils/rpm

[source_changes at macosforge.org]

Revision: 22917
          http://trac.macosforge.org/projects/macports/changeset/22917
Author:   ryandesign at macports.org
Date:     2007-03-19 02:09:02 -0700 (Mon, 19 Mar 2007)

Log Message:
-----------
#11580: Updated to rpm 4.4.6

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile
    trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in

Removed Paths:
-------------
    trunk/dports/sysutils/rpm/files/patch-lib-rpmds

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2007-03-19 09:00:10 UTC (rev 22916)
+++ trunk/dports/sysutils/rpm/Portfile	2007-03-19 09:09:02 UTC (rev 22917)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name			rpm
-version			4.4.5
+version			4.4.6
 platforms		darwin
 categories		sysutils archivers
 maintainers		n3npq at mac.com
@@ -16,7 +16,7 @@
 
 master_sites		http://wraptastic.org/pub/rpm-4.4.x/
 distfiles		rpm-${version}.tar.gz
-checksums		md5 d5f434789c0c56d05d77be6f4262a561
+checksums		md5 baa6f371446c65b4080d1cd1f194a7ae
 
 depends_lib		lib:libhistory.5:readline port:gettext \
 			lib:libsqlite3.0:sqlite3
@@ -25,10 +25,11 @@
 			port:python24 port:popt \
 			port:readline port:beecrypt \
 			port:libiconv port:gettext
-depends_run		port:gzip
+depends_run		port:gzip \
+			port:openssl \
+			port:bzip2 \
+			port:perl5.8
 
-			###you do *not* want these installed, instead use "/usr":
-			#lib:libssl:openssl lib:libbz2:bzip2 path:perl:perl5.8
 			###zlib should be replaced with the internal rpm version:
 			#lib:libz:zlib
 			###"expat" is for libneon, and "readline" is for rpm lua
@@ -51,7 +52,6 @@
 variant darwin {
 	patchfiles-append \
 		patch-file-src-Makefile.in \
-		patch-lib-rpmds \
 		patch-macros.in
 
 	post-patch {

Modified: trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in	2007-03-19 09:00:10 UTC (rev 22916)
+++ trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in	2007-03-19 09:09:02 UTC (rev 22917)
@@ -1,7 +1,7 @@
---- file/src/Makefile.in.orig	2005-06-16 13:24:54.000000000 -0700
-+++ file/src/Makefile.in	2005-06-16 13:26:45.000000000 -0700
+--- file/src/Makefile.in.orig	2007-03-18 09:33:43.000000000 -0700
++++ file/src/Makefile.in	2007-03-18 09:34:05.000000000 -0700
 @@ -124,7 +124,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@

Deleted: trunk/dports/sysutils/rpm/files/patch-lib-rpmds
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-lib-rpmds	2007-03-19 09:00:10 UTC (rev 22916)
+++ trunk/dports/sysutils/rpm/files/patch-lib-rpmds	2007-03-19 09:09:02 UTC (rev 22917)
@@ -1,45 +0,0 @@
-Index: lib/rpmds.c
-===================================================================
-RCS file: /cvs/devel/rpm/lib/rpmds.c,v
-retrieving revision 2.54.2.23
-diff -u -r2.54.2.23 rpmds.c
---- lib/rpmds.c	9 Dec 2005 19:29:30 -0000	2.54.2.23
-+++ lib/rpmds.c	7 Mar 2006 16:16:27 -0000
-@@ -2425,6 +2425,7 @@
- 	case SYSCONF:
- 	    value = sysconf(c->call_name);
- 	    if (value == -1l) {
-+#if defined(_SC_UINT_MAX) && defined(_SC_ULONG_MAX)
- /*@-unrecog@*/
- 		if (c->call_name == _SC_UINT_MAX
- 		|| c->call_name == _SC_ULONG_MAX) {
-@@ -2432,6 +2433,7 @@
- 		    sprintf(EVR, "%lu", value);
- 		}
- /*@=unrecog@*/
-+#endif
- 	    } else {
- 		EVR = xmalloc(32);
- 		sprintf(EVR, "%ld", value);
-@@ -2441,8 +2443,10 @@
- 	    clen = confstr(c->call_name, (char *) NULL, 0);
- 	    EVR = xmalloc(clen+1);
- 	    *EVR = '\0';
--	    if (confstr (c->call_name, EVR, clen) != clen)
--		error (3, errno, "confstr");
-+	    if (confstr (c->call_name, EVR, clen) != clen) {
-+		fprintf(stderr, "confstr: %s\n", strerror(errno));
-+		exit (3);
-+	    }
- 	    EVR[clen] = '\0';
- 	    /*@switchbreak@*/ break;
- 	}
-@@ -2924,7 +2928,7 @@
- #endif
-     if (un->machine != NULL)
- 	rpmdsNSAdd(dsp, NS, "machine", un->machine, RPMSENSE_EQUAL);
--#if defined(_GNU_SOURCE)
-+#if defined(__linux__)
-     if (un->domainname != NULL && strcmp(un->domainname, "(none)"))
- 	rpmdsNSAdd(dsp, NS, "domainname", un->domainname, RPMSENSE_EQUAL);
- #endif

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070319/9ff78682/attachment.html