[91204] trunk/dports/sysutils/rpm

[afb at macports.org]

Revision: 91204
          https://trac.macports.org/changeset/91204
Author:   afb at macports.org
Date:     2012-03-25 14:13:27 -0700 (Sun, 25 Mar 2012)
Log Message:
-----------
rpm: add +python25 variant, fix +universal variant (#33748)

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile
    trunk/dports/sysutils/rpm/files/patch-configure
    trunk/dports/sysutils/rpm/files/patch-db3-configure

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

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2012-03-25 19:45:02 UTC (rev 91203)
+++ trunk/dports/sysutils/rpm/Portfile	2012-03-25 21:13:27 UTC (rev 91204)
@@ -4,7 +4,7 @@
 
 name			rpm
 version			4.4.9
-revision                12
+revision                13
 platforms		darwin freebsd linux
 license			GPL-2 LGPL-2
 categories		sysutils archivers
@@ -52,6 +52,7 @@
 			patch-macros.in \
 			patch-configure \
 			patch-db3-configure \
+			patch-zlib-configure \
 			patch-Makefile.PL \
 			patch-darwin.prov \
 			patch-fts.c \
@@ -126,6 +127,15 @@
 	configure.args-append --with-apidocs
 }
 
+variant python25 description { use python 2.5 instead of python 2.4 } {
+	depends_build-delete	port:python24
+	depends_build-append	port:python25
+	configure.args-delete	--with-python=2.4
+	configure.args-append	--with-python=2.5
+	configure.env-delete	__PYTHON=${prefix}/bin/python2.4
+	configure.env-append	__PYTHON=${prefix}/bin/python2.5
+}
+
 livecheck.type	regex
 # get the last modified tarball
 livecheck.url	${master_sites}

Modified: trunk/dports/sysutils/rpm/files/patch-configure
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-configure	2012-03-25 19:45:02 UTC (rev 91203)
+++ trunk/dports/sysutils/rpm/files/patch-configure	2012-03-25 21:13:27 UTC (rev 91204)
@@ -1,5 +1,14 @@
 --- configure.orig	2007-06-22 01:21:33.000000000 +0200
 +++ configure	2007-06-22 01:23:43.000000000 +0200
+@@ -5347,7 +5347,7 @@
+ 
+ if test "$ac_cv_c_compiler_gnu" = yes; then
+     CFLAGS="$CFLAGS -fPIC -DPIC -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
+-    LDFLAGS="-pie"
++    LDFLAGS="$LDFLAGS -pie"
+ fi
+ export CFLAGS LDFLAGS
+ 
 @@ -27309,8 +27309,8 @@
  if test $ac_cv_lib_popt_poptGetContext = yes; then
  

Modified: trunk/dports/sysutils/rpm/files/patch-db3-configure
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-db3-configure	2012-03-25 19:45:02 UTC (rev 91203)
+++ trunk/dports/sysutils/rpm/files/patch-db3-configure	2012-03-25 21:13:27 UTC (rev 91204)
@@ -5,7 +5,16 @@
  
  # XXX edit CFLAGS= ... out of invocation args ???
 -ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
-+ARGS="`echo $* | sed -e 's%-arch [^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
++ARGS="`echo $* | sed -e 's%-arch [^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% [^ ]*LDFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
  
  CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
  	--enable-shared --enable-static --enable-rpc \
+@@ -10,7 +10,7 @@
+ # XXX edit CFLAGS= ... out of invocation args ???
+ ARGS="`echo $* | sed -e 's%-arch [^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
+ 
+-CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
++CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $db_dist/configure $ARGS \
+ 	--enable-shared --enable-static --enable-rpc \
+ 	--with-uniquename=_rpmdb --srcdir=$db_dist
+ 

Added: trunk/dports/sysutils/rpm/files/patch-zlib-configure
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-zlib-configure	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-zlib-configure	2012-03-25 21:13:27 UTC (rev 91204)
@@ -0,0 +1,11 @@
+--- zlib/configure.orig	2007-04-11 10:40:05.000000000 +0200
++++ zlib/configure	2012-03-25 21:14:36.000000000 +0200
+@@ -19645,7 +19645,7 @@
+ fi
+ 
+ 
+-CFLAGS="-DHAS_snprintf -DHAS_snprintf"
++CFLAGS="$CFLAGS -DHAS_snprintf -DHAS_snprintf"
+ if test "$ac_cv_c_compiler_gnu" = yes; then
+     CFLAGS="-DWITH_RSYNC_PAD -O3 -fomit-frame-pointer -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts $CFLAGS"
+ fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120325/a2b82c67/attachment.html>