[26264] trunk/dports/sysutils/rpm
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jun 17 15:04:39 PDT 2007
Revision: 26264
http://trac.macosforge.org/projects/macports/changeset/26264
Author: n3npq at mac.com
Date: 2007-06-17 15:04:38 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
Upgrade to rpm-4.4.8.
Modified Paths:
--------------
trunk/dports/sysutils/rpm/Portfile
trunk/dports/sysutils/rpm/files/patch-macros.in
Removed Paths:
-------------
trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in
Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile 2007-06-17 22:01:27 UTC (rev 26263)
+++ trunk/dports/sysutils/rpm/Portfile 2007-06-17 22:04:38 UTC (rev 26264)
@@ -2,7 +2,7 @@
PortSystem 1.0
name rpm
-version 4.4.7
+version 4.4.8
platforms darwin
categories sysutils archivers
maintainers n3npq at mac.com
@@ -17,7 +17,7 @@
homepage http://rpm5.org
master_sites http://rpm5.org/files/rpm/rpm-4.4/
distfiles rpm-${version}.tar.gz
-checksums md5 d012c81b5169f7377ea4a36607e1445e
+checksums md5 dc73bcebf6b206058457c9a90f944c55
depends_lib lib:libhistory.5:readline port:gettext \
lib:libsqlite3.0:sqlite3
@@ -52,8 +52,8 @@
variant darwin {
patchfiles-append \
- patch-file-src-Makefile.in \
- patch-macros.in
+ patch-macros.in \
+ patch-lib-rpmds.c
post-patch {
file delete -force ${worksrcpath}/beecrypt
Deleted: trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in 2007-06-17 22:01:27 UTC (rev 26263)
+++ trunk/dports/sysutils/rpm/files/patch-file-src-Makefile.in 2007-06-17 22:04:38 UTC (rev 26264)
@@ -1,11 +0,0 @@
---- file/src/Makefile.in.orig 2007-03-18 09:33:43.000000000 -0700
-+++ file/src/Makefile.in 2007-03-18 09:34:05.000000000 -0700
-@@ -124,7 +124,7 @@
- IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = ../../zlib/.libs/libz.a
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
Modified: trunk/dports/sysutils/rpm/files/patch-macros.in
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-macros.in 2007-06-17 22:01:27 UTC (rev 26263)
+++ trunk/dports/sysutils/rpm/files/patch-macros.in 2007-06-17 22:04:38 UTC (rev 26264)
@@ -1,67 +1,105 @@
---- macros.in.orig 2006-02-12 13:34:12.000000000 -0500
-+++ macros.in 2006-03-08 10:42:53.000000000 -0500
-@@ -33,58 +33,58 @@
+--- macros.in.orig 2007-02-13 09:39:55.000000000 -0500
++++ macros.in 2007-06-17 17:30:27.000000000 -0400
+@@ -35,79 +35,79 @@
#==============================================================================
# ---- Generally useful path macros.
#
-%__awk @AWK@
--%__bzip2 @BZIP2BIN@
+-%__bash @__BASH@
+-%__bzip2 @__BZIP2@
-%__cat @__CAT@
-%__chgrp @__CHGRP@
-%__chmod @__CHMOD@
-%__chown @__CHOWN@
-%__cp @__CP@
-%__cpio @__CPIO@
+-%__curl @__CURL@
+-%__cvs @__CVS@
+-%__diff @__DIFF@
+-%__ditto @__DITTO@
-%__file @__FILE@
+-%__find @__FIND@
-%__gpg @__GPG@
-%__grep @__GREP@
--%__gzip @GZIPBIN@
+-%__gzip @__GZIP@
++%__awk @prefix@/bin/gawk
++%__bash /bin/bash
++%__bzip2 /usr/bin/bzip2
++%__cat /bin/cat
++%__chgrp /usr/bin/chgrp
++%__chmod /bin/chmod
++%__chown /usr/sbin/chown
++%__cp /bin/cp
++%__cpio @prefix@/bin/cpio
++%__curl /usr/bin/curl
++%__cvs /usr/bin/cvs
++%__diff /usr/bin/diff
++%__ditto /usr/bin/ditto
++%__file @prefix@/bin/file
++%__find /usr/bin/find
++%__gpg @prefix@/bin/gpg
++%__grep @prefix@/bin/grep
++%__gzip @prefix@/bin/gzip
+ %__hg @__HG@
-%__id @__ID@
-%__install @__INSTALL@
++%__id @prefix@/bin/gid
++%__install @prefix@/bin/ginstall
+ %__install_info @__INSTALL_INFO@
+ %__ldconfig @__LDCONFIG@
+-%__lua @__LUA@
-%__ln_s @LN_S@
+-%__lzma @__LZMA@
+-%__lzmash @__LZMASH@
+-%__lzop @__LZOP@
-%__make @__MAKE@
++%__lua @prefix@/bin/lua
++%__ln_s /bin/ln
++%__lzma @prefix@/bin/lzma
++%__lzmash @prefix@/bin/lzmash
++%__lzop @prefix@/bin/lzop
++%__make @prefix@/bin/gmake
+ %make %{__make}
-%__mkdir @__MKDIR@
-%__mkdir_p @MKDIR_P@
-%__mv @__MV@
-%__patch @__PATCH@
+-%__pax @__PAX@
-%__perl @__PERL@
--%__pgp @PGPBIN@
+-%__pgp @__PGP@
+-%__php @__PHP@
-%__python @__PYTHON@
-%__rm @__RM@
-%__rsh @__RSH@
-%__sed @__SED@
+-%__sh @__SH@
-%__ssh @__SSH@
+-%__svn @__SVN@
-%__tar @__TAR@
--%__unzip @UNZIPBIN@
-+%__awk @prefix@/bin/gawk
-+%__bzip2 @prefix@/bin/bzip2
-+%__cat @prefix@/bin/gcat
-+%__chgrp @prefix@/bin/gchgrp
-+%__chmod @prefix@/bin/gchmod
-+%__chown @prefix@/bin/gchown
-+%__cp @prefix@/bin/gcp
-+%__cpio @prefix@/bin/cpio
-+%__file @prefix@/bin/file
-+%__gpg @prefix@/bin/gpg
-+%__grep @prefix@/bin/grep
-+%__gzip @prefix@/bin/gzip
-+%__id @prefix@/bin/gid
-+%__install @prefix@/bin/ginstall
-+%__ln_s @prefix@/bin/gln
-+%__make @prefix@/bin/gmake
-+%__mkdir @prefix@/bin/gmkdir
-+%__mkdir_p @prefix@/bin/gmkdir -p
-+%__mv @prefix@/bin/gmv
+-%__tclsh @__TCLSH@
+-%__unzip @__UNZIP@
+-%__wget @__WGET@
+-%__xar @__XAR@
++%__mkdir /bin/mkdir
++%__mkdir_p %{__mkdir} -p
++%__mv /bin/mv
+%__patch @prefix@/bin/gpatch
++%__pax @prefix@/bin/pax
+%__perl @prefix@/bin/perl
+%__pgp @prefix@/bin/pgp
++%__php @prefix@/bin/php
+%__python @prefix@/bin/python
-+%__rm @prefix@/bin/grm
++%__rm /bin/rm
+%__rsh /usr/bin/rsh
-+%__sed @prefix@/bin/sed
++%__sed /usr/bin/sed
++%__sh /bin/sh
+%__ssh /usr/bin/ssh
++%__svn @prefix@/bin/svn
+%__tar @prefix@/bin/gnutar
++%__tclsh /usr/bin/tclsh
+%__unzip /usr/bin/unzip
++%__wget @prefix@/bin/wget
++%__xar @prefix@/bin/xar
#==============================================================================
# ---- Build system path macros.
@@ -104,7 +142,7 @@
#==============================================================================
# Conditional build stuff.
-@@ -158,7 +158,7 @@
+@@ -178,7 +178,7 @@
%_dbpath_rebuild %{_dbpath}
#
@@ -112,21 +150,22 @@
+# Path to script that creates debug symbols in a @prefix@/lib/debug
# shadow tree.
%__debug_install_post \
- @RPMCONFIGDIR@/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-@@ -211,10 +211,10 @@
+ %{_usrlibrpm}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+@@ -229,11 +229,11 @@
%_srcrpmdir %{_topdir}/SRPMS
# Directory where temporaray files can be created.
-%_tmppath %{_var}/tmp
+%_tmppath /var/tmp
+ %tmpdir %{_tmppath}
# Path to top of build area.
-%_topdir %{_usrsrc}/rpm
+%_topdir %{_usrsrc}/apple
- # The path to the unzip executable (legacy, use %{__unzip} instead).
- %_unzipbin %{__unzip}
-@@ -279,7 +279,7 @@
+ #==============================================================================
+ # ---- Optional rpmrc macros.
+@@ -295,7 +295,7 @@
# The PATH put into the environment before running %pre/%post et al.
#
@@ -135,7 +174,7 @@
# A colon separated list of desired locales to be installed;
# "all" means install all locale specific files.
-@@ -575,7 +575,7 @@
+@@ -625,7 +625,7 @@
%{nil}
# The list of tags for which indices will be built.
@@ -144,7 +183,7 @@
# "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
%_dbi_config_Packages %{_dbi_htconfig} lockdbfd
-@@ -597,8 +597,8 @@
+@@ -647,8 +647,8 @@
#
# There are two macros so that --rebuilddb can convert db1 -> db3.
#
@@ -153,12 +192,12 @@
+%_dbapi 4
+%_dbapi_rebuild 4
- #==============================================================================
- # ---- GPG/PGP/PGP5 signature macros.
-@@ -682,15 +682,15 @@
+ #
+ # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
+@@ -742,11 +742,11 @@
# The path to the dependency universe database. The default value
# is the rpmdb-vendor location. The macro is usually defined in
- # /etc/rpm/macros.solve, installed with the rpmdb-vendor package.
+ # %{_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
@@ -169,12 +208,7 @@
# The output binary package file name template used when suggesting
# binary packages that solve a dependency. The macro is usually defined
--# in /etc/rpm/macros.solve, installed with the rpmdb-vendor package.
-+# in /etc/rpm/macros.solve, installed with the rpmdb-dports package.
- #
- # XXX Note: escaped %% for use in headerSprintf()
- #%_solve_name_fmt %{?_solve_pkgsdir}%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-@@ -1087,7 +1087,7 @@
+@@ -1127,7 +1127,7 @@
%_lib lib
%_libdir %{_exec_prefix}/%{_lib}
%_includedir %{_prefix}/include
@@ -182,31 +216,40 @@
+%_oldincludedir @prefix@/include
%_infodir %{_prefix}/info
%_mandir %{_prefix}/man
-
-@@ -1336,7 +1336,7 @@
+ %_localedir %{_datadir}/locale
+@@ -1389,7 +1389,7 @@
# Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
- %__java_provides @RPMCONFIGDIR@/javadeps.sh --provides
--%__java_requires @RPMCONFIGDIR@/javadeps.sh --requires
-+#%__java_requires @RPMCONFIGDIR@/javadeps.sh --requires
+ # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
+ %__java_provides %{_usrlibrpm}/javadeps.sh --provides
+-%__java_requires %{_usrlibrpm}/javadeps.sh --requires
++#%__java_requires %{_usrlibrpm}/javadeps.sh --requires
#------------------------------------------------------------------------
# libtool(...) configuration.
-@@ -1346,7 +1346,7 @@
+@@ -1399,7 +1399,7 @@
# Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
- %__libtool_provides @RPMCONFIGDIR@/libtooldeps.sh --provides %{buildroot}
--%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot}
-+#%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot}
+ # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
+ %__libtool_provides %{_usrlibrpm}/libtooldeps.sh --provides %{buildroot} %{name}
+-%__libtool_requires %{_usrlibrpm}/libtooldeps.sh --requires %{buildroot} %{name}
++#%__libtool_requires %{_usrlibrpm}/libtooldeps.sh --requires %{buildroot} %{name}
#------------------------------------------------------------------------
# pkgconfig(...) configuration.
-@@ -1356,7 +1356,7 @@
+@@ -1409,7 +1409,7 @@
# Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
- %__pkgconfig_provides @RPMCONFIGDIR@/pkgconfigdeps.sh --provides
--%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires
-+#%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires
+ # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
+ %__pkgconfig_provides %{_usrlibrpm}/pkgconfigdeps.sh --provides
+-%__pkgconfig_requires %{_usrlibrpm}/pkgconfigdeps.sh --requires
++#%__pkgconfig_requires %{_usrlibrpm}/pkgconfigdeps.sh --requires
#------------------------------------------------------------------------
# executable(...) configuration.
+@@ -1420,7 +1420,7 @@
+ # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
+ #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides
+ #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
+-%__scriptlet_requires /bin/bash --rpm-requires
++#%__scriptlet_requires /bin/bash --rpm-requires
+
+ # \endverbatim
+ #*/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070617/57f1f274/attachment.html
More information about the macports-changes
mailing list