diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-05-23 02:13:42 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-05-23 02:13:42 +0000 |
| commit | 1ff4553a181565a9105d60db954655908fd8b398 (patch) | |
| tree | 928c4e1db6c3122b4153b6542749b5365614eb30 /comms/rxtx | |
| parent | 92a486924e640cbea808bf19ca2619ae11f47091 (diff) | |
| download | ports-1ff4553a181565a9105d60db954655908fd8b398.tar.gz ports-1ff4553a181565a9105d60db954655908fd8b398.zip | |
Notes
Diffstat (limited to 'comms/rxtx')
| -rw-r--r-- | comms/rxtx/Makefile | 3 | ||||
| -rw-r--r-- | comms/rxtx/files/patch-Makefile.in | 24 | ||||
| -rw-r--r-- | comms/rxtx/files/patch-Makefile.in-libtool | 11 | ||||
| -rw-r--r-- | comms/rxtx/pkg-plist | 6 |
4 files changed, 19 insertions, 25 deletions
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile index 6e6e01e0f8d5..c06933b0074f 100644 --- a/comms/rxtx/Makefile +++ b/comms/rxtx/Makefile @@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/pre/} MAINTAINER= mirror176@cox.net COMMENT= Native interface to serial ports in Java -USES= gmake zip +USES= gmake zip libtool USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native @@ -25,7 +25,6 @@ NO_MTREE= yes PLIST_SUB= ARCH=${ARCH} -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure ${WRKSRC}/ltconfig diff --git a/comms/rxtx/files/patch-Makefile.in b/comms/rxtx/files/patch-Makefile.in index c8a3996f115c..058f1e108a78 100644 --- a/comms/rxtx/files/patch-Makefile.in +++ b/comms/rxtx/files/patch-Makefile.in @@ -1,13 +1,21 @@ -$FreeBSD$ - ---- Makefile.in.orig Fri Apr 9 23:57:20 2004 -+++ Makefile.in Fri Apr 9 23:58:06 2004 -@@ -451,7 +451,7 @@ - echo $$i; \ +--- Makefile.in.orig 2008-12-31 10:29:12.000000000 +0800 ++++ Makefile.in 2014-05-23 10:05:55.350336425 +0800 +@@ -619,13 +619,15 @@ $(CLASSES): $(javafiles) $(TOP)/Makefile + # install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its + # proper location + install: all ++ @$(MKDIR_P) $(DESTDIR)$(RXTX_PATH) + @$(LIBTOOL_INST) \ + `for i in $(TARGETLIB);do \ + if [ -f $$i ];then \ +- echo $$i; \ ++ echo $(TOP)/$$i; \ fi; \ - done` $(RXTX_PATH) +- done` $(RXTX_PATH) - $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ -+ $(BSD_INSTALL_DATA) $(JARTARGET) $(JHOME)/ ++ done` $(DESTDIR)$(RXTX_PATH) ++ @$(MKDIR_P) $(DESTDIR)$(JHOME) ++ $(BSD_INSTALL_DATA) $(JARTARGET) $(DESTDIR)$(JHOME)/ clean-generic: rm -rf $(DEST) $(TOP)/$(CLASSTOP) diff --git a/comms/rxtx/files/patch-Makefile.in-libtool b/comms/rxtx/files/patch-Makefile.in-libtool deleted file mode 100644 index d4012be33e2e..000000000000 --- a/comms/rxtx/files/patch-Makefile.in-libtool +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri May 5 10:53:02 2006 -+++ Makefile.in Fri May 5 10:54:08 2006 -@@ -448,7 +448,7 @@ - @$(LIBTOOL_INST) \ - `for i in $(TARGETLIB);do \ - if [ -f $$i ];then \ -- echo $$i; \ -+ echo $(TOP)/$$i; \ - fi; \ - done` $(RXTX_PATH) - $(BSD_INSTALL_DATA) $(JARTARGET) $(JHOME)/ diff --git a/comms/rxtx/pkg-plist b/comms/rxtx/pkg-plist index e759292a1fe5..b77522182748 100644 --- a/comms/rxtx/pkg-plist +++ b/comms/rxtx/pkg-plist @@ -1,7 +1,5 @@ lib/ext/RXTXcomm.jar -lib/%%ARCH%%/librxtxParallel-2.2pre1.so -lib/%%ARCH%%/librxtxParallel.la lib/%%ARCH%%/librxtxParallel.so -lib/%%ARCH%%/librxtxSerial-2.2pre1.so -lib/%%ARCH%%/librxtxSerial.la +lib/%%ARCH%%/librxtxParallel-2.2pre1.so lib/%%ARCH%%/librxtxSerial.so +lib/%%ARCH%%/librxtxSerial-2.2pre1.so |