Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Sep 2016 17:58:19 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421856 - head/devel/jna
Message-ID:  <201609111758.u8BHwJwa099757@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Sep 11 17:58:19 2016
New Revision: 421856
URL: https://svnweb.freebsd.org/changeset/ports/421856

Log:
  - Add LICENSE
  - Switch to options helpers
  - Cosmetic fixes

Modified:
  head/devel/jna/Makefile

Modified: head/devel/jna/Makefile
==============================================================================
--- head/devel/jna/Makefile	Sun Sep 11 17:57:25 2016	(r421855)
+++ head/devel/jna/Makefile	Sun Sep 11 17:58:19 2016	(r421856)
@@ -7,16 +7,23 @@ CATEGORIES=	devel java
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java access to native shared libraries
 
+LICENSE=	LGPL21+ APACHE20
+LICENSE_COMB=	dual
+LICENSE_FOLE=	${WRKSRC}/LICENSE
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/LGPL2.1
+LICENSE_FILE_APACHE20=	${WRKSRC}/ASL2.0
+
 USES=		gmake
 USE_ANT=	yes
 USE_JAVA=	yes
 USE_XORG=	x11 xt
 MAKE_ARGS=	-DCC="${CC}" -DLD="${LD}"
-MAKE_ENV+=      ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
+MAKE_ENV=      ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	twall
 
+PORTDOCS=	javadoc platform-${PORTVERSION}-javadoc.jar
 PLIST_FILES=	%%JAVAJARDIR%%/jna-platform.jar \
 		%%JAVAJARDIR%%/jna.jar
 
@@ -24,10 +31,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	javadoc platform-${PORTVERSION}-javadoc.jar
-.endif
-
 .if ${ARCH} == "i386"
 ANT_ARCH=	x86
 .elif ${ARCH} == "amd64"
@@ -36,24 +39,21 @@ ANT_ARCH=	x86-64
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    ${WRKSRC}/native/Makefile
+		${WRKSRC}/native/Makefile
 
-post-build-script:
-.if ${PORT_OPTIONS:MDOCS}
+post-build-DOCS-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} javadoc
-.endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/build/freebsd-${ANT_ARCH}.jar \
-	    ${STAGEDIR}${JAVAJARDIR}/jna-platform.jar
+		${STAGEDIR}${JAVAJARDIR}/jna-platform.jar
 	${INSTALL_DATA} ${WRKSRC}/build/jna.jar \
-	    ${STAGEDIR}${JAVAJARDIR}/jna.jar
-.if ${PORT_OPTIONS:MDOCS}
+		${STAGEDIR}${JAVAJARDIR}/jna.jar
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && \
-	    ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION}-javadoc.jar \
-	    ${STAGEDIR}${DOCSDIR}
-.endif
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609111758.u8BHwJwa099757>