[26913] trunk/dports/sysutils/apt-rpm

[source_changes at macosforge.org]

Revision: 26913
          http://trac.macosforge.org/projects/macports/changeset/26913
Author:   afb at macports.org
Date:     2007-07-11 04:27:21 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
version upgrade, avoid patching configure

Modified Paths:
--------------
    trunk/dports/sysutils/apt-rpm/Portfile

Removed Paths:
-------------
    trunk/dports/sysutils/apt-rpm/files/patch-rpminclude.diff

Modified: trunk/dports/sysutils/apt-rpm/Portfile
===================================================================
--- trunk/dports/sysutils/apt-rpm/Portfile	2007-07-11 08:44:53 UTC (rev 26912)
+++ trunk/dports/sysutils/apt-rpm/Portfile	2007-07-11 11:27:21 UTC (rev 26913)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		apt-rpm
-version		0.5.15lorg3.91
+version		0.5.15lorg3.92
 platforms	darwin freebsd
 categories	sysutils
 maintainers	afb at macports.org
@@ -18,12 +18,12 @@
 master_sites	${homepage}testing/
 distname	apt-${version}
 use_bzip2	yes
-checksums	md5 9af3e42693f494fb619a60542dfa30ca
+checksums	md5 e851d86f9aef7fb519ecc7cfa8aae845
 
 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-rpminclude.diff patch-rpmsense.diff patch-rpmfdigests.diff patch-rpmpsnum.diff
+		patch-rpmsense.diff patch-rpmfdigests.diff patch-rpmpsnum.diff
 
 post-patch {
 		reinplace "s;\"/\";\"${prefix}\";" apt-pkg/init.cc
@@ -31,6 +31,8 @@
 		reinplace "s;/var/cache/apt;${prefix}/var/cache/apt;" tools/cached_md5.cc
 }
 
+configure.cxxflags -I${prefix}/include/rpm
+
 post-destroot {
 		copy -force ${filespath}/apt.conf ${destroot}${prefix}/etc/apt/apt.conf
 		reinplace "s|@@ARCH@@|${os.arch}|g" ${destroot}${prefix}/etc/apt/apt.conf

Deleted: trunk/dports/sysutils/apt-rpm/files/patch-rpminclude.diff
===================================================================
--- trunk/dports/sysutils/apt-rpm/files/patch-rpminclude.diff	2007-07-11 08:44:53 UTC (rev 26912)
+++ trunk/dports/sysutils/apt-rpm/files/patch-rpminclude.diff	2007-07-11 11:27:21 UTC (rev 26913)
@@ -1,22 +0,0 @@
---- ./configure.ac.orig	2007-06-16 22:45:31.000000000 +0200
-+++ ./configure.ac	2007-06-20 09:56:37.000000000 +0200
-@@ -74,7 +74,7 @@
- 		[AC_MSG_ERROR([Can't find libz library])])
-    AC_CHECK_HEADERS(db1/db.h)
- 
--   CPPFLAGS="$CPPFLAGS -I/usr/include/rpm"
-+   CPPFLAGS="$CPPFLAGS -I$includedir/rpm"
-    AC_CHECK_HEADER(rpm/rpmlib.h, [],
- 		   [AC_MSG_ERROR([Can't find rpmlib.h])])
- 
---- ./configure.orig	2007-06-16 22:46:35.000000000 +0200
-+++ ./configure	2007-06-20 09:56:16.000000000 +0200
-@@ -21591,7 +21591,7 @@
- done
- 
- 
--   CPPFLAGS="$CPPFLAGS -I/usr/include/rpm"
-+   CPPFLAGS="$CPPFLAGS -I$includedir/rpm"
-    if test "${ac_cv_header_rpm_rpmlib_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for rpm/rpmlib.h" >&5
- echo $ECHO_N "checking for rpm/rpmlib.h... $ECHO_C" >&6; }

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