From owner-svn-ports-all@freebsd.org Sun Sep 11 17:58:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB5E6BD7811; Sun, 11 Sep 2016 17:58:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 849ADC4A; Sun, 11 Sep 2016 17:58:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8BHwJ0d099758; Sun, 11 Sep 2016 17:58:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8BHwJwa099757; Sun, 11 Sep 2016 17:58:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609111758.u8BHwJwa099757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 11 Sep 2016 17:58:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421856 - head/devel/jna X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Sep 2016 17:58:20 -0000 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 -.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