Revision: 73600
http://trac.macports.org/changeset/73600
Author: afb at macports.org
Date: 2010-11-19 12:55:59 -0800 (Fri, 19 Nov 2010)
Log Message:
-----------
version upgrade, newer python/perl
Modified Paths:
--------------
trunk/dports/sysutils/rpm52/Portfile
Removed Paths:
-------------
trunk/dports/sysutils/rpm52/files/patch-jsprf.c
trunk/dports/sysutils/rpm52/files/patch-jsstddef.h
Modified: trunk/dports/sysutils/rpm52/Portfile
===================================================================
--- trunk/dports/sysutils/rpm52/Portfile 2010-11-19 20:55:33 UTC (rev 73599)
+++ trunk/dports/sysutils/rpm52/Portfile 2010-11-19 20:55:59 UTC (rev 73600)
@@ -3,7 +3,7 @@
PortSystem 1.0
name rpm52
-version 5.2.0
+version 5.2.1
revision 2
platforms darwin freebsd linux
categories sysutils archivers
@@ -18,9 +18,9 @@
homepage http://rpm5.org
master_sites ${homepage}/files/rpm/rpm-5.2/
distname rpm-${version}
-checksums md5 9126c960be02f2b0d6068801aa27fde7 \
- sha1 45031ea461738f081559082d35ce80fcfea822e6 \
- rmd160 0d4c3cfe5781608325a3269fe00fd5fa071c284e
+checksums md5 71f825ede4a2ddc191132ae017c9a6e4 \
+ sha1 77f2d1b24301ed3743d8bbc57e57710c0eff7bc8 \
+ rmd160 a66017c6b8a7e0a1de6be945e3823a7ab2051c75
worksrcdir rpm-${version}
depends_build port:expat port:neon \
@@ -37,12 +37,8 @@
bin:bzip2:bzip2 \
bin:unzip:unzip
-patchfiles patch-macros.in patch-jsstddef.h patch-jsprf.c
+patchfiles patch-macros.in
-post-patch {
- file copy ${worksrcpath}/js/src/jsfile.msg ${worksrcpath}/js/rpmjsfile.msg
-}
-
build.type gnu
configure.args --disable-nls --without-javaglue --without-included-gettext \
@@ -107,3 +103,19 @@
configure.args-delete --without-apidocs
configure.args-append --with-apidocs
}
+
+variant python26 description { use python 2.6 instead of python 2.5 } {
+ depends_lib-delete port:python25
+ depends_lib-append port:python26
+ configure.args-delete --with-python=2.5
+ configure.args-append --with-python=2.6
+ configure.env-delete __PYTHON=${prefix}/bin/python2.5
+ configure.env-append __PYTHON=${prefix}/bin/python2.6
+}
+
+variant perl5_10 description { use perl 5.10 instead of perl 5.8 } {
+ depends_lib-delete port:perl5.8
+ depends_lib-append port:perl5.10
+ configure.env-delete __PERL=${prefix}/bin/perl5.8
+ configure.env-append __PERL=${prefix}/bin/perl5.10
+}
Deleted: trunk/dports/sysutils/rpm52/files/patch-jsprf.c
===================================================================
--- trunk/dports/sysutils/rpm52/files/patch-jsprf.c 2010-11-19 20:55:33 UTC (rev 73599)
+++ trunk/dports/sysutils/rpm52/files/patch-jsprf.c 2010-11-19 20:55:59 UTC (rev 73600)
@@ -1,17 +0,0 @@
-Index: js/src/jsprf.c
-===================================================================
-RCS file: /v/rpm/cvs/js/src/jsprf.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.2
-diff -u -r1.1.1.1 -r1.1.1.1.2.2
---- js/src/jsprf.c 20 Apr 2009 18:27:13 -0000 1.1.1.1
-+++ js/src/jsprf.c 24 Jul 2009 11:18:57 -0000 1.1.1.1.2.2
-@@ -57,7 +57,7 @@
- ** and requires array notation.
- */
- #ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar)
-+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
- #elif defined(HAVE_VA_LIST_AS_ARRAY)
- #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
- #else
Deleted: trunk/dports/sysutils/rpm52/files/patch-jsstddef.h
===================================================================
--- trunk/dports/sysutils/rpm52/files/patch-jsstddef.h 2010-11-19 20:55:33 UTC (rev 73599)
+++ trunk/dports/sysutils/rpm52/files/patch-jsstddef.h 2010-11-19 20:55:59 UTC (rev 73600)
@@ -1,11 +0,0 @@
---- js/src/jsstddef.h.orig 2009-04-20 20:27:12.000000000 +0200
-+++ js/src/jsstddef.h 2009-07-24 22:56:46.000000000 +0200
-@@ -79,5 +79,8 @@
- #endif
-
- #include <stddef.h>
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101119/6191566c/attachment.html>