diff options
| -rw-r--r-- | dev-java/libmatthew-java/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch | 12 | ||||
| -rw-r--r-- | dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-java/libmatthew-java/ChangeLog b/dev-java/libmatthew-java/ChangeLog index 840963063af2..b05c083d70ea 100644 --- a/dev-java/libmatthew-java/ChangeLog +++ b/dev-java/libmatthew-java/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/libmatthew-java # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.17 2012/03/09 14:21:02 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/ChangeLog,v 1.18 2012/05/29 10:06:52 naota Exp $ + + 29 May 2012; Naohiro Aota <naota@gentoo.org> + files/libmatthew-java-0.7.2-makefile-fixes.patch, + libmatthew-java-0.7.2-r1.ebuild: + Add ~x86-fbsd. #406009 09 Mar 2012; Brent Baude <ranger@gentoo.org> libmatthew-java-0.7.2-r1.ebuild: Marking libmatthew-java-0.7.2-r1 ppc64 for bug 396877 diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch index 1720f01c48db..1132a7e1ce76 100644 --- a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch +++ b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch @@ -1,7 +1,7 @@ diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile --- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300 +++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200 -@@ -6,13 +6,13 @@ +@@ -6,13 +6,12 @@ CC?=gcc LD?=gcc JPPFLAGS+=-C -P @@ -13,7 +13,6 @@ diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile JVERCFLAGS+=-source 1.5 JCFLAGS+= -INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -+INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ LDVER?=$(shell ld -v | cut -d' ' -f1) @@ -51,17 +50,20 @@ diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile unix-java.h: .classes $(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream cgi-java.h: .classes -@@ -91,12 +85,10 @@ +@@ -91,13 +85,11 @@ + tar zcf $@ libmatthew-java-$(MATTVER) debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp - make .enabledebug +- make .enabledebug - echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest - (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) ++ $(MAKE) .enabledebug + (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp - make .disabledebug +- make .disabledebug - echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest - (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) ++ $(MAKE) .disabledebug + (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) .enabledebug: cx/ath/matthew/debug/Debug.jpp mkdir -p classes diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild index 4cd9b4abc431..85698bf6c5fe 100644 --- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild +++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild,v 1.5 2012/03/09 14:21:02 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild,v 1.6 2012/05/29 10:06:52 naota Exp $ JAVA_PKG_IUSE="doc source" inherit eutils java-pkg-2 flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" IUSE="" RDEPEND=">=virtual/jre-1.5" |