From owner-svn-ports-all@freebsd.org Wed Mar 25 23:14:15 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83BFF266670; Wed, 25 Mar 2020 23:14:15 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nkTG49qxz48C8; Wed, 25 Mar 2020 23:14:09 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 54C19238AA; Wed, 25 Mar 2020 23:14:01 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02PNE1qZ051649; Wed, 25 Mar 2020 23:14:01 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02PNE0jK051647; Wed, 25 Mar 2020 23:14:00 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003252314.02PNE0jK051647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 25 Mar 2020 23:14:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529138 - head/devel/libmatthew X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/devel/libmatthew X-SVN-Commit-Revision: 529138 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 23:14:15 -0000 Author: 0mp Date: Wed Mar 25 23:14:00 2020 New Revision: 529138 URL: https://svnweb.freebsd.org/changeset/ports/529138 Log: Respect JAVAJARDIR and LIBDIR I just realized that there's probably no reason to install files of this port into non-standard directories. Modified: head/devel/libmatthew/Makefile head/devel/libmatthew/pkg-plist Modified: head/devel/libmatthew/Makefile ============================================================================== --- head/devel/libmatthew/Makefile Wed Mar 25 23:04:33 2020 (r529137) +++ head/devel/libmatthew/Makefile Wed Mar 25 23:14:00 2020 (r529138) @@ -2,6 +2,7 @@ PORTNAME= libmatthew DISTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= http://www.matthew.ath.cx/projects/java/ DISTNAME= ${PORTNAME}-java-${DISTVERSION} @@ -18,10 +19,12 @@ USES= gmake localbase:ldconfig USE_JAVA= yes USE_LDCONFIG= yes -MAKE_ENV= JAVA_HOME='${JAVA_HOME}' \ - LDSHAREFLAGS='-fpic -shared' +MAKE_ENV= JARDIR=${JAVAJARDIR} \ + JAVA_HOME=${JAVA_HOME} \ + LDSHAREFLAGS='-fpic -shared' \ + LIBDIR=${PREFIX}/lib post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/jni/*-java.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*-java.so .include Modified: head/devel/libmatthew/pkg-plist ============================================================================== --- head/devel/libmatthew/pkg-plist Wed Mar 25 23:04:33 2020 (r529137) +++ head/devel/libmatthew/pkg-plist Wed Mar 25 23:14:00 2020 (r529138) @@ -1,14 +1,14 @@ -lib/jni/libcgi-java.so -lib/jni/libunix-java.so -%%JAVASHAREDIR%%/cgi-0.6.jar -%%JAVASHAREDIR%%/cgi.jar -%%JAVASHAREDIR%%/debug-disable-1.1.jar -%%JAVASHAREDIR%%/debug-disable.jar -%%JAVASHAREDIR%%/debug-enable-1.1.jar -%%JAVASHAREDIR%%/debug-enable.jar -%%JAVASHAREDIR%%/hexdump-0.2.jar -%%JAVASHAREDIR%%/hexdump.jar -%%JAVASHAREDIR%%/io-0.1.jar -%%JAVASHAREDIR%%/io.jar -%%JAVASHAREDIR%%/unix-0.5.jar -%%JAVASHAREDIR%%/unix.jar +lib/libcgi-java.so +lib/libunix-java.so +%%JAVAJARDIR%%/cgi-0.6.jar +%%JAVAJARDIR%%/cgi.jar +%%JAVAJARDIR%%/debug-disable-1.1.jar +%%JAVAJARDIR%%/debug-disable.jar +%%JAVAJARDIR%%/debug-enable-1.1.jar +%%JAVAJARDIR%%/debug-enable.jar +%%JAVAJARDIR%%/hexdump-0.2.jar +%%JAVAJARDIR%%/hexdump.jar +%%JAVAJARDIR%%/io-0.1.jar +%%JAVAJARDIR%%/io.jar +%%JAVAJARDIR%%/unix-0.5.jar +%%JAVAJARDIR%%/unix.jar