[44832] trunk/dports/sysutils/rpm-devel

[afb at macports.org]

Revision: 44832
          http://trac.macports.org/changeset/44832
Author:   afb at macports.org
Date:     2009-01-03 02:33:24 -0800 (Sat, 03 Jan 2009)
Log Message:
-----------
update snapshot, copy missing python patch from rpm51

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

Added Paths:
-----------
    trunk/dports/sysutils/rpm-devel/files/patch-configure

Removed Paths:
-------------
    trunk/dports/sysutils/rpm-devel/files/patch-configure

Modified: trunk/dports/sysutils/rpm-devel/Portfile
===================================================================
--- trunk/dports/sysutils/rpm-devel/Portfile	2009-01-03 10:25:25 UTC (rev 44831)
+++ trunk/dports/sysutils/rpm-devel/Portfile	2009-01-03 10:33:24 UTC (rev 44832)
@@ -4,7 +4,7 @@
 
 name			rpm-devel
 version			5.2
-revision		20081130
+revision		20081230
 platforms		darwin freebsd linux
 categories		sysutils archivers
 maintainers		n3npq at mac.com afb at macports.org
@@ -17,9 +17,9 @@
 
 homepage		http://rpm5.org
 master_sites		${homepage}/files/rpm/rpm-5.2/SNAPSHOT
-set distdate		20081130
+set distdate		20081230
 distname		rpm-${version}.SNAPSHOT.${distdate}
-checksums		md5 5bec470ab870c996382f59e162cbf369
+checksums		md5 56f85cb4f23b6ca27e3a7cdf1c6f26ce
 worksrcdir		${distname}
 #
 ### CVS source
@@ -43,7 +43,7 @@
                         bin:bzip2:bzip2 \
                         bin:unzip:unzip
 
-patchfiles		patch-macros.in
+patchfiles		patch-macros.in patch-configure
 
 build.type		gnu
 

Deleted: trunk/dports/sysutils/rpm-devel/files/patch-configure
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-configure	2009-01-03 10:25:25 UTC (rev 44831)
+++ trunk/dports/sysutils/rpm-devel/files/patch-configure	2009-01-03 10:33:24 UTC (rev 44832)
@@ -1,24 +0,0 @@
---- configure.orig	2007-06-22 01:21:33.000000000 +0200
-+++ configure	2007-06-22 01:23:43.000000000 +0200
-@@ -27309,8 +27309,8 @@
- if test $ac_cv_lib_popt_poptGetContext = yes; then
- 
-       WITH_POPT_SUBDIR=
--      WITH_POPT_INCLUDE=
--      WITH_POPT_LIB="-lpopt"
-+      WITH_POPT_INCLUDE='-I${prefix}/include'
-+      WITH_POPT_LIB='${prefix}/lib/libpopt.la'
- 
- fi
- 
-@@ -27545,8 +27545,8 @@
- _ACEOF
- 
-     WITH_SQLITE3_SUBDIR=
--    WITH_SQLITE3_INCLUDE=
--    WITH_SQLITE3_LIB="-lsqlite"
-+    WITH_SQLITE3_INCLUDE='-I${prefix}/include'
-+    WITH_SQLITE3_LIB='${prefix}/lib/libsqlite3.la'
-     DBLIBSRCS="$DBLIBSRCS sqlite.c"
- 
- fi

Copied: trunk/dports/sysutils/rpm-devel/files/patch-configure (from rev 44830, trunk/dports/sysutils/rpm51/files/patch-configure)
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-configure	                        (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-configure	2009-01-03 10:33:24 UTC (rev 44832)
@@ -0,0 +1,34 @@
+--- ./configure.ac.orig	2008-10-18 09:29:28.000000000 +0200
++++ ./configure.ac	2009-01-03 11:10:54.000000000 +0100
+@@ -925,9 +925,9 @@ AC_ARG_WITH(python, AS_HELP_STRING([--wi
+ 	done
+     fi
+     AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
+-	    [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`(python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()') 2>/dev/null`"])
++	    [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`(${__PYTHON} -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()') 2>/dev/null`"])
+     AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
+-	    [pythondir="$withval"], [pythondir="`(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)') 2>/dev/null`"])
++	    [pythondir="$withval"], [pythondir="`(${__PYTHON} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)') 2>/dev/null`"])
+ ])
+ AC_SUBST(WITH_PYTHON_SUBDIR)
+ AC_SUBST(WITH_PYTHON_SUBPACKAGE)
+--- ./configure.orig	2008-10-18 09:30:26.000000000 +0200
++++ ./configure	2009-01-03 11:12:04.000000000 +0100
+@@ -29901,7 +29901,7 @@ fi
+ if test "${with_python_inc_dir+set}" = set; then
+   withval=$with_python_inc_dir; WITH_PYTHON_INCDIR="$withval"
+ else
+-  WITH_PYTHON_INCDIR="`(python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()') 2>/dev/null`"
++  WITH_PYTHON_INCDIR="`(${__PYTHON} -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()') 2>/dev/null`"
+ fi
+ 
+ 
+@@ -29909,7 +29909,7 @@ fi
+ if test "${with_python_lib_dir+set}" = set; then
+   withval=$with_python_lib_dir; pythondir="$withval"
+ else
+-  pythondir="`(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)') 2>/dev/null`"
++  pythondir="`(${__PYTHON} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)') 2>/dev/null`"
+ fi
+ 
+ 


Property changes on: trunk/dports/sysutils/rpm-devel/files/patch-configure
___________________________________________________________________
Added: svn:mergeinfo
   + 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090103/36254621/attachment.html>