diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-10-13 15:23:00 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-10-13 15:23:00 +0000 |
| commit | 2e57ca699ea0a0466d4dfe3276dc4b8df7a7d210 (patch) | |
| tree | 924942399bf452a764f16a4412c7495baa826358 /comms | |
| parent | 86bc551392b9b3458b55ad905521b46e7f6e00d5 (diff) | |
| download | ports-2e57ca699ea0a0466d4dfe3276dc4b8df7a7d210.tar.gz ports-2e57ca699ea0a0466d4dfe3276dc4b8df7a7d210.zip | |
. Make this port build and install correctly on amd64 (and hopefully on
all future architectures we might support).
Approved by: "Ari Suutari" <ari.suutari@syncrontech.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=145274
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/java-commapi-freebsd/Makefile | 4 | ||||
| -rw-r--r-- | comms/java-commapi-freebsd/files/patch-Makefile | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile index 453ff9580c42..2bf0a0faabc0 100644 --- a/comms/java-commapi-freebsd/Makefile +++ b/comms/java-commapi-freebsd/Makefile @@ -28,8 +28,8 @@ MAKE_ENV= JAVA_HOME=${JDKDIR} PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/${PREFIX}\///} PLIST_FILES= %%JAVA_HOME%%/jre/lib/ext/CommDriver.jar \ - %%JAVA_HOME%%/jre/lib/i386/libSerial.so \ - %%JAVA_HOME%%/jre/lib/i386/libParallel.so \ + %%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libSerial.so \ + %%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libParallel.so \ %%JAVA_HOME%%/jre/lib/javax.comm.properties .include <bsd.port.mk> diff --git a/comms/java-commapi-freebsd/files/patch-Makefile b/comms/java-commapi-freebsd/files/patch-Makefile new file mode 100644 index 000000000000..3fa6c647168e --- /dev/null +++ b/comms/java-commapi-freebsd/files/patch-Makefile @@ -0,0 +1,23 @@ +--- Makefile.orig Thu Jan 30 04:31:19 2003 ++++ Makefile Wed Oct 12 23:13:45 2005 +@@ -24,7 +24,8 @@ + 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 + + .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 + |