From owner-svn-ports-head@FreeBSD.ORG Wed Jun 4 10:33:49 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 809B1FA1; Wed, 4 Jun 2014 10:33:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 627742080; Wed, 4 Jun 2014 10:33:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54AXn3F021827; Wed, 4 Jun 2014 10:33:49 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s54AXn5P021825; Wed, 4 Jun 2014 10:33:49 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406041033.s54AXn5P021825@svn.freebsd.org> From: Martin Wilke Date: Wed, 4 Jun 2014 10:33:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356457 - in head/comms/java-commapi-freebsd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 10:33:49 -0000 Author: miwi Date: Wed Jun 4 10:33:48 2014 New Revision: 356457 URL: http://svnweb.freebsd.org/changeset/ports/356457 QAT: https://qat.redports.org/buildarchive/r356457/ Log: - Stage support PR: 189698 Modified: head/comms/java-commapi-freebsd/Makefile head/comms/java-commapi-freebsd/files/patch-Makefile Modified: head/comms/java-commapi-freebsd/Makefile ============================================================================== --- head/comms/java-commapi-freebsd/Makefile Wed Jun 4 10:33:00 2014 (r356456) +++ head/comms/java-commapi-freebsd/Makefile Wed Jun 4 10:33:48 2014 (r356457) @@ -30,5 +30,4 @@ PLIST_FILES= %%JAVA_HOME%%/jre/lib/ext/C %%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libParallel.so \ %%JAVA_HOME%%/jre/lib/javax.comm.properties -NO_STAGE= yes .include Modified: head/comms/java-commapi-freebsd/files/patch-Makefile ============================================================================== --- head/comms/java-commapi-freebsd/files/patch-Makefile Wed Jun 4 10:33:00 2014 (r356456) +++ head/comms/java-commapi-freebsd/files/patch-Makefile Wed Jun 4 10:33:48 2014 (r356457) @@ -1,5 +1,5 @@ ---- Makefile.orig 2007-02-23 07:45:16.000000000 +0000 -+++ Makefile 2013-10-30 08:31:39.773863242 +0000 +--- Makefile.old 2014-05-12 09:30:47.000000000 +0300 ++++ Makefile 2014-05-12 09:40:31.000000000 +0300 @@ -24,7 +24,7 @@ JAVAC_CLASSPATH = $(JAVA_HOME)/jre/lib/ext/comm.jar JAVAH = $(JAVA_HOME)/bin/javah @@ -9,7 +9,24 @@ MACHINE_ARCH ?= i386 .SUFFIXES: .java .class -@@ -96,7 +96,7 @@ +@@ -38,10 +38,12 @@ + # Install stuff + # + install: all +- 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 ++ install -d -c -o bin -g bin -m 0755 $(DESTDIR)$(JAVA_HOME)/jre/lib/$(MACHINE_ARCH) ++ install -d -c -o bin -g bin -m 0755 $(DESTDIR)$(JAVA_HOME)/jre/lib/ext ++ install -c -o bin -g bin -m 0444 lib/libParallel.so $(DESTDIR)$(JAVA_HOME)/jre/lib/$(MACHINE_ARCH) ++ install -c -o bin -g bin -m 0444 lib/libSerial.so $(DESTDIR)$(JAVA_HOME)/jre/lib/$(MACHINE_ARCH) ++ install -c -o bin -g bin -m 0444 javax.comm.properties $(DESTDIR)$(JAVA_HOME)/jre/lib ++ install -c -o bin -g bin -m 0444 $(JARFILE) $(DESTDIR)$(JAVA_HOME)/jre/lib/ext + + # + # Clean all files produced by compile +@@ -96,7 +98,7 @@ src/$(JAVA_PKG_DIR)/javax_comm_ParallelPort.h \ src/$(JAVA_PKG_DIR)/javax_comm_ParallelPortEvent.h if [ ! -d lib ]; then mkdir lib; fi @@ -18,7 +35,7 @@ # # Serial driver JNI part # -@@ -105,7 +105,7 @@ +@@ -105,7 +107,7 @@ src/$(JAVA_PKG_DIR)/javax_comm_SerialPort.h \ src/$(JAVA_PKG_DIR)/javax_comm_SerialPortEvent.h if [ ! -d lib ]; then mkdir lib; fi