7 files changed, 98 insertions, 40 deletions
diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index 07d80f4f89f7..3a93f4854fc0 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -1,45 +1,58 @@
-# New ports collection makefile for:	Art Of Illusion
-# Date created:				Fri Jun 21 17:10:56 UTC 2002
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by:	Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	aoi
-PORTVERSION=	2.5.1
-PORTREVISION=	2
+PORTVERSION=	2.9.2
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DIST_SUBDIR=	java
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An open source Java written 3D modelling and rendering studio
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Open source Java written 3D modelling and rendering studio
+
+LICENSE=	GPLv2
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
+USE_ZIP=	yes
+EXTRACT_BEFORE_ARGS=	-a -q
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
-USE_ZIP=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
 
-EXTRACT_BEFORE_ARGS=	-a -q
+WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
 
+PORTDOCS=	HISTORY README
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-SUB_FILES=	aoi.sh
+SUB_FILES=	${PORTNAME} \
+		pkg-message
+
+DESKTOP_ENTRIES="Art of Illusion" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Application;Graphics;" ${FALSE}
+
+.include <bsd.port.options.mk>
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing ..."
-	${MKDIR} ${DATADIR}
-	(cd ${WRKSRC} && ${FIND} ArtOfIllusion.jar Icons Plugins Scripts | \
-	    ${CPIO} -pdmuv -R${SHAREOWN}:${SHAREGRP} ${DATADIR})
-	${INSTALL_SCRIPT} ${WRKDIR}/aoi.sh ${PREFIX}/bin/aoi
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+.for d in Icons Plugins Scripts lib *.jar
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
+.endfor
+	@(cd ${WRKSRC} && ${CP} -r "Textures and Materials" ${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
+
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} HISTORY LICENSE README ${DOCSDIR})
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+
 .include <bsd.port.mk>
diff --git a/graphics/aoi/distinfo b/graphics/aoi/distinfo
index c83028a28d67..55f40a78f92c 100644
--- a/graphics/aoi/distinfo
+++ b/graphics/aoi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aoi251.zip) = 9a7ad546a4afb6ae40d9370c35eb3177550dc2b1014c0d1ddda116233e1a0a85
-SIZE (aoi251.zip) = 4532523
+SHA256 (java/aoi292.zip) = 17654da91aa78de15df712b486060676e27f17d8dda5053fd0a46adbdba2b220
+SIZE (java/aoi292.zip) = 6418282
diff --git a/graphics/aoi/files/aoi.in b/graphics/aoi/files/aoi.in
new file mode 100644
index 000000000000..7866c3140c00
--- /dev/null
+++ b/graphics/aoi/files/aoi.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+export JAVA_VERSION="%%JAVA_VERSION%%"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
+-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}"
diff --git a/graphics/aoi/files/aoi.sh.in b/graphics/aoi/files/aoi.sh.in
deleted file mode 100644
index c1410453e8ba..000000000000
--- a/graphics/aoi/files/aoi.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-
-( cd "%%DATADIR%%" && \
-	"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}" )
diff --git a/graphics/aoi/files/pkg-message.in b/graphics/aoi/files/pkg-message.in
new file mode 100644
index 000000000000..67b9060cf989
--- /dev/null
+++ b/graphics/aoi/files/pkg-message.in
@@ -0,0 +1,26 @@
+===============================================================================
+
+Art of Illusion has been installed.
+
+This package does not include all Plugins and Scripts.
+
+You could use Scripts & Plugins Manager to install additional
+Plugins and Scripts
+
+    http://aoisp.sourceforge.net/spmanagement.html
+
+In addition, you can search for additional Plugins and Scripts here:
+
+    http://aoisp.sourceforge.net/AoIRepository/
+
+and other Sites and put it in:
+
+    %%DATADIR%%/Plugins
+    %%DATADIR%%/Scripts/...
+
+After deinstallation, some files may stay in %%DATADIR%%,
+you can delete them with
+
+    rm -fr %%DATADIR%%
+
+===============================================================================
diff --git a/graphics/aoi/pkg-descr b/graphics/aoi/pkg-descr
index eee4d42b4b83..3865f1a9f211 100644
--- a/graphics/aoi/pkg-descr
+++ b/graphics/aoi/pkg-descr
@@ -1,6 +1,7 @@
-Art of Illusion is a free, open source 3D modelling and rendering
-studio.
-
-Visit these following web pages for more information:
+Art of Illusion is a free, open source 3D modelling and rendering studio.
+Many of its capabilities rival those found in commercial programs.
+Highlights include subdivision surface based modelling tools,
+skeleton based animation, and a graphical language for designing procedural
+textures and materials..
 
 WWW: http://aoi.sourceforge.net/
diff --git a/graphics/aoi/pkg-plist b/graphics/aoi/pkg-plist
index 5be0cbe65d29..2e5427012ad0 100644
--- a/graphics/aoi/pkg-plist
+++ b/graphics/aoi/pkg-plist
@@ -1,13 +1,10 @@
 bin/aoi
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/ArtOfIllusion.jar
 %%DATADIR%%/Icons/32x32.png
 %%DATADIR%%/Icons/48x48.png
 %%DATADIR%%/Icons/64x64.png
 %%DATADIR%%/Plugins/Help/AOIHelp.zip
-%%DATADIR%%/Plugins/Help/helpgui-1.1a.jar
+%%DATADIR%%/Plugins/Help/helpgui-1.1b.jar
 %%DATADIR%%/Plugins/Help/jhall.jar
 %%DATADIR%%/Plugins/Help/jhelpaction.jar
 %%DATADIR%%/Plugins/Help/pircbot.jar
@@ -29,6 +26,27 @@ bin/aoi
 %%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
+%%DATADIR%%/Textures and Materials/Library/Geography.aoi
+%%DATADIR%%/Textures and Materials/Library/Metal.aoi
+%%DATADIR%%/Textures and Materials/Library/Sky.aoi
+%%DATADIR%%/Textures and Materials/Library/Water.aoi
+%%DATADIR%%/Textures and Materials/Library/Wood.aoi
+%%DATADIR%%/lib/Buoy.jar
+%%DATADIR%%/lib/Buoyx.jar
+%%DATADIR%%/lib/Jama-1.0.2.jar
+%%DATADIR%%/lib/QuickTimeWriter.jar
+%%DATADIR%%/lib/beanshell.jar
+%%DATADIR%%/lib/gluegen-rt.jar
+%%DATADIR%%/lib/jogl.jar
+%%DATADIR%%/lib/svgSalamander.jar
+share/pixmaps/aoi.png
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/Textures and Materials/Library
+@dirrm %%DATADIR%%/Textures and Materials
 @dirrm %%DATADIR%%/Scripts/Tools
 @dirrm %%DATADIR%%/Scripts/Startup
 @dirrm %%DATADIR%%/Scripts/Objects
@@ -37,4 +55,3 @@ bin/aoi
 @dirrm %%DATADIR%%/Plugins
 @dirrm %%DATADIR%%/Icons
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%