Index: head/devel/jna/Makefile =================================================================== --- head/devel/jna/Makefile (revision 527890) +++ head/devel/jna/Makefile (revision 527891) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= jna -PORTVERSION= 4.5.2 +PORTVERSION= 5.5.0 CATEGORIES= devel java MAINTAINER= ports@FreeBSD.org COMMENT= Java access to native shared libraries LICENSE= LGPL21+ APACHE20 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENSE.LGPL -LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.AL +LICENSE_FILE_LGPL21+ = ${WRKSRC}/LGPL2.1 +LICENSE_FILE_APACHE20= ${WRKSRC}/AL2.0 BROKEN_armv6= fails to compile: build.xml: compilation failed BROKEN_armv7= fails to compile: build.xml: compilation failed USES= autoreconf:build gmake libtool xorg USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 8 +JAVA_VERSION= 8+ USE_XORG= x11 xt MAKE_ARGS= -DCC="${CC}" -DLD="${LD}" MAKE_ENV= ANT_OPTS=-Drelease -DARCH=${ANT_ARCH} USE_GITHUB= yes GH_ACCOUNT= java-native-access PORTDOCS= javadoc platform-${PORTVERSION}-javadoc.jar PLIST_FILES= %%JAVAJARDIR%%/jna-platform.jar \ %%JAVAJARDIR%%/jna.jar ALL_TARGET= native jar TEST_TARGET= test OPTIONS_DEFINE= DOCS ANT_ARCH= ${ARCH:S/amd64/x86-64/:S/i386/x86/:S/powerpc64/ppc64/} post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/native/Makefile post-build-DOCS-on: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} javadoc do-install: ${INSTALL_DATA} ${WRKSRC}/build/freebsd-${ANT_ARCH}.jar \ ${STAGEDIR}${JAVAJARDIR}/jna-platform.jar ${INSTALL_DATA} ${WRKSRC}/build/jna.jar \ ${STAGEDIR}${JAVAJARDIR}/jna.jar do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION}-javadoc.jar \ ${STAGEDIR}${DOCSDIR} .include Index: head/devel/jna/distinfo =================================================================== --- head/devel/jna/distinfo (revision 527890) +++ head/devel/jna/distinfo (revision 527891) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565977477 -SHA256 (java-native-access-jna-4.5.2_GH0.tar.gz) = 64c2bdcdbc12c71c04417aac7a25b271498b1bb10403c635c3f8b2df39fd953d -SIZE (java-native-access-jna-4.5.2_GH0.tar.gz) = 74735377 +TIMESTAMP = 1581869314 +SHA256 (java-native-access-jna-5.5.0_GH0.tar.gz) = b684792ff099afba639288da75bc6ae4a2641f46a6429b5a481b7749630c56f7 +SIZE (java-native-access-jna-5.5.0_GH0.tar.gz) = 93781100 Index: head/devel/jna/files/patch-native_Makefile =================================================================== --- head/devel/jna/files/patch-native_Makefile (revision 527890) +++ head/devel/jna/files/patch-native_Makefile (revision 527891) @@ -1,37 +1,38 @@ ---- native/Makefile.orig 2017-12-27 19:27:16 UTC +--- native/Makefile.orig 2018-10-07 21:48:55 UTC +++ native/Makefile @@ -39,6 +39,8 @@ # protection simply by defining HAVE_PROTECTION. This option has been only # been enabled for those platforms on which it has been tested successfully. +unexport LDFLAGS + OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \ -e 's/MINGW32.*/win32/g' \ -e 's/SunOS.*/solaris/g' \ @@ -278,8 +280,11 @@ endif ifneq (,$(findstring bsd,$(OS))) ARCH=$(shell uname -m | sed 's/i.86/i386/g') PCFLAGS+=-fPIC -CINCLUDES+=-I/usr/X11R6/include +CINCLUDES+=-I%%LOCALBASE%%/include LDFLAGS=-o $@ -shared +ifeq ($(ARCH),i386) +LDFLAGS+=-Wl,-z,notext +endif CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT -DUSE_DEAFULT_LIBNAME_ENCODING endif -@@ -336,10 +341,10 @@ endif - ifeq ($(CC),gcc) +@@ -337,11 +342,11 @@ ifeq ($(CC),gcc) GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.') ifneq ($(GCC_MAJOR_VERSION),4) -- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable -+ LOC_CC_OPTS=-Werror -Wno-unused-variable + ifneq ($(GCC_MAJOR_VERSION),3) +- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable ++ LOC_CC_OPTS=-Wno-unused-variable + endif endif else - LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable -+ LOC_CC_OPTS=-Werror -Wno-unused-variable ++ LOC_CC_OPTS=-Wno-unused-variable endif # Enable 64-bit builds if the arch demands it