diff options
| author | glewis <glewis@FreeBSD.org> | 2011-05-11 12:57:29 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2011-05-11 12:57:29 +0800 |
| commit | b9ef7ce2104fd480524da39b83d19c44db511e15 (patch) | |
| tree | d08ae62631186a4838e0b91e1689f270a5f71947 | |
| parent | b397f63cf08ae3fb31e3472d5ec75b3c600a467f (diff) | |
| download | freebsd-ports-gnome-b9ef7ce2104fd480524da39b83d19c44db511e15.tar.gz freebsd-ports-gnome-b9ef7ce2104fd480524da39b83d19c44db511e15.tar.zst freebsd-ports-gnome-b9ef7ce2104fd480524da39b83d19c44db511e15.zip | |
. 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 <venture37@geeklan.co.uk>
| -rw-r--r-- | java/jai-imageio/Makefile | 13 | ||||
| -rw-r--r-- | java/jai-imageio/files/pkg-message-jre.in (renamed from java/jai-imageio/pkg-message-jre) | 0 | ||||
| -rw-r--r-- | java/jai-imageio/files/pkg-message-libmap.in (renamed from java/jai-imageio/pkg-message-libmap) | 0 |
3 files changed, 7 insertions, 6 deletions
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 <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 @@ 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 index 09bcfc552f4c..09bcfc552f4c 100644 --- a/java/jai-imageio/pkg-message-jre +++ b/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 index 3de1bfbe677b..3de1bfbe677b 100644 --- a/java/jai-imageio/pkg-message-libmap +++ b/java/jai-imageio/files/pkg-message-libmap.in |