aboutsummaryrefslogtreecommitdiff
path: root/comms/java-commapi-freebsd/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'comms/java-commapi-freebsd/files/patch-Makefile')
-rw-r--r--comms/java-commapi-freebsd/files/patch-Makefile24
1 files changed, 6 insertions, 18 deletions
diff --git a/comms/java-commapi-freebsd/files/patch-Makefile b/comms/java-commapi-freebsd/files/patch-Makefile
index 3fa6c647168e..5219de48f822 100644
--- a/comms/java-commapi-freebsd/files/patch-Makefile
+++ b/comms/java-commapi-freebsd/files/patch-Makefile
@@ -1,23 +1,11 @@
---- Makefile.orig Thu Jan 30 04:31:19 2003
-+++ Makefile Wed Oct 12 23:13:45 2005
-@@ -24,7 +24,8 @@
+--- Makefile.orig Fri Feb 23 09:33:44 2007
++++ Makefile Fri Feb 23 09:34:09 2007
+@@ -24,7 +24,7 @@
JAVAC_CLASSPATH = $(JAVA_HOME)/jre/lib/ext/comm.jar
JAVAH = $(JAVA_HOME)/bin/javah
JARFILE = jar/CommDriver.jar
--CFLAGS = -O1 -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(JAVA_HOME)/include/bsd
-+CFLAGS = -O1 -fPIC -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(JAVA_HOME)/include/bsd
-+MACHINE_ARCH ?= i386
+-CFLAGS = -O1 -fPIC -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(JAVA_HOME)/include/bsd
++CFLAGS += -fPIC -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(JAVA_HOME)/include/bsd
+ MACHINE_ARCH ?= i386
.SUFFIXES: .java .class
-
-@@ -37,8 +38,8 @@
- # Install stuff
- #
- install: all
-- install -c -o bin -g bin -m 0444 lib/libParallel.so $(JAVA_HOME)/jre/lib/i386
-- install -c -o bin -g bin -m 0444 lib/libSerial.so $(JAVA_HOME)/jre/lib/i386
-+ install -c -o bin -g bin -m 0444 lib/libParallel.so $(JAVA_HOME)/jre/lib/$(MACHINE_ARCH)
-+ install -c -o bin -g bin -m 0444 lib/libSerial.so $(JAVA_HOME)/jre/lib/$(MACHINE_ARCH)
- install -c -o bin -g bin -m 0444 javax.comm.properties $(JAVA_HOME)/jre/lib
- install -c -o bin -g bin -m 0444 $(JARFILE) $(JAVA_HOME)/jre/lib/ext
-