3 files changed, 41 insertions, 27 deletions

diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index c339117a2a32..de6155f1dc9c 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -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 <bsd.port.options.mk>
 
+.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 <bsd.port.mk>
diff --git a/graphics/aoi/distinfo b/graphics/aoi/distinfo
index 55f40a78f92c..2c843ea3a101 100644
--- a/graphics/aoi/distinfo
+++ b/graphics/aoi/distinfo
@@ -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
diff --git a/graphics/aoi/pkg-plist b/graphics/aoi/pkg-plist
index 2e5427012ad0..98af395cd54b 100644
--- a/graphics/aoi/pkg-plist
+++ b/graphics/aoi/pkg-plist
@@ -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