CVS commit: pkgsrc/devel/java-jna

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jan 22 01:22:46 UTC 2021

Modified Files:
        pkgsrc/devel/java-jna: Makefile PLIST.java11-javadoc

Log Message:
java-jna: fix builds with openjdk11 and recent GCC versions

The most recent openjdk11 update resulted in a change to the jquery
version that affects PLIST population of this package. Separately, there
are upstream compiler flags that were causing compilation failures with
recent GCC versions, e.g., 9.3 on NetBSD 9.99.78. (Since different Java
11 packages in pkgsrc aren't aligned with each other release-wise, this
may cause breakage elsewhere, but this at least fixes recent NetBSD on
x86. There's an unrelated problem with this package building on SmartOS
which I'll deal with separately.)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/java-jna/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/java-jna/PLIST.java11-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.5 pkgsrc/devel/java-jna/Makefile:1.6
--- pkgsrc/devel/java-jna/Makefile:1.5  Fri Jun 26 10:26:08 2020
+++ pkgsrc/devel/java-jna/Makefile      Fri Jan 22 01:22:46 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/06/26 10:26:08 yyamano Exp $
+# $NetBSD: Makefile,v 1.6 2021/01/22 01:22:46 gutteridge Exp $
 
 DISTNAME=      jna-5.2.0
 PKGNAME=       java-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=java-native-access/}
 GITHUB_PROJECT=        jna
@@ -78,6 +78,12 @@ ANT_ARGS+=   -Dcflags_extra.native=""
 ANT_ARGS+=     -DCC=${CC}
 ANT_TARGET=    jar contrib-jars javadoc
 
+# Needed with recent GCC versions, e.g., 9.3.
+BUILDLINK_TRANSFORM+=  rm:-Werror
+.if empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+=  rm:-Wno-unknown-warning-option
+.endif
+
 do-build:
        cd ${WRKSRC} && \
            ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}

Index: pkgsrc/devel/java-jna/PLIST.java11-javadoc
diff -u pkgsrc/devel/java-jna/PLIST.java11-javadoc:1.1 pkgsrc/devel/java-jna/PLIST.java11-javadoc:1.2
--- pkgsrc/devel/java-jna/PLIST.java11-javadoc:1.1      Fri Jun 26 10:26:08 2020
+++ pkgsrc/devel/java-jna/PLIST.java11-javadoc  Fri Jan 22 01:22:46 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java11-javadoc,v 1.1 2020/06/26 10:26:08 yyamano Exp $
+@comment $NetBSD: PLIST.java11-javadoc,v 1.2 2021/01/22 01:22:46 gutteridge Exp $
 share/doc/java-jna/doc/javadoc/allclasses-index.html
 share/doc/java-jna/doc/javadoc/allclasses.html
 share/doc/java-jna/doc/javadoc/allpackages-index.html
@@ -1184,8 +1184,7 @@ share/doc/java-jna/doc/javadoc/jquery/im
 share/doc/java-jna/doc/javadoc/jquery/images/ui-icons_454545_256x240.png
 share/doc/java-jna/doc/javadoc/jquery/images/ui-icons_888888_256x240.png
 share/doc/java-jna/doc/javadoc/jquery/images/ui-icons_cd0a0a_256x240.png
-share/doc/java-jna/doc/javadoc/jquery/jquery-3.3.1.js
-share/doc/java-jna/doc/javadoc/jquery/jquery-migrate-3.0.1.js
+share/doc/java-jna/doc/javadoc/jquery/jquery-3.5.1.js
 share/doc/java-jna/doc/javadoc/jquery/jquery-ui.css
 share/doc/java-jna/doc/javadoc/jquery/jquery-ui.js
 share/doc/java-jna/doc/javadoc/jquery/jquery-ui.min.css