From owner-svn-ports-all@FreeBSD.ORG Wed Jan 1 01:56:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6EDF429; Wed, 1 Jan 2014 01:56:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88C4212E9; Wed, 1 Jan 2014 01:56:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s011uNrs093358; Wed, 1 Jan 2014 01:56:23 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s011uMri093355; Wed, 1 Jan 2014 01:56:22 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401010156.s011uMri093355@svn.freebsd.org> From: Rusmir Dusko Date: Wed, 1 Jan 2014 01:56:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338348 - head/graphics/aoi 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.17 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: Wed, 01 Jan 2014 01:56:23 -0000 Author: nemysis Date: Wed Jan 1 01:56:22 2014 New Revision: 338348 URL: http://svnweb.freebsd.org/changeset/ports/338348 Log: - Update to 3.0 - Change DOCS, add AoI Manual - Add DOCS Option - Change Desktop entry file - Support STAGEDIR - Remove unneeded .DS_Store - Break lines around 80 characters Approved by: pawel / wg (mentors, implicit) Modified: head/graphics/aoi/Makefile head/graphics/aoi/distinfo (contents, props changed) head/graphics/aoi/pkg-plist (contents, props changed) Modified: head/graphics/aoi/Makefile ============================================================================== --- head/graphics/aoi/Makefile Wed Jan 1 00:12:13 2014 (r338347) +++ head/graphics/aoi/Makefile Wed Jan 1 01:56:22 2014 (r338348) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= aoi -PORTVERSION= 2.9.2 -PORTREVISION= 1 +PORTVERSION= 3.0 CATEGORIES= graphics java -MASTER_SITES= SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION} -DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -DIST_SUBDIR= java +MASTER_SITES= SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION} \ + SF/${PORTNAME}/ArtOfIllusion-manual/${PORTVERSION}:docs +DISTFILES= ${PORTNAME}${PORTVERSION:S/.//g}${EXTRACT_SUFX} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= nemysis@FreeBSD.org COMMENT= Open source Java written 3D modelling and rendering studio @@ -23,39 +23,52 @@ JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g} - -PORTDOCS= HISTORY README 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-message DESKTOP_ENTRIES="Art of Illusion" "3D modelling and rendering studio" \ - "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ - "${PORTNAME}" "Graphics;3DGraphics;" false + "${PORTNAME}" "${PORTNAME}" "Graphics;3DGraphics;" "" -NO_STAGE= yes .include +.if ${PORT_OPTIONS:MDOCS} +DISTFILES+= manual${PORTVERSION}${EXTRACT_SUFX}:docs +post-extract: + @(cd ${WRKDIR} && ${MV} "AoI Manual" AoI_Manual) +.endif + +post-patch:: + @(cd ${WRKSRC} && ${RM} "Textures and Materials/Library/.DS_Store") + do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for d in Icons Plugins Scripts lib *.jar - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) .endfor - @(cd ${WRKSRC} && ${CP} -r "Textures and Materials" ${DATADIR}) + @(cd ${WRKSRC} && ${CP} -r "Textures and Materials" ${STAGEDIR}${DATADIR}) -post-install: # Fix Permission that user can write in Plugins and Scripts - @(cd ${DATADIR} && ${CHMOD} -R 774 Plugins Scripts) - ${LN} -sf ${DATADIR}/Icons/48x48.png ${PREFIX}/share/pixmaps/${PORTNAME}.png + @(cd ${STAGEDIR}${DATADIR} && ${CHMOD} -R 774 Plugins Scripts) + ${LN} -sf ${DATADIR}/Icons/48x48.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKDIR}/AoI_Manual && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2}) .endif - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - .include Modified: head/graphics/aoi/distinfo ============================================================================== --- head/graphics/aoi/distinfo Wed Jan 1 00:12:13 2014 (r338347) +++ head/graphics/aoi/distinfo Wed Jan 1 01:56:22 2014 (r338348) @@ -1,2 +1,4 @@ -SHA256 (java/aoi292.zip) = 17654da91aa78de15df712b486060676e27f17d8dda5053fd0a46adbdba2b220 -SIZE (java/aoi292.zip) = 6418282 +SHA256 (aoi/aoi30.zip) = 3f77425b0fe2b3a6d30e47fed3be0108d27e9b49ab50fba2bc6d9456bc423a5b +SIZE (aoi/aoi30.zip) = 12177463 +SHA256 (aoi/manual3.0.zip) = 658efac871a0d5b6fc42c466bfb925170dfc5833938d532cdac6ab6679aa1623 +SIZE (aoi/manual3.0.zip) = 14279795 Modified: head/graphics/aoi/pkg-plist ============================================================================== --- head/graphics/aoi/pkg-plist Wed Jan 1 00:12:13 2014 (r338347) +++ head/graphics/aoi/pkg-plist Wed Jan 1 01:56:22 2014 (r338348) @@ -24,9 +24,7 @@ bin/aoi %%DATADIR%%/Scripts/Tools/Platonic Solid.bsh %%DATADIR%%/Scripts/Tools/README.txt %%DATADIR%%/Scripts/Tools/Sculpt.bsh -%%DATADIR%%/Scripts/Tools/Text.bsh %%DATADIR%%/Scripts/Tools/Thicken.bsh -%%DATADIR%%/Textures and Materials/Library/.DS_Store %%DATADIR%%/Textures and Materials/Library/Building Materials.aoi %%DATADIR%%/Textures and Materials/Library/Effects.aoi %%DATADIR%%/Textures and Materials/Library/Fire.aoi @@ -39,8 +37,9 @@ bin/aoi %%DATADIR%%/lib/Buoyx.jar %%DATADIR%%/lib/Jama-1.0.2.jar %%DATADIR%%/lib/QuickTimeWriter.jar -%%DATADIR%%/lib/beanshell.jar +%%DATADIR%%/lib/bsh-2.0b4.jar %%DATADIR%%/lib/gluegen-rt.jar +%%DATADIR%%/lib/groovy-all-2.1.2.jar %%DATADIR%%/lib/jogl.jar %%DATADIR%%/lib/svgSalamander.jar share/pixmaps/aoi.png