6 files changed, 37 insertions, 93 deletions

diff --git a/java/jai/Makefile b/java/jai/Makefile
index 2d4d46e00744..0ece350bbca3 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	jai
-PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTVERSION=	1.1.3
 CATEGORIES=	java graphics
 MASTER_SITES=	#
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-lib-linux-i586
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-lib
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	High performance image processing libraries for Java
@@ -19,73 +18,45 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
 NO_BUILD=	yes
-ONLY_FOR_ARCHS=	i386
+
+USE_ZIP=	yes
+SUB_FILES=	pkg-message
+SUB_LIST=	TARGET_DIR=${TARGET_DIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 RESTRICTED=	"Redistribution is not permitted"
 
-DOWNLOAD_URL=	http://java.sun.com/products/java-media/jai/downloads/download-${PORTVERSION:S/./_/g}.html
+DOWNLOAD_URL=	http://java.sun.com/products/java-media/jai/current.html
 
 TARGET_DIR=	${JAVASHAREDIR}/${PORTNAME}
-IMAGEIO_DIR=	${JAVASHAREDIR}/jai-imageio
-PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///} JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} IMAGEIO_DIR=${IMAGEIO_DIR:S/^${PREFIX}\///}
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
+
+PORTDOCS=	\
+		COPYRIGHT-jai.txt \
+		DISTRIBUTIONREADME-jai.txt \
+		LICENSE-jai.txt \
+		THIRDPARTYLICENSEREADME-jai.txt
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-IGNORE=		"You must manually fetch the \"Linux CLASSPATH Install\" distribution \(${DISTNAME}${EXTRACT_SUFX}\) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again"
-.endif
-
-.if ${JAVA_PORT_OS} == "native"
-WITH_PLUGINWRAPPER=	yes
-RUN_DEPENDS+=	${LOCALBASE}/lib/pluginwrapper/jai.so:${PORTSDIR}/www/linuxpluginwrapper
-.endif
-
-.if defined(NOINSTALL_IN_JRE)
-PLIST_SUB+=	INSTALL_IN_JRE="@comment "
-.else
-PLIST_SUB+=	INSTALL_IN_JRE=""
-.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
+IGNORE=		"You must manually fetch from the \"Java Advanced Imaging API 1.1.3 Download Page\", the \"Java (no native acceleration)\" distribution \(${DISTNAME}${EXTRACT_SUFX}\) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again"
 .endif
 
 do-install:
-		@${ECHO_MSG} -n ">> Creating destination directory..."
-		@${MKDIR} ${TARGET_DIR}
-		@${ECHO_MSG} " [DONE]"
-		@${ECHO_MSG} -n ">> Installing libraries..."
-		@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT-jai.txt ${TARGET_DIR}
-		@${INSTALL_DATA} ${WRKSRC}/INSTALL-jai.txt ${TARGET_DIR}
-		@${INSTALL_DATA} ${WRKSRC}/LICENSE-jai.txt ${TARGET_DIR}
-		@${INSTALL_DATA} ${WRKSRC}/README-jai.txt ${TARGET_DIR}
-		@${MKDIR} ${TARGET_DIR}/jar
-		@${INSTALL_DATA} ${WRKSRC}/lib/jai_codec.jar ${TARGET_DIR}/jar
-		@${INSTALL_DATA} ${WRKSRC}/lib/jai_core.jar ${TARGET_DIR}/jar
-		@${INSTALL_DATA} ${WRKSRC}/lib/mlibwrapper_jai.jar ${TARGET_DIR}/jar
-		@${MKDIR} ${TARGET_DIR}/lib
-		@${INSTALL_DATA} ${WRKSRC}/lib/libmlib_jai.so ${TARGET_DIR}/lib
-.if !defined(NOINSTALL_IN_JRE)
-		@${LN} -sf ${TARGET_DIR}/jar/jai_codec.jar ${JAVA_HOME}/jre/lib/ext
-		@${LN} -sf ${TARGET_DIR}/jar/jai_core.jar ${JAVA_HOME}/jre/lib/ext
-		@${LN} -sf ${TARGET_DIR}/jar/mlibwrapper_jai.jar ${JAVA_HOME}/jre/lib/ext
-		@${LN} -sf ${TARGET_DIR}/lib/libmlib_jai.so ${JAVA_HOME}/jre/lib/i386
-.endif
-		@${ECHO_MSG} " [DONE]"
+# documentation
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+# jars
+	@${MKDIR} ${TARGET_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/lib/jai_codec.jar ${TARGET_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/lib/jai_core.jar ${TARGET_DIR}
 
 post-install:
-.if defined(NOINSTALL_IN_JRE) || defined(WITH_PLUGINWRAPPER)
-		@${CAT} ${PKGMESSAGE}
-.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/java/jai/distinfo b/java/jai/distinfo
index 6e5a8973ad3f..86bdc5298a2f 100644
--- a/java/jai/distinfo
+++ b/java/jai/distinfo
@@ -1,3 +1,3 @@
-MD5 (jai-1_1_2-lib-linux-i586.tar.gz) = 62d641d17cb5df836e7cd1ddc751546b
-SHA256 (jai-1_1_2-lib-linux-i586.tar.gz) = 8b4c8abba994f7d1de24786356c05df87cf836b66fced520b7993469a31f4056
-SIZE (jai-1_1_2-lib-linux-i586.tar.gz) = 2611646
+MD5 (jai-1_1_3-lib.zip) = ca8b26b359fcb2fa2c34b77add9af808
+SHA256 (jai-1_1_3-lib.zip) = 2c7c55e14bc7721fa91b1108d68111130ce9d69e3caa7d2d2a60f6b0b0aeb752
+SIZE (jai-1_1_3-lib.zip) = 2056699
diff --git a/java/jai/files/pkg-message.in b/java/jai/files/pkg-message.in
new file mode 100644
index 000000000000..8f6737ef264a
--- /dev/null
+++ b/java/jai/files/pkg-message.in
@@ -0,0 +1,4 @@
+The JAI libraries are not installed in JRE, so you have to add
+  %%TARGET_DIR%%/jai_codec.jar
+  %%TARGET_DIR%%/jai_core.jar
+to the CLASSPATH environment variable.
diff --git a/java/jai/pkg-message-jre b/java/jai/pkg-message-jre
deleted file mode 100644
index f9c2961a1dec..000000000000
--- a/java/jai/pkg-message-jre
+++ /dev/null
@@ -1,7 +0,0 @@
-The JAI libraries are not installed in JRE, so you have to add
-  %%TARGET_DIR%%/jar/jai_codec.jar
-  %%TARGET_DIR%%/jar/jai_core.jar
-  %%TARGET_DIR%%/jar/mlibwrapper_jai.jar
-to the CLASSPATH environment variable, and add
-  %%TARGET_DIR%%/lib
-to the LD_LIBRARY_PATH environment variable.
diff --git a/java/jai/pkg-message-libmap b/java/jai/pkg-message-libmap
deleted file mode 100644
index bb7f7e06061f..000000000000
--- a/java/jai/pkg-message-libmap
+++ /dev/null
@@ -1,7 +0,0 @@
-In order to use the JAI API on FreeBSD native JavaVM,
-describe as follows to your /etc/libmap.conf.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[%%LIBDIR%%/libmlib_jai.so]
-libm.so.6	libm.so.2
-libc.so.6	pluginwrapper/jai.so
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/java/jai/pkg-plist b/java/jai/pkg-plist
index cad21df672d3..55724c8ec406 100644
--- a/java/jai/pkg-plist
+++ b/java/jai/pkg-plist
@@ -1,20 +1,3 @@
-%%T%%/COPYRIGHT-jai.txt
-%%T%%/INSTALL-jai.txt
-%%T%%/LICENSE-jai.txt
-%%T%%/README-jai.txt
-%%T%%/jar/jai_codec.jar
-%%T%%/jar/jai_core.jar
-%%T%%/jar/mlibwrapper_jai.jar
-%%T%%/lib/libmlib_jai.so
-%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/jai_codec.jar %D/%%JAVA_HOME%%/jre/lib/ext
-%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/jai_core.jar %D/%%JAVA_HOME%%/jre/lib/ext
-%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/mlibwrapper_jai.jar %D/%%JAVA_HOME%%/jre/lib/ext
-%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/lib/libmlib_jai.so %D/%%JAVA_HOME%%/jre/lib/i386
-%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/jai_codec.jar
-%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/jai_core.jar
-%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/mlibwrapper_jai.jar
-%%INSTALL_IN_JRE%%@unexec [ ! -e %D/%%IMAGEIO_DIR%%/jar/mlibwrapper_jai.jar ] || /bin/ln -sf %D/%%IMAGEIO_DIR%%/jar/mlibwrapper_jai.jar %D/%%JAVA_HOME%%/jre/lib/ext
-%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/i386/libmlib_jai.so
-@dirrm %%T%%/lib
-@dirrm %%T%%/jar
+%%T%%/jai_codec.jar
+%%T%%/jai_core.jar
 @dirrm %%T%%