- Update to 1.5.2

- Assign maintainership to PR submitter

PR:		125828
Submitted by:	Jonathan Chen

1 files changed, 28 insertions, 69 deletions

diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index b1d5f745d774..a23f5c8e13ee 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -6,89 +6,48 @@
 #
 
 PORTNAME=	java3d
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.5.2
 CATEGORIES=	java graphics
-MASTER_SITES=	ftp://ftp.tux.org/pub/java/java3d/${PORTVERSION}/i386/fcs/ \
-		ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/java3d/${PORTVERSION}/i386/fcs/
-DISTNAME=	java3d-sdk-${PORTVERSION}-linux-i386
-EXTRACT_SUFX=	.bin
+MASTER_SITES=	http://daemon.wizard.googlepages.com/
+DISTNAME=	java3d-${PORTVERSION}
 
-MAINTAINER=	java@FreeBSD.org
-COMMENT=	Blackdown Java3D Development Kit ${PORTVERSION} for Linux
+MAINTAINER=	jonc@chen.org.nz
+COMMENT=	Java3D Kit ${PORTVERSION}
 
-BROKEN=		Does not fetch
-
-EXTRACT_CMD=	${TAIL}
-EXTRACT_BEFORE_ARGS=	+367
-EXTRACT_AFTER_ARGS=	| ${BZIP2_CMD} -dc | ${TAR} xf -
 USE_BZIP2=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-ONLY_FOR_ARCHS=	i386
-
-RESTRICTED=	"License doesn\'t allow distribution"
+JAVA_VERSION=	1.5+
+USE_ANT=	yes
 
-TARGET_DIR=	${JAVASHAREDIR}/${PORTNAME}
-PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///} JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///}
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB+=	JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH}
 
-.include <bsd.port.pre.mk>
-
-.if ${JAVA_PORT_OS} == "native"
-WITH_PLUGINWRAPPER=	yes
-RUN_DEPENDS+=	${LOCALBASE}/lib/pluginwrapper/java3d.so:${PORTSDIR}/www/linuxpluginwrapper
-.endif
-
-.if defined(NOINSTALL_IN_JRE)
-PLIST_SUB+=	INSTALL_IN_JRE="@comment "
-.else
-PLIST_SUB+=	INSTALL_IN_JRE=""
+.if !defined(NOPORTDOCS)
+DOCSSRC=	${WRKSRC}/j3d-core/build/freebsd/javadocs/docs-public
+PORTDOCS=	*
 .endif
 
-pre-install:
-.if defined(NOINSTALL_IN_JRE)
-		@${SED} -e "s:%%TARGET_DIR%%:${TARGET_DIR}:g" ${MASTERDIR}/pkg-message-jre > ${PKGMESSAGE}
-.endif
-.if defined(WITH_PLUGINWRAPPER)
-.if defined(NOINSTALL_IN_JRE)
-		@${ECHO_CMD} >> ${PKGMESSAGE}
-		@${SED} -e "s:%%LIBDIR%%:${TARGET_DIR}/lib:g" ${MASTERDIR}/pkg-message-libmap >> ${PKGMESSAGE}
-.else
-		@${SED} -e "s:%%LIBDIR%%:${JAVA_HOME}/jre/lib/i386:g" ${MASTERDIR}/pkg-message-libmap > ${PKGMESSAGE}
-.endif
+do-build:
+	cd ${WRKSRC}/vecmath && ${ANT} dist
+	cd ${WRKSRC}/j3d-core && ${ANT} -Dbuild.type=fcs -Dis${OPSYS}=yes jar-opt
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/j3d-core && ${ANT} -Dbuild.type=fcs -Dis${OPSYS}=yes docs-public
 .endif
 
 do-install:
-		@${ECHO_CMD} -n ">> Creating destination directory..."
-		@${MKDIR} ${TARGET_DIR}
-		@${ECHO_CMD} " [DONE]"
-		@${ECHO_CMD} -n ">> Installing libraries..."
-		@${INSTALL_DATA} ${WRKSRC}/LICENSE-Java3D ${TARGET_DIR}
-		@${INSTALL_DATA} ${WRKSRC}/README-Java3D ${TARGET_DIR}
-		@${INSTALL_DATA} ${WRKSRC}/java3d-utils-src.jar ${TARGET_DIR}
-		@${MKDIR} ${TARGET_DIR}/jar
-		@${INSTALL_DATA} ${WRKSRC}/jre/lib/ext/* ${TARGET_DIR}/jar
-		@${MKDIR} ${TARGET_DIR}/lib
-		@${INSTALL_DATA} ${WRKSRC}/jre/lib/i386/* ${TARGET_DIR}/lib
-.if !defined(NOINSTALL_IN_JRE)
-		@${LN} -sf ${TARGET_DIR}/jar/* ${JAVA_HOME}/jre/lib/ext
-		@${LN} -sf ${TARGET_DIR}/lib/* ${JAVA_HOME}/jre/lib/i386
-.endif
-		@${ECHO_CMD} " [DONE]"
-.if !defined(NOPORTDOCS)
-		@${ECHO_CMD} -n ">> Installing examples..."
-		@${MKDIR} ${TARGET_DIR}/demo
-		@${CP} -R ${WRKSRC}/demo/java3d/* ${TARGET_DIR}/demo
-		@${ECHO_CMD} " [DONE]"
-.endif
+	${INSTALL_DATA} \
+		${WRKSRC}/vecmath/dist/lib/ext/vecmath.jar \
+		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dcore.jar \
+		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \
+		${JAVA_HOME}/jre/lib/ext
+	${INSTALL} \
+		${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
+		${JAVA_HOME}/jre/lib/${ARCH}
 
 post-install:
-.if defined(NOINSTALL_IN_JRE) || defined(WITH_PLUGINWRAPPER)
-		@${CAT} ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${DOCSSRC} && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>