[47957] trunk/dports/sysutils/rpm-devel
afb at macports.org
afb at macports.org
Wed Mar 11 08:47:44 PDT 2009
Revision: 47957
http://trac.macports.org/changeset/47957
Author: afb at macports.org
Date: 2009-03-11 08:47:43 -0700 (Wed, 11 Mar 2009)
Log Message:
-----------
update snapshot, enable xz
Modified Paths:
--------------
trunk/dports/sysutils/rpm-devel/Portfile
trunk/dports/sysutils/rpm-devel/files/patch-macros.in
Added Paths:
-----------
trunk/dports/sysutils/rpm-devel/files/patch-rpmzq.c
Removed Paths:
-------------
trunk/dports/sysutils/rpm-devel/files/patch-configure
Modified: trunk/dports/sysutils/rpm-devel/Portfile
===================================================================
--- trunk/dports/sysutils/rpm-devel/Portfile 2009-03-11 15:26:16 UTC (rev 47956)
+++ trunk/dports/sysutils/rpm-devel/Portfile 2009-03-11 15:47:43 UTC (rev 47957)
@@ -4,7 +4,7 @@
name rpm-devel
version 5.2
-revision 20081230
+revision 20090308
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 20081230
+set distdate 20090308
distname rpm-${version}.SNAPSHOT.${distdate}
-checksums md5 56f85cb4f23b6ca27e3a7cdf1c6f26ce
+checksums md5 185671bfcd5ab0021b32dcaddd29b7fa
worksrcdir ${distname}
#
### CVS source
@@ -36,14 +36,14 @@
depends_lib lib:libhistory.5:readline port:gettext \
port:popt port:sqlite3 port:xar-devel \
- port:pcre port:ossp-uuid
+ port:liblzma port:pcre port:ossp-uuid
depends_run port:openssl \
bin:gzip:gzip \
bin:bzip2:bzip2 \
bin:unzip:unzip
-patchfiles patch-macros.in patch-configure
+patchfiles patch-macros.in patch-rpmzq.c
build.type gnu
@@ -51,7 +51,7 @@
--with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
--mandir=${prefix}/share/man --infodir=${prefix}/share/info \
--with-python=2.5 --with-perl --with-sqlite --with-dbapi=sqlite \
- --with-xar=external --with-pcre=external --with-uuid=external \
+ --with-xar=external --with-xz=external --with-pcre=external --with-uuid=external \
--without-apidocs --sysconfdir=${prefix}/etc --with-path-cfg=${prefix}/etc/rpm
configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8
Deleted: trunk/dports/sysutils/rpm-devel/files/patch-configure
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-configure 2009-03-11 15:26:16 UTC (rev 47956)
+++ trunk/dports/sysutils/rpm-devel/files/patch-configure 2009-03-11 15:47:43 UTC (rev 47957)
@@ -1,34 +0,0 @@
---- ./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
-
-
Modified: trunk/dports/sysutils/rpm-devel/files/patch-macros.in
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-macros.in 2009-03-11 15:26:16 UTC (rev 47956)
+++ trunk/dports/sysutils/rpm-devel/files/patch-macros.in 2009-03-11 15:47:43 UTC (rev 47957)
@@ -9,12 +9,12 @@
# shadow tree.
#
# A spec file can %%define _find_debuginfo_opts to pass options to
-@@ -311,7 +311,7 @@
-
- # The PATH put into the environment before running %pre/%post et al.
+@@ -314,7 +314,7 @@
#
--%_install_script_path /sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
-+%_install_script_path @prefix@/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
+ %_install_helpers %{rpmhome}/helpers
+ %_helperpath %{?_install_helpers:%{_install_helpers}:}
+-%_install_script_path %{_helperpath}/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
++%_install_script_path %{_helperpath}/sbin:@prefix@/bin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
# A colon separated list of desired locales to be installed;
# "all" means install all locale specific files.
Added: trunk/dports/sysutils/rpm-devel/files/patch-rpmzq.c
===================================================================
--- trunk/dports/sysutils/rpm-devel/files/patch-rpmzq.c (rev 0)
+++ trunk/dports/sysutils/rpm-devel/files/patch-rpmzq.c 2009-03-11 15:47:43 UTC (rev 47957)
@@ -0,0 +1,13 @@
+--- rpmio/rpmzq.c.orig 2009-03-09 03:27:30.000000000 +0100
++++ rpmio/rpmzq.c 2009-03-11 16:39:01.000000000 +0100
+@@ -71,6 +71,10 @@
+
+ #include "debug.h"
+
++#if !defined(POPT_ARGFLAG_TOGGLE) /* XXX compat with popt < 1.15 */
++#define POPT_ARGFLAG_TOGGLE 0
++#endif
++
+ /*@unchecked@*/
+ int _rpmzq_debug = 0;
+
Property changes on: trunk/dports/sysutils/rpm-devel/files/patch-rpmzq.c
___________________________________________________________________
Added: svn:eol-style
+ native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090311/5e9e58bf/attachment.html>
More information about the macports-changes
mailing list