[26268] trunk/dports/sysutils/rpm

source_changes at macosforge.org source_changes at macosforge.org
Sun Jun 17 15:42:24 PDT 2007 

Revision: 26268
          http://trac.macosforge.org/projects/macports/changeset/26268
Author:   n3npq at mac.com
Date:     2007-06-17 15:42:23 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
Upgrade to rpm-4.4.9.

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile
    trunk/dports/sysutils/rpm/files/patch-macros.in

Added Paths:
-----------
    trunk/dports/sysutils/rpm/files/patch-popt-Makefile.in

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2007-06-17 22:29:15 UTC (rev 26267)
+++ trunk/dports/sysutils/rpm/Portfile	2007-06-17 22:42:23 UTC (rev 26268)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name			rpm
-version			4.4.8
+version			4.4.9
 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 dc73bcebf6b206058457c9a90f944c55
+checksums		md5 210b768006e7d88dd8a3bcd498ea27f6
 
 depends_lib		lib:libhistory.5:readline port:gettext \
 			lib:libsqlite3.0:sqlite3
@@ -53,7 +53,7 @@
 variant darwin {
 	patchfiles-append \
 		patch-macros.in \
-		patch-lib-rpmds.c
+		patch-popt-Makefile.in
 
 	post-patch {
 		file delete -force ${worksrcpath}/beecrypt

Modified: trunk/dports/sysutils/rpm/files/patch-macros.in
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-macros.in	2007-06-17 22:29:15 UTC (rev 26267)
+++ trunk/dports/sysutils/rpm/files/patch-macros.in	2007-06-17 22:42:23 UTC (rev 26268)
@@ -1,5 +1,5 @@
---- macros.in.orig	2007-02-13 09:39:55.000000000 -0500
-+++ macros.in	2007-06-17 17:30:27.000000000 -0400
+--- macros.in.orig	2007-05-14 21:46:44.000000000 -0400
++++ macros.in	2007-06-17 18:21:12.000000000 -0400
 @@ -35,79 +35,79 @@
  #==============================================================================
  # ---- Generally useful path macros.
@@ -151,7 +151,7 @@
  #	shadow tree.
  %__debug_install_post   \
     %{_usrlibrpm}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-@@ -229,11 +229,11 @@
+@@ -231,11 +231,11 @@
  %_srcrpmdir		%{_topdir}/SRPMS
  
  #	Directory where temporaray files can be created.
@@ -165,7 +165,7 @@
  
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -295,7 +295,7 @@
+@@ -297,7 +297,7 @@
  
  #	The PATH put into the environment before running %pre/%post et al.
  #
@@ -174,16 +174,16 @@
  
  #	A colon separated list of desired locales to be installed;
  #	"all" means install all locale specific files.
-@@ -625,7 +625,7 @@
+@@ -626,7 +626,7 @@
+   %{!?_rpmdb_rebuild:%{__dbi_btconfig_current}}\
  %{nil}
  
- # The list of tags for which indices will be built.
--%_dbi_tags	Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys
-+%_dbi_tags	Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Pubkeys
+-%_dbi_tags      Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys:Packagecolor
++%_dbi_tags      Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Pubkeys
  
- # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
- %_dbi_config_Packages		%{_dbi_htconfig} lockdbfd
-@@ -647,8 +647,8 @@
+ %_dbi_config_Dirnames		%{_dbi_btconfig}
+ %_dbi_config_Requireversion	%{_dbi_btconfig}
+@@ -662,8 +662,8 @@
  #
  # There are two macros so that --rebuilddb can convert db1 -> db3.
  #
@@ -194,7 +194,7 @@
  
  #
  # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
-@@ -742,11 +742,11 @@
+@@ -757,11 +757,11 @@
  #	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.
@@ -208,7 +208,7 @@
  
  #	The output binary package file name template used when suggesting
  #	binary packages that solve a dependency. The macro is usually defined
-@@ -1127,7 +1127,7 @@
+@@ -1147,7 +1147,7 @@
  %_lib			lib
  %_libdir		%{_exec_prefix}/%{_lib}
  %_includedir		%{_prefix}/include
@@ -217,7 +217,7 @@
  %_infodir		%{_prefix}/info
  %_mandir		%{_prefix}/man
  %_localedir		%{_datadir}/locale
-@@ -1389,7 +1389,7 @@
+@@ -1409,7 +1409,7 @@
  # Note: Used iff _use_internal_dependency_generator is non-zero. The
  # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
  %__java_provides	%{_usrlibrpm}/javadeps.sh --provides
@@ -226,7 +226,7 @@
  
  #------------------------------------------------------------------------
  # libtool(...) configuration.
-@@ -1399,7 +1399,7 @@
+@@ -1419,7 +1419,7 @@
  # Note: Used iff _use_internal_dependency_generator is non-zero. The
  # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
  %__libtool_provides	%{_usrlibrpm}/libtooldeps.sh --provides %{buildroot} %{name}
@@ -235,7 +235,7 @@
  
  #------------------------------------------------------------------------
  # pkgconfig(...) configuration.
-@@ -1409,7 +1409,7 @@
+@@ -1429,7 +1429,7 @@
  # Note: Used iff _use_internal_dependency_generator is non-zero. The
  # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
  %__pkgconfig_provides	%{_usrlibrpm}/pkgconfigdeps.sh --provides
@@ -244,7 +244,7 @@
  
  #------------------------------------------------------------------------
  # executable(...) configuration.
-@@ -1420,7 +1420,7 @@
+@@ -1440,7 +1440,7 @@
  # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
  #%__executable_provides	%{_usrlibrpm}/executabledeps.sh --provides
  #%__executable_requires	%{_usrlibrpm}/executabledeps.sh --requires

Added: trunk/dports/sysutils/rpm/files/patch-popt-Makefile.in
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-popt-Makefile.in	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-popt-Makefile.in	2007-06-17 22:42:23 UTC (rev 26268)
@@ -0,0 +1,11 @@
+--- popt/Makefile.in.orig	2007-06-17 18:36:57.000000000 -0400
++++ popt/Makefile.in	2007-06-17 18:37:46.000000000 -0400
+@@ -297,7 +297,7 @@
+ usrlibdir = $(libdir)@MARK64@
+ usrlib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
+-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ $(am__append_1)
++libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ $(am__append_1)
+ man_MANS = popt.3
+ CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
+ ACLOCAL_AMFLAGS = -I m4

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070617/660bef9c/attachment.html

More information about the macports-changes mailing list