Date: Wed, 25 Mar 2020 23:14:00 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529138 - head/devel/libmatthew Message-ID: <202003252314.02PNE0jK051647@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003252314.02PNE0jK051647>