3 files changed, 39 insertions, 21 deletions

diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index 276d2bff0d3c..b6fe4f2a8ad0 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	aoi
-PORTVERSION=	1.6
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aoi
-DISTNAME=	AoI${PORTVERSION:S/.//}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source Java written 3D modelling and rendering studio
@@ -19,7 +18,7 @@ COMMENT=	An open source Java written 3D modelling and rendering studio
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.4+
 USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION}
@@ -28,24 +27,14 @@ EXTRACT_BEFORE_ARGS=	-a -q
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAR_PLUGIN_FILES=	OSSpecific.jar Renderers.jar Tools.jar Translators.jar
-JAR_FILES=	ArtOfIllusion.jar ${JAR_PLUGIN_FILES:S,^,Plugins/,}
 SUB_FILES=	aoi.sh
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	HISTORY LICENSE README
-.endif
-PLIST_FILES=	${JAR_FILES:S,^,%%DATADIR%%/,} bin/aoi
-PLIST_DIRS=	%%DATADIR%%/Plugins %%DATADIR%%
-
 do-install:
-	@${MKDIR} ${DATADIR}/Plugins
-	cd ${WRKSRC} \
-	  && ${FIND} ${JAR_FILES} -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${FIND} ArtOfIllusion.jar Icons Plugins Scripts | \
+	    ${CPIO} -pdmuv -R${SHAREOWN}:${SHAREGRP} ${DATADIR})
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} HISTORY LICENSE README ${DOCSDIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/aoi.sh ${PREFIX}/bin/aoi
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/aoi/distinfo b/graphics/aoi/distinfo
index fa209bf5e27e..6d169219ffe3 100644
--- a/graphics/aoi/distinfo
+++ b/graphics/aoi/distinfo
@@ -1,2 +1,2 @@
-MD5 (AoI16.zip) = 12d861359d55b816fdf108e37bf17cd1
-SIZE (AoI16.zip) = 1847648
+MD5 (aoi20.zip) = 6aed59c1dce0cd33fddd6fa7a99686cd
+SIZE (aoi20.zip) = 2370869
diff --git a/graphics/aoi/pkg-plist b/graphics/aoi/pkg-plist
new file mode 100644
index 000000000000..86e42ce5009b
--- /dev/null
+++ b/graphics/aoi/pkg-plist
@@ -0,0 +1,29 @@
+bin/aoi
+%%DOCSDIR%%/HISTORY
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/README
+%%DATADIR%%/ArtOfIllusion.jar
+%%DATADIR%%/Icons/32x32.png
+%%DATADIR%%/Icons/48x48.png
+%%DATADIR%%/Icons/64x64.png
+%%DATADIR%%/Plugins/OSSpecific.jar
+%%DATADIR%%/Plugins/Renderers.jar
+%%DATADIR%%/Plugins/SPManager.jar
+%%DATADIR%%/Plugins/Tools.jar
+%%DATADIR%%/Plugins/Translators.jar
+%%DATADIR%%/Scripts/Objects/Fur.aoi
+%%DATADIR%%/Scripts/Objects/Fur.bsh
+%%DATADIR%%/Scripts/Objects/Particle Jet.bsh
+%%DATADIR%%/Scripts/Tools/Join Objects.bsh
+%%DATADIR%%/Scripts/Tools/Platonic Solid.bsh
+%%DATADIR%%/Scripts/Tools/Sculpt.bsh
+%%DATADIR%%/Scripts/Tools/Text.bsh
+%%DATADIR%%/Scripts/Tools/Thicken.bsh
+@dirrm %%DATADIR%%/Scripts/Tools
+@dirrm %%DATADIR%%/Scripts/Startup
+@dirrm %%DATADIR%%/Scripts/Objects
+@dirrm %%DATADIR%%/Scripts
+@dirrm %%DATADIR%%/Plugins
+@dirrm %%DATADIR%%/Icons
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%