. 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)
This commit is contained in:
Greg Lewis 2005-10-13 15:23:00 +00:00
parent 86bc551392
commit 2e57ca699e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=145274
2 changed files with 25 additions and 2 deletions

View File

@ -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>

View File

@ -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