[26971] trunk/dports/sysutils/rpm

[source_changes at macosforge.org]

Revision: 26971
          http://trac.macosforge.org/projects/macports/changeset/26971
Author:   afb at macports.org
Date:     2007-07-14 09:10:42 -0700 (Sat, 14 Jul 2007)

Log Message:
-----------
- require sqlite3 port rather than lib
  (fixes Bug #12263 and Bug #12283)
- move perl to build depends for module
- remove the perl module .packlist file
- remove explicit lua (default anyway)
- rename leopard patch to be consistent

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/rpm/files/patch-fts.c

Removed Paths:
-------------
    trunk/dports/sysutils/rpm/files/patch-fts.c.diff

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2007-07-14 15:45:56 UTC (rev 26970)
+++ trunk/dports/sysutils/rpm/Portfile	2007-07-14 16:10:42 UTC (rev 26971)
@@ -4,7 +4,7 @@
 
 name			rpm
 version			4.4.9
-revision                2
+revision                3
 platforms		darwin freebsd
 categories		sysutils archivers
 maintainers		n3npq at mac.com
@@ -20,15 +20,14 @@
 checksums		md5 210b768006e7d88dd8a3bcd498ea27f6
 
 depends_build		port:expat port:neon \
-			port:python24 port:popt \
+			port:python24 port:perl5.8 \
 			port:readline port:beecrypt \
 			port:libiconv port:gettext
 
 depends_lib		lib:libhistory.5:readline port:gettext \
-			lib:libsqlite3.0:sqlite3
+			port:popt port:sqlite3
 
 depends_run		port:openssl \
-                        port:perl5.8 \
 			bin:gzip:gzip \
                         bin:bzip2:bzip2 \
                         bin:unzip:unzip
@@ -38,7 +37,7 @@
 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.4 --sysconfdir=${prefix}/etc
+			--with-python=2.4 --with-perl=5.8.8 --sysconfdir=${prefix}/etc
 			# needed because it checks for sqlite3_open in sqlite lib...
 configure.env		ac_cv_lib_sqlite_sqlite3_open=yes
 
@@ -62,6 +61,7 @@
 
 	xinstall -d -m 755 ${prefix}/etc/rpm
 
+	delete [glob ${destroot}${prefix}/lib/perl5/*/*/*/auto/RPM/.packlist]
 	delete [glob ${destroot}${prefix}/lib/perl5/*/*/perllocal.pod]
 
 	# where the RPM database lives
@@ -77,7 +77,7 @@
 
 platform darwin {
 	configure.args-append --disable-optimized --disable-aio \
-			      --with-lua --with-glob --enable-broken-chown \
+			      --with-glob --enable-broken-chown \
 			      --disable-rpath
 
 	configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
@@ -89,7 +89,7 @@
 }
 
 platform darwin 9 {
-         patchfiles-append      patch-fts.c.diff
+         patchfiles-append      patch-fts.c
 }
 
 platform freebsd {

Copied: trunk/dports/sysutils/rpm/files/patch-fts.c (from rev 26967, trunk/dports/sysutils/rpm/files/patch-fts.c.diff)
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-fts.c	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-fts.c	2007-07-14 16:10:42 UTC (rev 26971)
@@ -0,0 +1,18 @@
+--- rpmio/fts.c	2007-05-25 10:36:36.000000000 -0700
++++ rpmio/fts.c	2007-06-13 10:52:54.000000000 -0700
+@@ -34,6 +34,7 @@
+ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
+ #endif /* LIBC_SCCS and not lint */
+ 
++#include "system.h"
+ #if defined(_LIBC)
+ #include <sys/param.h>
+ #include <include/sys/stat.h>
+@@ -70,7 +71,6 @@
+ #   define stat64              stat
+ #   define __fxstat64(_stat_ver, _fd, _sbp)    fstat((_fd), (_sbp))
+ #endif
+-#include "system.h"
+ #include "fts.h"
+ #include "rpmio.h"
+ #include "rpmurl.h"

Deleted: trunk/dports/sysutils/rpm/files/patch-fts.c.diff
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-fts.c.diff	2007-07-14 15:45:56 UTC (rev 26970)
+++ trunk/dports/sysutils/rpm/files/patch-fts.c.diff	2007-07-14 16:10:42 UTC (rev 26971)
@@ -1,18 +0,0 @@
---- rpmio/fts.c	2007-05-25 10:36:36.000000000 -0700
-+++ rpmio/fts.c	2007-06-13 10:52:54.000000000 -0700
-@@ -34,6 +34,7 @@
- static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
- #endif /* LIBC_SCCS and not lint */
- 
-+#include "system.h"
- #if defined(_LIBC)
- #include <sys/param.h>
- #include <include/sys/stat.h>
-@@ -70,7 +71,6 @@
- #   define stat64              stat
- #   define __fxstat64(_stat_ver, _fd, _sbp)    fstat((_fd), (_sbp))
- #endif
--#include "system.h"
- #include "fts.h"
- #include "rpmio.h"
- #include "rpmurl.h"

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