summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2007-04-29 01:34:21 +0000
committerAlistair Bush <ali_bush@gentoo.org>2007-04-29 01:34:21 +0000
commit3a841d8dd94dc45c82fcf3fb6eeb2728cb407b0f (patch)
tree4edc1222daa4a554212b53c83d5806b30b478595 /app-emulation/libdsk/files
parentFix mkdirhier not available, bug #176394 (diff)
downloadhistorical-3a841d8dd94dc45c82fcf3fb6eeb2728cb407b0f.tar.gz
historical-3a841d8dd94dc45c82fcf3fb6eeb2728cb407b0f.tar.bz2
historical-3a841d8dd94dc45c82fcf3fb6eeb2728cb407b0f.zip
Update libdsk to generation 2 java eclasses
Package-Manager: portage-2.1.2.5
Diffstat (limited to 'app-emulation/libdsk/files')
-rw-r--r--app-emulation/libdsk/files/digest-libdsk-1.1.10-r13
-rw-r--r--app-emulation/libdsk/files/java-make-fix.patch50
2 files changed, 53 insertions, 0 deletions
diff --git a/app-emulation/libdsk/files/digest-libdsk-1.1.10-r1 b/app-emulation/libdsk/files/digest-libdsk-1.1.10-r1
new file mode 100644
index 000000000000..2b1b1a08149b
--- /dev/null
+++ b/app-emulation/libdsk/files/digest-libdsk-1.1.10-r1
@@ -0,0 +1,3 @@
+MD5 18bb6e7a69c3db691b94f5e37f977317 libdsk-1.1.10.tar.gz 802326
+RMD160 e8356fdc3d6c49cdd2e1720883cd59e5f3dc3085 libdsk-1.1.10.tar.gz 802326
+SHA256 bdd11105aa2235209795200c37f782e37d8798b74b173b31516f2b47a964a8e6 libdsk-1.1.10.tar.gz 802326
diff --git a/app-emulation/libdsk/files/java-make-fix.patch b/app-emulation/libdsk/files/java-make-fix.patch
new file mode 100644
index 000000000000..a1f399c3f8dc
--- /dev/null
+++ b/app-emulation/libdsk/files/java-make-fix.patch
@@ -0,0 +1,50 @@
+diff -Naur libdsk-1.1.10.orig/lib/Makefile.am libdsk-1.1.10/lib/Makefile.am
+--- libdsk-1.1.10.orig/lib/Makefile.am 2006-04-16 00:48:10.000000000 +1200
++++ libdsk-1.1.10/lib/Makefile.am 2007-04-29 12:45:10.000000000 +1200
+@@ -5,6 +5,7 @@
+ JAVAH=@JAVAH@
+ JAVA=@JAVA@
+ JAVADOC=@JAVADOC@
++JAVACFLAGS=@JAVACFLAGS@
+ JAR=@JAR@
+ CLASSCPRE=uk.co.demon.seasip.libdsk
+ CLASSDPRE=uk/co/demon/seasip/libdsk
+@@ -83,10 +84,10 @@
+ $(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE)
+
+ $(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java
+- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+
+ %.class: $(srcdir)/%.java
+- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+
+
+ $(HEADERPRE)_%.h: $(CLASSDPRE)/%.class
+diff -Naur libdsk-1.1.10.orig/lib/Makefile.in libdsk-1.1.10/lib/Makefile.in
+--- libdsk-1.1.10.orig/lib/Makefile.in 2006-04-20 09:12:10.000000000 +1200
++++ libdsk-1.1.10/lib/Makefile.in 2007-04-29 12:50:50.000000000 +1200
+@@ -488,10 +488,10 @@
+ $(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE)
+
+ $(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java
+- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+
+ %.class: $(srcdir)/%.java
+- here=`pwd` && cd $(srcdir) && $(JAVAC) -d $$here $<
++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -d $$here $<
+
+ $(HEADERPRE)_%.h: $(CLASSDPRE)/%.class
+ $(JAVAH) -jni $(CLASSCPRE).`basename $< .class`
+diff -Naur libdsk-1.1.10.orig/tools/Makefile.am libdsk-1.1.10/tools/Makefile.am
+--- libdsk-1.1.10.orig/tools/Makefile.am 2006-04-12 10:05:09.000000000 +1200
++++ libdsk-1.1.10/tools/Makefile.am 2007-04-29 12:23:32.000000000 +1200
+@@ -32,5 +32,5 @@
+ CLEANFILES=*.class
+
+ %.class: $(srcdir)/%.java
+- here=`pwd` && cd $(srcdir) && $(JAVAC) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $<
++ here=`pwd` && cd $(srcdir) && $(JAVAC) $(JAVACFLAGS) -classpath $(CLASSPATH):$$here/../lib/libdsk.jar -d $$here $<
+