Skip to content

Commit 95f46da

Browse files
author
abs
committed
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
1 parent 21ca1c1 commit 95f46da

6 files changed

Lines changed: 9 additions & 6862 deletions

File tree

devel/java-jna/Makefile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.16 2024/11/28 19:53:23 ryoon Exp $
1+
# $NetBSD: Makefile,v 1.17 2024/12/02 13:44:42 abs Exp $
22

33
DISTNAME= jna-5.15.0
44
PKGNAME= java-${DISTNAME}
@@ -48,7 +48,13 @@ JNISFX.Cygwin= dll
4848
JNISFX.Darwin= jnilib
4949
JNISFX.AIX= a
5050
JNISFX.*= so
51-
PLIST_SUBST+= JNIPFX=${JNIPFX} JNISFX=${JNISFX}
51+
52+
# Generated support files in ${PREFIX}/doc vary based on the version of java
53+
# used to build, each of 8, 11, 17 and 21 have significant differences. The
54+
# documentation is the same, but not the jquery, frame layout and similar files
55+
GENERATE_PLIST+= \
56+
cd ${DESTDIR}${PREFIX} && \
57+
${FIND} lib share \( -type f -or -type l \) -print | ${SORT};
5258

5359
.include "../../mk/bsd.prefs.mk"
5460
.include "../../mk/java-vm.mk"
@@ -57,18 +63,6 @@ PLIST_SUBST+= JNIPFX=${JNIPFX} JNISFX=${JNISFX}
5763
DEPENDS+= openjdk8>=1.8.202:../../lang/openjdk8
5864
.endif
5965

60-
# JDK 11 or later doesn't generate frames
61-
PLIST_SRC= PLIST
62-
.if !empty(PKG_JVM:M*[a-z]7*) || !empty(PKG_JVM:M*[a-z]8*)
63-
PLIST_SRC+= PLIST.java8-javadoc
64-
.elif !empty(PKG_JVM:M*11*)
65-
PLIST_SRC+= PLIST.java11-javadoc
66-
.elif !empty(PKG_JVM:M*17*)
67-
PLIST_SRC+= PLIST.java17-javadoc
68-
.else
69-
PLIST_SRC+= PLIST.java21-javadoc
70-
.endif
71-
7266
TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
7367

7468
INSTALLATION_DIRS+= \
@@ -91,7 +85,7 @@ BUILDLINK_TRANSFORM+= rm:-Wno-unknown-warning-option
9185

9286
do-build:
9387
cd ${WRKSRC} && \
94-
${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
88+
${_ULIMIT_CMD:Q}${SETENV:Q} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
9589

9690
do-install:
9791
${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \

0 commit comments

Comments
 (0)