Revision: 102356 https://trac.macports.org/changeset/102356 Author: cal@macports.org Date: 2013-01-31 15:28:24 -0800 (Thu, 31 Jan 2013) Log Message: ----------- dex2jar: fix classpath Modified Paths: -------------- trunk/dports/java/dex2jar/Portfile trunk/dports/java/dex2jar/files/patch-adjust-classpath.diff Modified: trunk/dports/java/dex2jar/Portfile =================================================================== --- trunk/dports/java/dex2jar/Portfile 2013-01-31 23:12:56 UTC (rev 102355) +++ trunk/dports/java/dex2jar/Portfile 2013-01-31 23:28:24 UTC (rev 102356) @@ -5,6 +5,7 @@ name dex2jar version 0.0.9.12-a +revision 1 maintainers cal openmaintainer categories java android devel @@ -34,9 +35,13 @@ worksrcdir dex2jar-0.0.9.12 patchfiles patch-adjust-classpath.diff +post-patch { + eval reinplace -W ${worksrcpath} "s#@@PREFIX@@#${prefix}#g" [glob -directory ${worksrcpath} *.sh] +} + use_configure no build {} -destroot { +destroot { xinstall -m 0755 -W ${worksrcpath} \ d2j-apk-sign.sh d2j-asm-verify.sh d2j-decrpyt-string.sh d2j-dex-asmifier.sh \ d2j-dex-dump.sh d2j-dex2jar.sh d2j-init-deobf.sh d2j-jar-access.sh d2j-jar-remap.sh \ Modified: trunk/dports/java/dex2jar/files/patch-adjust-classpath.diff =================================================================== --- trunk/dports/java/dex2jar/files/patch-adjust-classpath.diff 2013-01-31 23:12:56 UTC (rev 102355) +++ trunk/dports/java/dex2jar/files/patch-adjust-classpath.diff 2013-01-31 23:28:24 UTC (rev 102356) @@ -1,6 +1,6 @@ ---- d2j-apk-sign.sh.orig 2013-01-31 23:50:23.000000000 +0100 -+++ d2j-apk-sign.sh 2013-01-31 23:51:32.000000000 +0100 -@@ -17,24 +17,4 @@ +--- d2j-apk-sign.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-apk-sign.sh 2013-02-01 00:22:42.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -19,16 +19,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.ApkSign" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.ApkSign" $@ ---- d2j-asm-verify.sh.orig 2013-01-31 23:50:23.000000000 +0100 -+++ d2j-asm-verify.sh 2013-01-31 23:53:14.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-asm-verify.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-asm-verify.sh 2013-02-01 00:23:17.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -47,16 +46,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.AsmVerify" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.AsmVerify" $@ ---- d2j-decrpyt-string.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-decrpyt-string.sh 2013-01-31 23:53:56.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-decrpyt-string.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-decrpyt-string.sh 2013-02-01 00:23:22.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -75,16 +73,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DecryptStringCmd" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.DecryptStringCmd" $@ ---- d2j-dex-asmifier.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-dex-asmifier.sh 2013-01-31 23:54:14.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-dex-asmifier.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-dex-asmifier.sh 2013-02-01 00:23:26.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -103,16 +100,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.util.ASMifierFileV" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.util.ASMifierFileV" $@ ---- d2j-dex-dump.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-dex-dump.sh 2013-01-31 23:54:37.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-dex-dump.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-dex-dump.sh 2013-02-01 00:23:27.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -131,16 +127,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.util.Dump" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.util.Dump" $@ ---- d2j-dex2jar.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-dex2jar.sh 2013-01-31 23:55:00.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-dex2jar.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-dex2jar.sh 2013-02-01 00:23:31.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -159,16 +154,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Dex2jarCmd" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Dex2jarCmd" $@ ---- d2j-init-deobf.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-init-deobf.sh 2013-01-31 23:55:07.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-init-deobf.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-init-deobf.sh 2013-02-01 00:23:32.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -187,16 +181,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.DeObfInitCmd" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.DeObfInitCmd" $@ ---- d2j-jar-access.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-jar-access.sh 2013-01-31 23:55:11.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-jar-access.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-jar-access.sh 2013-02-01 00:23:33.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -215,16 +208,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarAccessCmd" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.JarAccessCmd" $@ ---- d2j-jar-remap.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-jar-remap.sh 2013-01-31 23:55:15.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-jar-remap.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-jar-remap.sh 2013-02-01 00:23:35.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -243,16 +235,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.JarRemap" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.JarRemap" $@ ---- d2j-jar2dex.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-jar2dex.sh 2013-01-31 23:55:19.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-jar2dex.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-jar2dex.sh 2013-02-01 00:23:36.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -271,16 +262,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jar2Dex" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Jar2Dex" $@ ---- d2j-jar2jasmin.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-jar2jasmin.sh 2013-01-31 23:55:23.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-jar2jasmin.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-jar2jasmin.sh 2013-02-01 00:23:37.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -299,16 +289,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jar2Jasmin" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Jar2Jasmin" $@ ---- d2j-jasmin2jar.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ d2j-jasmin2jar.sh 2013-01-31 23:55:27.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- d2j-jasmin2jar.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ d2j-jasmin2jar.sh 2013-02-01 00:23:38.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -327,16 +316,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.tools.Jasmin2Jar" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.tools.Jasmin2Jar" $@ ---- dex-dump.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ dex-dump.sh 2013-01-31 23:55:36.000000000 +0100 -@@ -1,23 +1,3 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- dex-dump.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ dex-dump.sh 2013-02-01 00:24:00.000000000 +0100 +@@ -1,22 +1,7 @@ #!/bin/sh -# copy from $Tomcat/bin/startup.sh @@ -354,16 +342,15 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.util.Dump" $1 $2 $3 $4 $5 $6 -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.util.Dump" $1 $2 $3 $4 $5 $6 ---- dex2jar.sh.orig 2013-01-31 23:50:24.000000000 +0100 -+++ dex2jar.sh 2013-01-31 23:55:41.000000000 +0100 -@@ -17,24 +17,4 @@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done +--- dex2jar.sh.orig 2013-02-01 00:21:45.000000000 +0100 ++++ dex2jar.sh 2013-02-01 00:23:43.000000000 +0100 +@@ -17,23 +17,8 @@ # limitations under the License. # @@ -382,10 +369,9 @@ -PRGDIR=`dirname "$PRG"` -# - --_classpath="." + _classpath="." -for k in "$PRGDIR"/lib/*.jar --do -- _classpath="${_classpath}:${k}" --done --java -Xms512m -Xmx1024m -classpath "${_classpath}" "com.googlecode.dex2jar.v3.Main" $@ -+java -Xms512m -Xmx1024m -classpath "@@PREFIX@@/lib/dex2jar" "com.googlecode.dex2jar.v3.Main" $@ ++for k in @@PREFIX@@/lib/dex2jar/*.jar + do + _classpath="${_classpath}:${k}" + done