From c7611e68f6fabb5a5f6e2a7f3f9897699a5e8a28 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Wed, 11 May 2011 04:57:29 +0000 Subject: [PATCH] . Use $SUB_FILES & SUB_LIST to dynamically adjust pkg-message instead of invoking sed manually. . IGNORE & RESTRICTED messages should not be quoted PR: 142704 Submitted by: Sevan Janiyan --- java/jai-imageio/Makefile | 13 +++++++------ .../{pkg-message-jre => files/pkg-message-jre.in} | 0 .../pkg-message-libmap.in} | 0 3 files changed, 7 insertions(+), 6 deletions(-) rename java/jai-imageio/{pkg-message-jre => files/pkg-message-jre.in} (100%) rename java/jai-imageio/{pkg-message-libmap => files/pkg-message-libmap.in} (100%) diff --git a/java/jai-imageio/Makefile b/java/jai-imageio/Makefile index 8d127fa5197d..e2a1dd45f90d 100644 --- a/java/jai-imageio/Makefile +++ b/java/jai-imageio/Makefile @@ -21,7 +21,7 @@ NO_WRKSUBDIR= yes 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 @@ PKGMESSAGE= ${WRKDIR}/pkg-message .include .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 @@ PLIST_SUB+= INSTALL_IN_JRE="" 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 diff --git a/java/jai-imageio/pkg-message-jre b/java/jai-imageio/files/pkg-message-jre.in similarity index 100% rename from java/jai-imageio/pkg-message-jre rename to java/jai-imageio/files/pkg-message-jre.in diff --git a/java/jai-imageio/pkg-message-libmap b/java/jai-imageio/files/pkg-message-libmap.in similarity index 100% rename from java/jai-imageio/pkg-message-libmap rename to java/jai-imageio/files/pkg-message-libmap.in