Date: Mon, 11 Jan 2010 02:18:07 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@freebsd.org Cc: java@freebsd.org Subject: [PATCH] java/jai-imageio: use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001110218.o0B2I7iV019102@newbie.thingamajig-systems.co.uk>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: Sevan Janiyan >Organization: >Confidential: no >Synopsis: [PATCH] java/jai-imageio: use $SUB_FILES to dynamically adjust pkg-message >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Environment: System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC >Description: use $SUB_FILES & SUB_LIST to dynamically adjust pkg-message instead of invoking sed manually IGNORE & RESTRICTED messages should not be quoted Added file(s): - files/pkg-message-jre.in - files/pkg-message-libmap.in Removed file(s): - pkg-message-jre - pkg-message-libmap Port maintainer (java@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- jai-imageio-1.0_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/jai-imageio/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 6 Jun 2008 13:38:37 -0000 1.5 +++ Makefile 11 Jan 2010 02:14:12 -0000 @@ -21,7 +21,7 @@ NO_BUILD= yes ONLY_FOR_ARCHS= i386 -RESTRICTED= "Redistribution is not permitted" +RESTRICTED= Redistribution is not permitted DOWNLOAD_URL= http://java.sun.com/products/java-media/jai/downloads/download-iio.html @@ -32,7 +32,7 @@ .include <bsd.port.pre.mk> .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) -IGNORE= "You must manually fetch the \"Linux Install\" distribution \(${DISTNAME}${EXTRACT_SUFX}\) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again" +IGNORE= you must manually fetch the "Linux Install" distribution (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif .if ${JAVA_PORT_OS} == "native" @@ -48,14 +48,15 @@ pre-install: .if defined(NOINSTALL_IN_JRE) - @${SED} -e "s:%%TARGET_DIR%%:${TARGET_DIR}:g" ${MASTERDIR}/pkg-message-jre > ${PKGMESSAGE} +SUB_FILES= pkg-message-jre +SUB_LIST= TARGET_DIR=${TARGET_DIR} .endif .if defined(WITH_PLUGINWRAPPER) +SUB_FILES= pkg-message-libmap .if defined(NOINSTALL_IN_JRE) - @${ECHO_CMD} >> ${PKGMESSAGE} - @${SED} -e "s:%%LIBDIR%%:${TARGET_DIR}/lib:g" ${MASTERDIR}/pkg-message-libmap >> ${PKGMESSAGE} +SUB_LIST= LIBDIR=${TARGET_DIR}/lib .else - @${SED} -e "s:%%LIBDIR%%:${JAVA_HOME}/jre/lib/i386:g" ${MASTERDIR}/pkg-message-libmap > ${PKGMESSAGE} +SUB_LIST= LIBDIR=${JAVA_HOME}/jre/lib/i386 .endif .endif Index: pkg-message-jre =================================================================== RCS file: pkg-message-jre diff -N pkg-message-jre --- pkg-message-jre 11 Jan 2004 10:53:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -The JAI Image I/O Tools are not installed in JRE, so you have to add - %%TARGET_DIR%%/jar/clibwrapper_jiio.jar - %%TARGET_DIR%%/jar/jai_imageio.jar - %%TARGET_DIR%%/jar/mlibwrapper_jai.jar -to the CLASSPATH environment variable, and add - %%TARGET_DIR%%/lib -to the LD_LIBRARY_PATH environment variable. Index: pkg-message-libmap =================================================================== RCS file: pkg-message-libmap diff -N pkg-message-libmap --- pkg-message-libmap 11 Jan 2004 10:53:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -In order to use the JAI Image I/O Tools on FreeBSD native JavaVM, -describe as follows to your /etc/libmap.conf. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[%%LIBDIR%%/libclib_jiio.so] -libm.so.6 libm.so.2 -libc.so.6 pluginwrapper/jai.so -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: files/pkg-message-jre.in =================================================================== RCS file: files/pkg-message-jre.in diff -N files/pkg-message-jre.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message-jre.in 11 Jan 2010 02:14:12 -0000 @@ -0,0 +1,7 @@ +The JAI Image I/O Tools are not installed in JRE, so you have to add + %%TARGET_DIR%%/jar/clibwrapper_jiio.jar + %%TARGET_DIR%%/jar/jai_imageio.jar + %%TARGET_DIR%%/jar/mlibwrapper_jai.jar +to the CLASSPATH environment variable, and add + %%TARGET_DIR%%/lib +to the LD_LIBRARY_PATH environment variable. Index: files/pkg-message-libmap.in =================================================================== RCS file: files/pkg-message-libmap.in diff -N files/pkg-message-libmap.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message-libmap.in 11 Jan 2010 02:14:12 -0000 @@ -0,0 +1,7 @@ +In order to use the JAI Image I/O Tools on FreeBSD native JavaVM, +describe as follows to your /etc/libmap.conf. +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +[%%LIBDIR%%/libclib_jiio.so] +libm.so.6 libm.so.2 +libc.so.6 pluginwrapper/jai.so +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --- jai-imageio-1.0_2.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001110218.o0B2I7iV019102>