From owner-freebsd-java@FreeBSD.ORG Fri Mar 14 11:43:45 2008 Return-Path: Delivered-To: java@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 425B31065674 for ; Fri, 14 Mar 2008 11:43:45 +0000 (UTC) (envelope-from lioux@FreeBSD.org) Received: from goat.gigo.com (goat.gigo.com [216.218.228.114]) by mx1.freebsd.org (Postfix) with ESMTP id 4CB528FC21 for ; Fri, 14 Mar 2008 11:43:45 +0000 (UTC) (envelope-from lioux@FreeBSD.org) Received: from 189.72.153.114 (189-72-153-114.bsace702.dsl.brasiltelecom.net.br [189.72.153.114]) by goat.gigo.com (Postfix) with ESMTP id F39CDB93F for ; Fri, 14 Mar 2008 04:27:08 -0700 (PDT) Received: (qmail 58717 invoked by uid 1001); 14 Mar 2008 08:24:07 -0300 Date: 14 Mar 2008 08:24:07 -0300 Message-ID: <20080314112407.58713.qmail@exxodus.fedaykin.here> To: FreeBSD-gnats-submit@freebsd.org From: Mario Sergio Fujikawa Ferreira X-send-pr-version: 3.113 X-GNATS-Notify: Cc: java@FreeBSD.org Subject: [PATCH] java/jai: update to 1.1.3 (works on FreeBSD 7 and removes ONLY_FOR_ARCHS) X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Mar 2008 11:43:45 -0000 >Submitter-Id: current-users >Originator: Mario Sergio Fujikawa Ferreira >Organization: >Confidential: no >Synopsis: [PATCH] java/jai: update to 1.1.3 (works on FreeBSD 7 and removes ONLY_FOR_ARCHS) >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 7.0-STABLE i386 >Environment: System: FreeBSD exxodus.fedaykin.here 7.0-STABLE FreeBSD 7.0-STABLE #35: Fri Feb 29 10:35:04 BRT 2008 >Description: - Update to 1.1.3 - No longer limitted to i386 though at expense of performance (which I neither mind nor notice since I want this to work with FreeBSD 7 and now it does) Added file(s): - files/pkg-message.in Removed file(s): - pkg-message-jre - pkg-message-libmap Port maintainer (java@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- jai-1.1.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/java/jai/Makefile /usr/home/lioux/src/myports/tmp/jai/Makefile --- /usr/ports/java/jai/Makefile 2007-05-20 08:01:32.000000000 -0300 +++ /usr/home/lioux/src/myports/tmp/jai/Makefile 2008-03-07 04:10:21.000000000 -0300 @@ -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 @@ 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 .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 diff -ruN --exclude=CVS /usr/ports/java/jai/distinfo /usr/home/lioux/src/myports/tmp/jai/distinfo --- /usr/ports/java/jai/distinfo 2006-01-30 09:30:46.000000000 -0200 +++ /usr/home/lioux/src/myports/tmp/jai/distinfo 2008-03-07 03:51:54.000000000 -0300 @@ -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 -ruN --exclude=CVS /usr/ports/java/jai/files/pkg-message.in /usr/home/lioux/src/myports/tmp/jai/files/pkg-message.in --- /usr/ports/java/jai/files/pkg-message.in 1969-12-31 21:00:00.000000000 -0300 +++ /usr/home/lioux/src/myports/tmp/jai/files/pkg-message.in 2008-03-07 04:10:53.000000000 -0300 @@ -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 -ruN --exclude=CVS /usr/ports/java/jai/pkg-message-jre /usr/home/lioux/src/myports/tmp/jai/pkg-message-jre --- /usr/ports/java/jai/pkg-message-jre 2004-01-11 08:48:33.000000000 -0200 +++ /usr/home/lioux/src/myports/tmp/jai/pkg-message-jre 1969-12-31 21:00:00.000000000 -0300 @@ -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 -ruN --exclude=CVS /usr/ports/java/jai/pkg-message-libmap /usr/home/lioux/src/myports/tmp/jai/pkg-message-libmap --- /usr/ports/java/jai/pkg-message-libmap 2004-01-11 08:48:33.000000000 -0200 +++ /usr/home/lioux/src/myports/tmp/jai/pkg-message-libmap 1969-12-31 21:00:00.000000000 -0300 @@ -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 -ruN --exclude=CVS /usr/ports/java/jai/pkg-plist /usr/home/lioux/src/myports/tmp/jai/pkg-plist --- /usr/ports/java/jai/pkg-plist 2004-01-11 08:48:33.000000000 -0200 +++ /usr/home/lioux/src/myports/tmp/jai/pkg-plist 2008-03-07 04:08:57.000000000 -0300 @@ -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%% --- jai-1.1.3.patch ends here ---