[91205] trunk/dports/sysutils
afb at macports.org
afb at macports.org
Sun Mar 25 14:56:06 PDT 2012
Revision: 91205
https://trac.macports.org/changeset/91205
Author: afb at macports.org
Date: 2012-03-25 14:56:06 -0700 (Sun, 25 Mar 2012)
Log Message:
-----------
rpm53: add port, use bdb not sqlite
Modified Paths:
--------------
trunk/dports/sysutils/rpm53/Portfile
Added Paths:
-----------
trunk/dports/sysutils/rpm53/
trunk/dports/sysutils/rpm53/files/rpm2cpio.sh
trunk/dports/sysutils/rpm53/files/rpm_patchset_16081.diff
Removed Paths:
-------------
trunk/dports/sysutils/rpm53/files/patch-configure
trunk/dports/sysutils/rpm53/files/patch-configure.ac
trunk/dports/sysutils/rpm53/files/patch-macros.in
Modified: trunk/dports/sysutils/rpm53/Portfile
===================================================================
--- trunk/dports/sysutils/rpm52/Portfile 2012-03-25 07:34:58 UTC (rev 91177)
+++ trunk/dports/sysutils/rpm53/Portfile 2012-03-25 21:56:06 UTC (rev 91205)
@@ -2,9 +2,10 @@
PortSystem 1.0
-name rpm52
-version 5.2.1
-revision 5
+name rpm53
+version 5.3.11
+set date 20110602
+set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin freebsd linux
license LGPL-2.1
categories sysutils archivers
@@ -17,11 +18,12 @@
the package like its version, a description, etc.
homepage http://rpm5.org
-master_sites ${homepage}/files/rpm/rpm-5.2/
-distname rpm-${version}
-checksums md5 71f825ede4a2ddc191132ae017c9a6e4 \
- sha1 77f2d1b24301ed3743d8bbc57e57710c0eff7bc8 \
- rmd160 a66017c6b8a7e0a1de6be945e3823a7ab2051c75
+master_sites ${homepage}/files/rpm/rpm-${branch}/
+distname rpm-${version}-0.${date}
+extract.suffix .src.rpm
+checksums md5 5187a796c2fed092544c3c6c0f3db55a \
+ sha1 7ead6e27a6df3741312e217e96b78b26e19845cc \
+ rmd160 fa9b6d83376cb3e20d0969e0394d1516ee89cc52
worksrcdir rpm-${version}
depends_build port:expat port:neon \
@@ -31,30 +33,47 @@
depends_lib lib:libhistory.5:readline port:gettext \
port:popt port:sqlite3 port:xar-devel \
- port:liblzma port:pcre port:ossp-uuid
+ port:liblzma port:pcre port:ossp-uuid \
+ port:db51
depends_run port:openssl \
bin:gzip:gzip \
bin:bzip2:bzip2 \
bin:unzip:unzip
-patchfiles patch-macros.in patch-configure.ac patch-configure
+patchfiles rpm_patchset_16081.diff
+extract.cmd ${filespath}/rpm2cpio.sh
+extract.pre_args ""
+extract.post_args "| cpio -dvim"
+
build.type gnu
configure.args --disable-nls --without-javaglue --without-included-gettext \
--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-python=2.5 --with-perl --with-sqlite --with-db=external \
+ --with-neon=external --with-beecrypt=external --with-popt=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 \
PERL=${prefix}/bin/perl5.8
-configure.args-append --with-js=internal --with-lua=internal --with-db=internal
+configure.args-append --disable-openmp --with-lua=internal --with-syck=internal
configure.cppflags-append -I${prefix}/include/xar -I${prefix}/include/ossp
+configure.cppflags-append -I${prefix}/include/db51
+configure.ldflags-append -L${prefix}/lib/db51
+
+post-extract {
+ system -W ${workpath} "${portutil::autoconf::tar_command} -xzf rpm-${version}.tar.gz"
+}
+
+post-patch {
+ reinplace "s,sys/ipc.h,sys/endian.h sys/ipc.h," ${worksrcpath}/configure
+}
+
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/etc/rpm
system "${worksrcpath}/rpm --macros=${worksrcpath}/macros --eval='%{_target_platform}' > ${destroot}${prefix}/etc/rpm/platform"
Deleted: trunk/dports/sysutils/rpm53/files/patch-configure
===================================================================
--- trunk/dports/sysutils/rpm52/files/patch-configure 2012-03-25 07:34:58 UTC (rev 91177)
+++ trunk/dports/sysutils/rpm53/files/patch-configure 2012-03-25 21:56:06 UTC (rev 91205)
@@ -1,300 +0,0 @@
---- configure.orig 2010-05-01 18:57:15.000000000 +0200
-+++ configure 2010-10-23 18:07:03.000000000 +0200
-@@ -36085,15 +36085,15 @@
- withval=$with_python;
- if test ".$withval" != .no; then
- case "$withval" in
-- 2.x|2.3|2.4|2.5|2.6)
-+ 2.x|2.3|2.4|2.5|2.6|2.7)
- python_version=$withval
- ;;
- yes)
-- python_version="2.6 2.5 2.4 2.3 2.x"
-+ python_version="2.7 2.6 2.5 2.4 2.3 2.x"
- ;;
- *)
-- { $as_echo "$as_me:$LINENO: WARNING: --with-python only supports values \"2.x\", \"2.3\", \"2.4\", \"2.5\", or \"2.6\" ignoring..." >&5
--$as_echo "$as_me: WARNING: --with-python only supports values \"2.x\", \"2.3\", \"2.4\", \"2.5\", or \"2.6\" ignoring..." >&2;}
-+ { $as_echo "$as_me:$LINENO: WARNING: --with-python only supports values \"2.x\", \"2.3\", \"2.4\", \"2.5\", \"2.6\", or \"2.7\" ignoring..." >&5
-+$as_echo "$as_me: WARNING: --with-python only supports values \"2.x\", \"2.3\", \"2.4\", \"2.5\", \"2.6\", or \"2.7\" ignoring..." >&2;}
- python_version=""
- ;;
- esac
-@@ -53679,6 +53679,64 @@
- rm -f conftest.err conftest.$ac_ext
-
- __rcl_safe_LIBS="${LIBS}"
-+ LIBS="-lpython2.7 ${LIBS}"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char Py_Initialize ();
-+int
-+main ()
-+{
-+return Py_Initialize ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-+ __rcl_found_lib=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS="${__rcl_safe_LIBS}"
-+
-+ __rcl_safe_LIBS="${LIBS}"
- LIBS="-lpython2.6 ${LIBS}"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -53838,6 +53896,64 @@
- rm -f conftest.err conftest.$ac_ext
-
- __rcl_safe_LIBS="${LIBS}"
-+ LIBS="-lpython2.7 ${LIBS}"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char Py_Initialize ();
-+int
-+main ()
-+{
-+return Py_Initialize ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-+ __rcl_found_lib=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS="${__rcl_safe_LIBS}"
-+
-+ __rcl_safe_LIBS="${LIBS}"
- LIBS="-lpython2.6 ${LIBS}"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -54240,6 +54356,40 @@
- __rcl_found=no
- for __rcl_dir in ${__rcl_location}/lib/pythonembed ${__rcl_location}/lib ${__rcl_location}; do
-
-+ if test -f "${__rcl_dir}/libpython2.7.la" && \
-+ test -d "${__rcl_dir}/.libs"; then
-+ if test ".${__rcl_dir}" != "./usr/lib"; then
-+
-+ if test ".$verbose" = .yes; then
-+ $as_echo "-- extending LDFLAGS: -L${__rcl_dir}" >&6
-+ fi
-+
-+
-+ if test ".$verbose" = .yes; then
-+ $as_echo "-- extending LDFLAGS: -L${__rcl_dir}/.libs" >&6
-+ fi
-+
-+ LDFLAGS="${LDFLAGS} -L${__rcl_dir} -L${__rcl_dir}/.libs"
-+ fi
-+ __rcl_found=yes
-+ break
-+ fi
-+ if test -f "${__rcl_dir}/libpython2.7.a" || \
-+ test -f "${__rcl_dir}/libpython2.7.so" || \
-+ test -f "${__rcl_dir}/libpython2.7.sl" || \
-+ test -f "${__rcl_dir}/libpython2.7.dylib"; then
-+ if test ".${__rcl_dir}" != "./usr/lib"; then
-+
-+ if test ".$verbose" = .yes; then
-+ $as_echo "-- extending LDFLAGS: -L${__rcl_dir}" >&6
-+ fi
-+
-+ LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
-+ fi
-+ __rcl_found=yes
-+ break
-+ fi
-+
- if test -f "${__rcl_dir}/libpython2.6.la" && \
- test -d "${__rcl_dir}/.libs"; then
- if test ".${__rcl_dir}" != "./usr/lib"; then
-@@ -54332,6 +54482,22 @@
- if test ".${__rcl_found}" = .yes; then
- __rcl_found=no
-
-+ for __rcl_file in _ `find ${__rcl_location} -name "libpython2.7.*" -type f -print 2>/dev/null | \
-+ egrep '\.(a|so|sl|dylib)$'`; do
-+ test .${__rcl_file} = ._ && continue
-+ __rcl_dir=`echo ${__rcl_file} | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
-+ if test ".${__rcl_dir}" != "./usr/lib"; then
-+
-+ if test ".$verbose" = .yes; then
-+ $as_echo "-- extending LDFLAGS: -L${__rcl_dir}" >&6
-+ fi
-+
-+ LDFLAGS="${LDFLAGS} -L${__rcl_dir}"
-+ fi
-+ __rcl_found=yes
-+ break
-+ done
-+
- for __rcl_file in _ `find ${__rcl_location} -name "libpython2.6.*" -type f -print 2>/dev/null | \
- egrep '\.(a|so|sl|dylib)$'`; do
- test .${__rcl_file} = ._ && continue
-@@ -54538,6 +54704,83 @@
- __rcl_found_lib=no
-
-
-+{ $as_echo "$as_me:$LINENO: checking for Py_Initialize in -lpython2.7" >&5
-+$as_echo_n "checking for Py_Initialize in -lpython2.7... " >&6; }
-+if test "${ac_cv_lib_python2_7_Py_Initialize+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpython2.7 $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char Py_Initialize ();
-+int
-+main ()
-+{
-+return Py_Initialize ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-+ ac_cv_lib_python2_7_Py_Initialize=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_python2_7_Py_Initialize=no
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_python2_7_Py_Initialize" >&5
-+$as_echo "$ac_cv_lib_python2_7_Py_Initialize" >&6; }
-+if test "x$ac_cv_lib_python2_7_Py_Initialize" = x""yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBPYTHON2_7 1
-+_ACEOF
-+
-+ LIBS="-lpython2.7 $LIBS"
-+
-+fi
-+
-+ test ".${ac_cv_lib_python2_7_Py_Initialize}" = .yes && __rcl_found_lib=yes
-+
-+
- { $as_echo "$as_me:$LINENO: checking for Py_Initialize in -lpython2.6" >&5
- $as_echo_n "checking for Py_Initialize in -lpython2.6... " >&6; }
- if test "${ac_cv_lib_python2_6_Py_Initialize+set}" = set; then
Deleted: trunk/dports/sysutils/rpm53/files/patch-configure.ac
===================================================================
--- trunk/dports/sysutils/rpm52/files/patch-configure.ac 2012-03-25 07:34:58 UTC (rev 91177)
+++ trunk/dports/sysutils/rpm53/files/patch-configure.ac 2012-03-25 21:56:06 UTC (rev 91205)
@@ -1,35 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /v/rpm/cvs/rpm/configure.ac,v
-retrieving revision 2.372.2.13
-retrieving revision 2.372.2.16
-diff -u -r2.372.2.13 -r2.372.2.16
---- configure.ac 4 May 2010 13:45:21 -0000 2.372.2.13
-+++ configure.ac 23 Oct 2010 16:07:03 -0000 2.372.2.16
-@@ -994,14 +994,14 @@
- AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [
- if test ".$withval" != .no; then
- case "$withval" in
-- 2.x|2.3|2.4|2.5|2.6)
-+ 2.x|2.3|2.4|2.5|2.6|2.7)
- python_version=$withval
- ;;
- yes)
-- python_version="2.6 2.5 2.4 2.3 2.x"
-+ python_version="2.7 2.6 2.5 2.4 2.3 2.x"
- ;;
- *)
-- AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", or "2.6" ignoring...])
-+ AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", "2.6", or "2.7" ignoring...])
- python_version=""
- ;;
- esac
-@@ -1289,7 +1294,7 @@
- dnl # Python embedding
- RPM_CHECK_LIB(
- [Python embedding], [pythonembed],
-- [python2.6 python2.5], [Py_Initialize], [Python.h],
-+ [python2.7 python2.6 python2.5], [Py_Initialize], [Python.h],
- [no,external:none], [],
- [
- ], [])
Deleted: trunk/dports/sysutils/rpm53/files/patch-macros.in
===================================================================
--- trunk/dports/sysutils/rpm52/files/patch-macros.in 2012-03-25 07:34:58 UTC (rev 91177)
+++ trunk/dports/sysutils/rpm53/files/patch-macros.in 2012-03-25 21:56:06 UTC (rev 91205)
@@ -1,108 +0,0 @@
---- macros.in.orig 2008-10-20 03:22:51.000000000 +0200
-+++ macros.in 2008-02-29 09:25:14.000000000 +0100
-@@ -186,7 +186,7 @@
- %_dbpath_rebuild %{_dbpath}
-
- #
--# Path to script that creates debug symbols in a /usr/lib/debug
-+# Path to script that creates debug symbols in a @prefix@/lib/debug
- # shadow tree.
- #
- # A spec file can %%define _find_debuginfo_opts to pass options to
-@@ -314,7 +314,7 @@
- #
- %_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.
-@@ -791,7 +791,7 @@
- # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
- #
- # XXX Note: escaped %% for use in headerSprintf()
--#%_hrmib_path /var/cache/hrmib/%{___NVRA}
-+#%_hrmib_path @prefix@/var/cache/hrmib/%{___NVRA}
-
- #==============================================================================
- # ---- GPG/PGP/PGP5 signature macros.
-@@ -879,13 +879,13 @@
- # The path to the dependency universe database. The default value
- # is the rpmdb-vendor location. The macro is usually defined in
- # %{_etcrpm}/macros.solve, installed with the rpmdb-vendor package.
--#%_solve_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
-+#%_solve_dbpath @prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm
-
- # The path to the dependency universe packages. This should
- # be a path to the packages contained in the solve database.
- #
- # XXX Note: needs a pesky trailing /
--#%_solve_pkgsdir /mnt/rpm/test/latest-i386/RedHat/RPMS/
-+#%_solve_pkgsdir @prefix@/src/%{_vendor}/RPMS/%{_arch}/
-
- # The output binary package file name template used when suggesting
- # binary packages that solve a dependency. The macro is usually defined
-@@ -1064,7 +1064,7 @@
- %_rpmds_perldeps_cmd %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
-
- #
--%_varrun /var/run
-+%_varrun @prefix@/var/run
-
- #==============================================================================
- # ---- Cache configuration macros.
-@@ -1089,7 +1089,7 @@
- %_bhA %{nil}
-
- # The cache database directory.
--%_cache_dbpath /var/cache/yum/rpmdb
-+%_cache_dbpath @prefix@/var/cache/yum/rpmdb
-
- #==============================================================================
- # ---- per-platform macros.
-@@ -1328,7 +1328,7 @@
- %_lib lib
- %_libdir %{_exec_prefix}/%{_lib}
- %_includedir %{_prefix}/include
--%_oldincludedir /usr/include
-+%_oldincludedir @prefix@/include
- %_infodir %{_prefix}/info
- %_mandir %{_prefix}/man
- %_localedir %{_datadir}/locale
-@@ -1617,7 +1617,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__java_provides %{_rpmhome}/javadeps.sh --provides
--%__java_requires %{_rpmhome}/javadeps.sh --requires
-+#%__java_requires %{_rpmhome}/javadeps.sh --requires
-
- #------------------------------------------------------------------------
- # libtool(...) configuration.
-@@ -1627,7 +1627,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name}
--%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
-+#%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name}
-
- #------------------------------------------------------------------------
- # pkgconfig(...) configuration.
-@@ -1637,7 +1637,7 @@
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- %__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
--%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
-+#%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
-
- #------------------------------------------------------------------------
- # mono(...) configuration.
-@@ -1658,7 +1658,7 @@
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires %{__bash} --rpm-requires
-+#%__scriptlet_requires %{__bash} --rpm-requires
-
- # \endverbatim
- #*/
Added: trunk/dports/sysutils/rpm53/files/rpm2cpio.sh
===================================================================
--- trunk/dports/sysutils/rpm53/files/rpm2cpio.sh (rev 0)
+++ trunk/dports/sysutils/rpm53/files/rpm2cpio.sh 2012-03-25 21:56:06 UTC (rev 91205)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+pkg=$1
+if [ "$pkg" = "" -o ! -e "$pkg" ]; then
+ echo "no package supplied" 1>&2
+ exit 1
+fi
+
+leadsize=96
+o=`expr $leadsize + 8`
+set `od -j $o -N 8 -t u1 $pkg`
+il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
+dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
+# echo "sig il: $il dl: $dl"
+
+sigsize=`expr 8 + 16 \* $il + $dl`
+o=`expr $o + $sigsize + \( 8 - \( $sigsize \% 8 \) \) \% 8 + 8`
+set `od -j $o -N 8 -t u1 $pkg`
+il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
+dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
+# echo "hdr il: $il dl: $dl"
+
+hdrsize=`expr 8 + 16 \* $il + $dl`
+o=`expr $o + $hdrsize`
+
+dd if=$pkg ibs=$o skip=1 2>/dev/null | gunzip
Property changes on: trunk/dports/sysutils/rpm53/files/rpm2cpio.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/sysutils/rpm53/files/rpm_patchset_16081.diff
===================================================================
--- trunk/dports/sysutils/rpm53/files/rpm_patchset_16081.diff (rev 0)
+++ trunk/dports/sysutils/rpm53/files/rpm_patchset_16081.diff 2012-03-25 21:56:06 UTC (rev 91205)
@@ -0,0 +1,41 @@
+Index: rpm/configure.ac
+RCS File: /v/rpm/cvs/rpm/configure.ac,v
+rcsdiff -q -kk '-r2.489' '-r2.490' -u '/v/rpm/cvs/rpm/configure.ac,v' 2>/dev/null
+--- configure.ac 2011/05/07 23:30:48 2.489
++++ configure.ac 2011/05/11 07:55:06 2.490
+@@ -630,8 +630,8 @@
+ dnl # standard headers (generic)
+ AC_CHECK_HEADERS([dnl
+ fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl
+- signal.h sys/ipc.h sys/socket.h sys/select.h sys/time.h dnl
+- sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl
++ signal.h sys/endian.h sys/ipc.h sys/socket.h sys/select.h dnl
++ sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl
+ sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl
+ machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl
+ sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl
+Index: rpm/tools/dbconvert.c
+RCS File: /v/rpm/cvs/rpm/tools/dbconvert.c,v
+rcsdiff -q -kk '-r2.5' '-r2.6' -u '/v/rpm/cvs/rpm/tools/dbconvert.c,v' 2>/dev/null
+--- tools/dbconvert.c 2011/04/10 20:37:00 2.5
++++ tools/dbconvert.c 2011/05/11 07:55:06 2.6
+@@ -17,9 +17,18 @@
+
+ #include "debug.h"
+
++#ifdef HAVE_SYS_ENDIAN_H
++#include <sys/endian.h>
++#endif
++#ifdef __APPLE__
++#include <libkern/OSByteOrder.h>
++
++#define htobe32(x) OSSwapHostToBigInt32(x)
++#define htole32(x) OSSwapHostToLittleInt32(x)
++#endif /* __APPLE__ */
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ #define bswap32(x) htobe32(x)
+-#elif __BYTE_ORDER == BIG_ENDIAN
++#elif BYTE_ORDER == BIG_ENDIAN
+ #define bswap32(x) htole32(x)
+ #endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120325/dbf06e92/attachment-0001.html>
More information about the macports-changes
mailing list