1 files changed, 20 insertions, 35 deletions

diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index 24a7b95eef25..276d2bff0d3c 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aoi
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aoi
@@ -16,51 +16,36 @@ DISTNAME=	AoI${PORTVERSION:S/.//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source Java written 3D modelling and rendering studio
 
-USE_JAVA=	1.3+
-USE_SIZE=	yes
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 USE_ZIP=	yes
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR} \
-		JAR_FILE=${JAR_FILE}
 WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION}
 
 EXTRACT_BEFORE_ARGS=	-a -q
 
-JAVAVM=		${LOCALBASE}/bin/javavm
-JAR_DIR=	share/java/jar/${PORTNAME}/
-JAR_MANIFEST=	${FILESDIR}/manifest
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-DOC_FILES=	HISTORY LICENSE README
-JAR_FILES=	ArtOfIllusion.jar
 JAR_PLUGIN_FILES=	OSSpecific.jar Renderers.jar Tools.jar Translators.jar
+JAR_FILES=	ArtOfIllusion.jar ${JAR_PLUGIN_FILES:S,^,Plugins/,}
+SUB_FILES=	aoi.sh
 
-post-patch:
-# remove trailing ^M
-	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
-		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.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} ${PREFIX}/${JAR_DIR}
-.for jar in ${JAR_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${jar} ${PREFIX}/${JAR_DIR}
-.endfor
-	@${MKDIR} ${PREFIX}/${JAR_DIR}/Plugins
-.for jar in ${JAR_PLUGIN_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/Plugins/${jar} \
-		${PREFIX}/${JAR_DIR}/Plugins
-.endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME}
-.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DATADIR}/Plugins
+	cd ${WRKSRC} \
+	  && ${FIND} ${JAR_FILES} -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	${INSTALL_SCRIPT} ${WRKDIR}/aoi.sh ${PREFIX}/bin/aoi
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.pre.mk>
-
-JAR_FILE=	ArtOfIllusion.jar
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>