[73780] trunk/dports/textproc/fop
jeremyhu at macports.org
jeremyhu at macports.org
Wed Nov 24 20:29:17 PST 2010
Revision: 73780
http://trac.macports.org/changeset/73780
Author: jeremyhu at macports.org
Date: 2010-11-24 20:29:13 -0800 (Wed, 24 Nov 2010)
Log Message:
-----------
fop: Make the headless patch cleaner
Modified Paths:
--------------
trunk/dports/textproc/fop/Portfile
Added Paths:
-----------
trunk/dports/textproc/fop/files/
trunk/dports/textproc/fop/files/headless.patch
Modified: trunk/dports/textproc/fop/Portfile
===================================================================
--- trunk/dports/textproc/fop/Portfile 2010-11-25 04:22:40 UTC (rev 73779)
+++ trunk/dports/textproc/fop/Portfile 2010-11-25 04:29:13 UTC (rev 73780)
@@ -4,6 +4,7 @@
name fop
version 1.0
+revision 1
categories textproc java
maintainers boeyms openmaintainer
platforms darwin
@@ -34,10 +35,7 @@
rmd160 44318681ffb997952560900fb6c103e8eb6aac3c
worksrcdir ${name}-${version}
-pre-patch {
- # https://trac.macports.org/ticket/26686
- reinplace {s:^fop_exec_args=$:fop_exec_args="-Djava.awt.headless=true":} ${worksrcpath}/fop
-}
+patchfiles headless.patch
use_configure no
build {}
Added: trunk/dports/textproc/fop/files/headless.patch
===================================================================
--- trunk/dports/textproc/fop/files/headless.patch (rev 0)
+++ trunk/dports/textproc/fop/files/headless.patch 2010-11-25 04:29:13 UTC (rev 73780)
@@ -0,0 +1,19 @@
+--- fop.orig 2010-11-24 23:25:55.000000000 -0500
++++ fop 2010-11-24 23:26:29.000000000 -0500
+@@ -19,6 +19,7 @@
+
+ rpm_mode=true
+ fop_exec_args=
++java_exec_args="-Djava.awt.headless=true"
+ no_config=false
+ fop_exec_debug=false
+ show_help=false
+@@ -247,7 +248,7 @@ fi
+
+ # Execute FOP using eval/exec to preserve spaces in paths,
+ # java options, and FOP args
+-fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
++fop_exec_command="exec \"$JAVACMD\" $java_exec_args $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
+ if $fop_exec_debug ; then
+ echo $fop_exec_command
+ fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101124/eaae9906/attachment.html>
More information about the macports-changes
mailing list