Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 May 2014 02:13:42 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r354904 - in head/comms/rxtx: . files
Message-ID:  <201405230213.s4N2Dge2039229@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Fri May 23 02:13:42 2014
New Revision: 354904
URL: http://svnweb.freebsd.org/changeset/ports/354904
QAT: https://qat.redports.org/buildarchive/r354904/

Log:
  Stageify.
  
  Approved by:	portmgr@

Deleted:
  head/comms/rxtx/files/patch-Makefile.in-libtool
Modified:
  head/comms/rxtx/Makefile
  head/comms/rxtx/files/patch-Makefile.in   (contents, props changed)
  head/comms/rxtx/pkg-plist

Modified: head/comms/rxtx/Makefile
==============================================================================
--- head/comms/rxtx/Makefile	Fri May 23 02:06:09 2014	(r354903)
+++ head/comms/rxtx/Makefile	Fri May 23 02:13:42 2014	(r354904)
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/
 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
 

Modified: head/comms/rxtx/files/patch-Makefile.in
==============================================================================
--- head/comms/rxtx/files/patch-Makefile.in	Fri May 23 02:06:09 2014	(r354903)
+++ head/comms/rxtx/files/patch-Makefile.in	Fri May 23 02:13:42 2014	(r354904)
@@ -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)

Modified: head/comms/rxtx/pkg-plist
==============================================================================
--- head/comms/rxtx/pkg-plist	Fri May 23 02:06:09 2014	(r354903)
+++ head/comms/rxtx/pkg-plist	Fri May 23 02:13:42 2014	(r354904)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405230213.s4N2Dge2039229>