Date: Fri, 7 May 2004 01:59:31 +0200 (CEST) From: Roman Neuhauser <neuhauser@chello.cz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/66342: [PATCH] fix ECHO_MSG breakage in java ports Message-ID: <20040506235931.073A82FDA01@isis.wad.cz> Resent-Message-ID: <200405070000.i4700Vww017602@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66342
>Category: ports
>Synopsis: [PATCH] fix ECHO_MSG breakage in java ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 06 17:00:31 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Roman Neuhauser
>Release: FreeBSD 4.9-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD isis.wad.cz 4.9-RELEASE-p2 FreeBSD 4.9-RELEASE-p2 #3: Sun Mar 7 02:11:16 CET 2004 root@isis.wad.cz:/usr/obj/usr/src/sys/FREEPUPPY2_6 i386
>Description:
several ports in the java category set ECHO_MSG=printf to display
formatted IGNORE variables with embedded \n escapes, but ECHO_MSG
redefinition breaks other uses. they should probably redefine
IGNORECMD instead.
>How-To-Repeat:
cd /usr/ports/java/shujit && make clean
>Fix:
--- ports::java-IGNORE_CMD.patch begins here ---
Index: java/diablo-jdk13/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jdk13/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- java/diablo-jdk13/Makefile 4 Feb 2004 05:21:26 -0000 1.6
+++ java/diablo-jdk13/Makefile 6 May 2004 21:14:44 -0000
@@ -65,7 +65,7 @@
.endif
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the distribution\n\
manually. Please access\n\
Index: java/diablo-jre13/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jre13/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- java/diablo-jre13/Makefile 4 Feb 2004 05:21:26 -0000 1.6
+++ java/diablo-jre13/Makefile 6 May 2004 21:14:44 -0000
@@ -65,7 +65,7 @@
.endif
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the distribution\n\
manually. Please access\n\
Index: java/jdk12/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk12/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- java/jdk12/Makefile 6 Feb 2004 16:49:54 -0000 1.32
+++ java/jdk12/Makefile 6 May 2004 21:14:44 -0000
@@ -80,7 +80,7 @@
# Check for patchset
.if !exists(${DISTDIR}/${PATCHSETFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
The source distribution exists on your system, but due to\n\
licensing restrictions you still need to download the\n\
@@ -91,7 +91,7 @@
# Check for JDK sources
.if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
manually. Please access http://www.sun.com/software/java2/download.html\n\
Index: java/jdk13/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk13/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- java/jdk13/Makefile 6 Feb 2004 17:03:09 -0000 1.75
+++ java/jdk13/Makefile 6 May 2004 21:14:44 -0000
@@ -145,7 +145,7 @@
# Check for patchset
.if !exists(${DISTDIR}/${PATCHSETFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
The source distribution exists on your system, but due to\n\
licensing restrictions you still need to download the\n\
@@ -156,7 +156,7 @@
# Check for JDK sources
.if !exists(${DISTDIR}/${SRCFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
manually. Please access http://www.sun.com/software/java2/download.html\n\
@@ -170,7 +170,7 @@
# HotSpot and/or native threads require a recent version of FreeBSD
.if ( defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) ) && ( ${OSVERSION} < 470101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500043 ) )
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
You must have a version of FreeBSD later than 4.7-STABLE February 2003\n\
or 5-CURRENT February 2003 to use either native threads or HotSpot.\n
Index: java/jdk14/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk14/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- java/jdk14/Makefile 5 Mar 2004 13:43:40 -0000 1.78
+++ java/jdk14/Makefile 6 May 2004 21:14:44 -0000
@@ -137,7 +137,7 @@
# Check for JDK sources
.if !exists(${DISTDIR}/${SCSL_SRCFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
manually. Please access http://www.sun.com/software/java2/download.html\n\
@@ -149,7 +149,7 @@
${DISTDIR}.\n
.endif
.if !exists(${DISTDIR}/${SCSL_BINFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
manually. Please access http://www.sun.com/software/java2/download.html\n\
@@ -163,7 +163,7 @@
# Check for patchset
.if !exists(${DISTDIR}/${PATCHSETFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
The source distribution exists on your system, but due to\n\
licensing restrictions you still need to download the\n\
Index: java/jmf/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jmf/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- java/jmf/Makefile 9 Feb 2004 16:22:27 -0000 1.1
+++ java/jmf/Makefile 6 May 2004 21:14:44 -0000
@@ -36,7 +36,7 @@
# Check for JMF sources
.if !exists(${DISTDIR}/${DISTFILES}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
manually. Please access:\n\
Index: java/linux-ibm-jdk14/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-ibm-jdk14/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- java/linux-ibm-jdk14/Makefile 15 Apr 2004 22:55:14 -0000 1.8
+++ java/linux-ibm-jdk14/Makefile 6 May 2004 21:14:44 -0000
@@ -39,7 +39,7 @@
.include <bsd.port.pre.mk>
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE=:\n\
Because of licensing restrictions, you must manually fetch the IBM Java SDK\n\
${JDK_VERSION} for Linux archive (${DISTNAME}${EXTRACT_SUFX}). Please access\n\
Index: java/poseidon/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/poseidon/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- java/poseidon/Makefile 9 Apr 2004 21:48:02 -0000 1.2
+++ java/poseidon/Makefile 6 May 2004 21:14:44 -0000
@@ -25,7 +25,7 @@
.include <bsd.port.pre.mk>
.if !exists(${DISTDIR}/${DISTFILES})
-ECHO_MSG=/usr/bin/printf
+IGNORECMD= ${PRINTF} "===> ${PKGNAME} ${IGNORE}."
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
manually. Please access http://www.gentleware.com/products/download.php4\n\
--- ports::java-IGNORE_CMD.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040506235931.073A82FDA01>