From owner-svn-ports-all@freebsd.org Fri Dec 1 12:02:11 2017 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 81831DFE931; Fri, 1 Dec 2017 12:02:11 +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 2EEBB7F12B; Fri, 1 Dec 2017 12:02:11 +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 vB1C2AGa018125; Fri, 1 Dec 2017 12:02:10 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1C2AfW018124; Fri, 1 Dec 2017 12:02:10 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712011202.vB1C2AfW018124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 1 Dec 2017 12:02:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455279 - head/graphics/aoi X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/graphics/aoi X-SVN-Commit-Revision: 455279 X-SVN-Commit-Repository: ports 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.25 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: Fri, 01 Dec 2017 12:02:11 -0000 Author: amdmi3 Date: Fri Dec 1 12:02:09 2017 New Revision: 455279 URL: https://svnweb.freebsd.org/changeset/ports/455279 Log: - Add LICENSE_FILE - Simplify documentation installation - Switch to options helpers Modified: head/graphics/aoi/Makefile Modified: head/graphics/aoi/Makefile ============================================================================== --- head/graphics/aoi/Makefile Fri Dec 1 11:54:35 2017 (r455278) +++ head/graphics/aoi/Makefile Fri Dec 1 12:02:09 2017 (r455279) @@ -14,11 +14,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open source Java written 3D modelling and rendering studio LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libjogl.so:graphics/jogl -USES= dos2unix zip -DOS2UNIX_FILES= ../AoI_Manual/*.html +USES= zip +DOS2UNIX_FILES= ../AoI_Manual/*.html # USES=dos2unix is optional USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes @@ -28,29 +29,20 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} PORTDOCS= * -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= HISTORY README - -DOCSRCDIR2= ${WRKDIR}/AoI_Manual -DOCSDIR2= ${DOCSDIR}/AoI_Manual -DOC_FILES2= * - -OPTIONS_DEFINE= DOCS - SUB_FILES= ${PORTNAME} pkg-deinstall pkg-message DESKTOP_ENTRIES="Art of Illusion" "3D modelling and rendering studio" \ "${PORTNAME}" "${PORTNAME}" "Graphics;3DGraphics;" "" -.include +OPTIONS_DEFINE= DOCS -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= manual${PORTVERSION}${EXTRACT_SUFX}:docs -post-extract: +DOCS_DISTFILES= manual${PORTVERSION}${EXTRACT_SUFX}:docs +DOCS_USES= dos2unix + +post-extract-DOCS-on: @(cd ${WRKDIR} && ${MV} "AoI Manual" AoI_Manual) -.endif -post-patch:: +post-patch: @(cd ${WRKSRC} && ${RM} "Textures and Materials/Library/.DS_Store") do-install: @@ -65,10 +57,9 @@ do-install: ${LN} -sf ${DATADIR}/Icons/48x48.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKDIR}/AoI_Manual && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2}) -.endif + cd ${WRKSRC} && ${INSTALL_DATA} HISTORY README ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR} && ${COPYTREE_SHARE} "AoI_Manual" ${STAGEDIR}${DOCSDIR} .include