From 7a0f42581e3562f6d2c2bcc63826549e564d9082 Mon Sep 17 00:00:00 2001
From: Herve Quiroz <hq@FreeBSD.org>
Date: Sun, 13 Feb 2005 21:28:05 +0000
Subject: [PATCH] - Update to bsd.java.mk 2.0 - ECHO_CMD -> ECHO_MSG

---
 java/jai-imageio/Makefile | 11 ++++++-----
 java/jai/Makefile         | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/java/jai-imageio/Makefile b/java/jai-imageio/Makefile
index 57eababa1627..b45f6004a760 100644
--- a/java/jai-imageio/Makefile
+++ b/java/jai-imageio/Makefile
@@ -14,7 +14,8 @@ DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION:S/./_/g}-lib-linux-i586
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Plug-ins for the Java Image I/O Framework
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
@@ -58,10 +59,10 @@ pre-install:
 .endif
 
 do-install:
-		@${ECHO_CMD} -n ">> Creating destination directory..."
+		@${ECHO_MSG} -n ">> Creating destination directory..."
 		@${MKDIR} ${TARGET_DIR}
-		@${ECHO_CMD} " [DONE]"
-		@${ECHO_CMD} -n ">> Installing libraries..."
+		@${ECHO_MSG} " [DONE]"
+		@${ECHO_MSG} -n ">> Installing libraries..."
 		@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT-jai_imageio.txt ${TARGET_DIR}
 		@${INSTALL_DATA} ${WRKSRC}/LICENSE-jai_imageio.txt ${TARGET_DIR}
 		@${INSTALL_DATA} ${WRKSRC}/README-jai_imageio.html ${TARGET_DIR}
@@ -77,7 +78,7 @@ do-install:
 		@${TEST} -e ${JAVA_HOME}/jre/lib/ext/mlibwrapper_jai.jar || ${LN} -sf ${TARGET_DIR}/jar/mlibwrapper_jai.jar ${JAVA_HOME}/jre/lib/ext
 		@${LN} -sf ${TARGET_DIR}/lib/libclib_jiio.so ${JAVA_HOME}/jre/lib/i386
 .endif
-		@${ECHO_CMD} " [DONE]"
+		@${ECHO_MSG} " [DONE]"
 
 post-install:
 .if defined(NOINSTALL_IN_JRE) || defined(WITH_PLUGINWRAPPER)
diff --git a/java/jai/Makefile b/java/jai/Makefile
index 69b0714b5345..8da8067547c5 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -15,7 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-lib-linux-i586
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	High performance image processing libraries for Java
 
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
@@ -60,10 +61,10 @@ pre-install:
 .endif
 
 do-install:
-		@${ECHO_CMD} -n ">> Creating destination directory..."
+		@${ECHO_MSG} -n ">> Creating destination directory..."
 		@${MKDIR} ${TARGET_DIR}
-		@${ECHO_CMD} " [DONE]"
-		@${ECHO_CMD} -n ">> Installing libraries..."
+		@${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}
@@ -80,7 +81,7 @@ do-install:
 		@${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_CMD} " [DONE]"
+		@${ECHO_MSG} " [DONE]"
 
 post-install:
 .if defined(NOINSTALL_IN_JRE) || defined(WITH_PLUGINWRAPPER)