Module Name: pkgsrc
Committed By: abs
Date: Mon Dec 2 13:44:42 UTC 2024
Modified Files:
pkgsrc/devel/java-jna: Makefile
Removed Files:
pkgsrc/devel/java-jna: PLIST PLIST.java11-javadoc PLIST.java17-javadoc
PLIST.java21-javadoc PLIST.java8-javadoc
Log Message:
Switch to dynamic PLIST generation
Comment added to Makefile:
Generated support files in ${PREFIX}/doc vary based on the version of java
used to build, each of 8, 11, 17 and 21 have significant differences. The
documentation is the same, but not the jquery, frame layout and similar files
Approved by nonakap%gmail.com@localhost
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/java-jna/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/java-jna/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/java-jna/PLIST.java11-javadoc
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/java-jna/PLIST.java17-javadoc
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/java-jna/PLIST.java21-javadoc
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/java-jna/PLIST.java8-javadoc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/java-jna/Makefile
diff -u pkgsrc/devel/java-jna/Makefile:1.16 pkgsrc/devel/java-jna/Makefile:1.17
--- pkgsrc/devel/java-jna/Makefile:1.16 Thu Nov 28 19:53:23 2024
+++ pkgsrc/devel/java-jna/Makefile Mon Dec 2 13:44:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/11/28 19:53:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2024/12/02 13:44:42 abs Exp $
DISTNAME= jna-5.15.0
PKGNAME= java-${DISTNAME}
@@ -48,7 +48,13 @@ JNISFX.Cygwin= dll
JNISFX.Darwin= jnilib
JNISFX.AIX= a
JNISFX.*= so
-PLIST_SUBST+= JNIPFX=${JNIPFX} JNISFX=${JNISFX}
+
+# Generated support files in ${PREFIX}/doc vary based on the version of java
+# used to build, each of 8, 11, 17 and 21 have significant differences. The
+# documentation is the same, but not the jquery, frame layout and similar files
+GENERATE_PLIST+= \
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} lib share \( -type f -or -type l \) -print | ${SORT};
.include "../../mk/bsd.prefs.mk"
.include "../../mk/java-vm.mk"
@@ -57,18 +63,6 @@ PLIST_SUBST+= JNIPFX=${JNIPFX} JNISFX=${
DEPENDS+= openjdk8>=1.8.202:../../lang/openjdk8
.endif
-# JDK 11 or later doesn't generate frames
-PLIST_SRC= PLIST
-.if !empty(PKG_JVM:M*[a-z]7*) || !empty(PKG_JVM:M*[a-z]8*)
-PLIST_SRC+= PLIST.java8-javadoc
-.elif !empty(PKG_JVM:M*11*)
-PLIST_SRC+= PLIST.java11-javadoc
-.elif !empty(PKG_JVM:M*17*)
-PLIST_SRC+= PLIST.java17-javadoc
-.else
-PLIST_SRC+= PLIST.java21-javadoc
-.endif
-
TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
INSTALLATION_DIRS+= \
@@ -91,7 +85,7 @@ BUILDLINK_TRANSFORM+= rm:-Wno-unknown-wa
do-build:
cd ${WRKSRC} && \
- ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
+ ${_ULIMIT_CMD:Q}${SETENV:Q} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
do-install:
${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \