svn commit: r348164 - in head/devel/jna: . files

[Jimmy Olgeni]

Author: olgeni
Date: Fri Mar 14 08:17:58 2014
New Revision: 348164
URL: http://svnweb.freebsd.org/changeset/ports/348164
QAT: https://qat.redports.org/buildarchive/r348164/

Log:
  Upgrade to version 4.1.0.
  
  Submitted by:	jkim

Deleted:
  head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java
  head/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java
Modified:
  head/devel/jna/Makefile
  head/devel/jna/distinfo   (contents, props changed)
  head/devel/jna/files/patch-native_Makefile   (contents, props changed)

Modified: head/devel/jna/Makefile
==============================================================================
--- head/devel/jna/Makefile	Fri Mar 14 08:17:42 2014	(r348163)
+++ head/devel/jna/Makefile	Fri Mar 14 08:17:58 2014	(r348164)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jna
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	4.1.0
 CATEGORIES=	devel java
 MASTER_SITES=	GH
 
@@ -19,7 +18,7 @@ MAKE_ENV+=      ANT_OPTS=-Drelease -DARC
 USE_GITHUB=	yes
 GH_ACCOUNT=	twall
 GH_TAG=		${PORTVERSION}
-GH_COMMIT=	9b7ba38
+GH_COMMIT=	c490fc9
 
 PLIST_FILES=	%%JAVAJARDIR%%/jna-platform.jar \
 		%%JAVAJARDIR%%/jna.jar
@@ -29,7 +28,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	javadoc platform-${PORTVERSION:L}.0-javadoc.jar
+PORTDOCS=	javadoc platform-${PORTVERSION}-javadoc.jar
 .endif
 
 .if ${ARCH} == "i386"
@@ -39,8 +38,8 @@ ANT_ARCH=	x86-64
 .endif
 
 post-patch:
-	@${CHMOD} 755 ${WRKSRC}/native/libffi/configure
-	@${CHMOD} 755 ${WRKSRC}/native/libffi/install-sh
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    ${WRKSRC}/native/Makefile
 
 post-build-script:
 .if ${PORT_OPTIONS:MDOCS}
@@ -56,7 +55,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && \
 	    ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION:L}.0-javadoc.jar \
+	${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION}-javadoc.jar \
 	    ${STAGEDIR}${DOCSDIR}
 .endif
 

Modified: head/devel/jna/distinfo
==============================================================================
--- head/devel/jna/distinfo	Fri Mar 14 08:17:42 2014	(r348163)
+++ head/devel/jna/distinfo	Fri Mar 14 08:17:58 2014	(r348164)
@@ -1,2 +1,2 @@
-SHA256 (jna-4.0.tar.gz) = cedac34ca1a565961ce2d1bca84f7d6afed32980d7f46aee8d4620c2625c2c63
-SIZE (jna-4.0.tar.gz) = 51695145
+SHA256 (jna-4.1.0.tar.gz) = ac3f2767f5c16b3343e50edcd38532e66c7f8b4fe16be410b65b8c47027a11f6
+SIZE (jna-4.1.0.tar.gz) = 52993672

Modified: head/devel/jna/files/patch-native_Makefile
==============================================================================
--- head/devel/jna/files/patch-native_Makefile	Fri Mar 14 08:17:42 2014	(r348163)
+++ head/devel/jna/files/patch-native_Makefile	Fri Mar 14 08:17:58 2014	(r348164)
@@ -1,5 +1,5 @@
---- ./native/Makefile.orig	2013-09-16 23:52:29.000000000 -0700
-+++ ./native/Makefile	2013-09-16 23:53:09.000000000 -0700
+--- native/Makefile.orig	2014-03-06 11:06:40.000000000 -0500
++++ native/Makefile	2014-03-12 17:29:37.000000000 -0400
 @@ -36,6 +36,8 @@
  # protection simply by defining HAVE_PROTECTION.  This option has been only
  # been enabled for those platforms on which it has been tested successfully.
@@ -9,12 +9,12 @@
  OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \
  	                -e 's/MINGW32.*/win32/g' \
                          -e 's/SunOS.*/solaris/g' \
-@@ -249,7 +251,7 @@
+@@ -245,7 +247,7 @@
  ifneq (,$(findstring bsd,$(OS)))
  ARCH=$(shell uname -m | sed 's/i.86/i386/g')
  PCFLAGS+=-fPIC
 -CINCLUDES+=-I/usr/X11R6/include
-+CINCLUDES+=-I/usr/local/include
++CINCLUDES+=-I%%LOCALBASE%%/include
  LDFLAGS=-o $@ -shared
  CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT -DUSE_DEAFULT_LIBNAME_ENCODING
  endif