[27736] trunk/dports/sysutils/rpm

[source_changes at macosforge.org]

Revision: 27736
          http://trac.macosforge.org/projects/macports/changeset/27736
Author:   afb at macports.org
Date:     2007-08-13 03:56:57 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
patch cleanup, linux support

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile
    trunk/dports/sysutils/rpm/files/patch-rpmevr.h

Added Paths:
-----------
    trunk/dports/sysutils/rpm/files/patch-rpmdb-Makefile.am

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2007-08-13 08:38:56 UTC (rev 27735)
+++ trunk/dports/sysutils/rpm/Portfile	2007-08-13 10:56:57 UTC (rev 27736)
@@ -4,8 +4,8 @@
 
 name			rpm
 version			4.4.9
-revision                3
-platforms		darwin freebsd
+revision                4
+platforms		darwin freebsd linux
 categories		sysutils archivers
 maintainers		n3npq at mac.com
 description		The RPM package management system.
@@ -45,6 +45,7 @@
 			patch-configure \
 			patch-Makefile.PL \
 			patch-darwin.prov \
+			patch-fts.c \
 			patch-rpmdav.c \
 			patch-rpmsq.c \
 			patch-rpmevr.h \
@@ -88,10 +89,6 @@
 	}
 }
 
-platform darwin 9 {
-         patchfiles-append      patch-fts.c
-}
-
 platform freebsd {
 	post-configure {
 		reinplace "s;-lrt;;" ${worksrcpath}/lua/Makefile
@@ -104,7 +101,14 @@
 	}
 }
 
+platform linux {
+	patchfiles-append      patch-rpmdb-Makefile.am
 
+	post-destroot {
+		# Linux specific changes
+	}
+}
+
 variant docs {
 	depends_run-append bin:doxygen:doxygen
 	configure.args-append --with-apidocs

Added: trunk/dports/sysutils/rpm/files/patch-rpmdb-Makefile.am
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-rpmdb-Makefile.am	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-rpmdb-Makefile.am	2007-08-13 10:56:57 UTC (rev 27736)
@@ -0,0 +1,10 @@
+--- rpmdb/Makefile.am.orig	2007-02-03 19:58:47.000000000 +0100
++++ rpmdb/Makefile.am	2007-08-13 12:43:09.000000000 +0200
+@@ -53,6 +53,7 @@
+ 	tagname.c tagtbl.c
+ librpmdb_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) \
+ 	$(top_builddir)/rpmio/librpmio.la \
++	@LTLIBICONV@ \
+ 	@WITH_POPT_LIB@ \
+ 	@WITH_SQLITE3_LIB@ \
+ 	@WITH_LIBELF_LIB@

Modified: trunk/dports/sysutils/rpm/files/patch-rpmevr.h
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-rpmevr.h	2007-08-13 08:38:56 UTC (rev 27735)
+++ trunk/dports/sysutils/rpm/files/patch-rpmevr.h	2007-08-13 10:56:57 UTC (rev 27736)
@@ -1,21 +1,24 @@
---- ./lib/rpmevr.h.orig	2007-05-16 12:55:05.000000000 +0200
-+++ ./lib/rpmevr.h	2007-06-20 10:13:14.000000000 +0200
-@@ -18,8 +18,6 @@
+--- lib/rpmevr.h.orig	2007-05-16 12:55:05.000000000 +0200
++++ lib/rpmevr.h	2007-08-09 18:36:13.000000000 +0200
+@@ -6,6 +6,10 @@
+  * Structure(s) and routine(s) used for EVR parsing and comparison.
+  */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
  /**
-  * Dependency Attributes.
   */
--typedef	enum evrFlags_e rpmsenseFlags;
--typedef	enum evrFlags_e evrFlags;
+ /*@-exportlocal@*/
+@@ -117,10 +121,6 @@
+ #define	isErasePreReq(_x)	((_x) & _ERASE_ONLY_MASK)
+ #endif	/* _RPMEVR_INTERNAL */
  
- /*@-matchfields@*/
- enum evrFlags_e {
-@@ -67,6 +65,9 @@
- };
- /*@=matchfields@*/
- 
-+typedef	enum evrFlags_e rpmsenseFlags;
-+typedef	enum evrFlags_e evrFlags;
-+
- #define	RPMSENSE_SENSEMASK	0x0e	 /* Mask to get senses, ie serial, */
-                                          /* less, greater, equal.          */
- #define	RPMSENSE_NOTEQUAL	(RPMSENSE_EQUAL ^ RPMSENSE_SENSEMASK)
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+ /** \ingroup rpmds
+  * Segmented string compare.
+  * @param a		1st string

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070813/14682f6c/attachment.html