From b979f7222ad9bade13f010cd27e5bc6afab1681c Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 29 Jan 2001 11:34:21 +0000
Subject: Add automatic ${VARIABLE} handling for MESSAGE files. Convert most
 MESSAGE files to new syntax (${VARIABLE} gets replaced, not @VARIABLE@, nor
 @@VARIABLE@@). By default, substitutions are done for LOCALBASE, PKGNAME,
 PREFIX, X11BASE, X11PREFIX; additional patterns can be added via
 MESSAGE_SUBST. Clean up some packages while I'm there; add RCS tags to most
 MESSAGEs. Remove some uninteresting MESSAGEs.

---
 lang/jdk/Makefile    |  8 +++-----
 lang/jdk/pkg/MESSAGE | 13 +++++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'lang/jdk')

diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index b727cc6eb29..42f1c4fdbaa 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/11/18 00:40:50 tv Exp $
+# $NetBSD: Makefile,v 1.20 2001/01/29 11:34:30 wiz Exp $
 #
 .include "../../mk/bsd.prefs.mk"
 
@@ -15,9 +15,11 @@ HOMEPAGE=       http://www.quick.com.au/java/
 CONFLICTS=	blackdown-j* sun-j*
 
 .include "../../mk/bsd.prefs.mk"
+
 .if !defined(JDK_HOME)
 JDK_HOME:=	${LOCALBASE}/java
 .endif
+MESSAGE_SUBST+=	JDK_HOME=${JDK_HOME}
 
 .if ${OBJECT_FMT} == "ELF"
 DISTNAME=	jdk${VERSION}-rc1-elf
@@ -34,7 +36,6 @@ CHECK_SHLIBS=	no
 NO_BUILD=	yes
 # since we change PREFIX:
 NO_MTREE=	yes
-MESSAGE_FILE=	${WRKDIR}/.MESSAGE
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386
 RESTRICTED=	"No redistribution of the Java(tm) Development Kit"
@@ -60,9 +61,6 @@ do-install:
 	${RM} -f ${WRKSRC}/*.orig
 	${MKDIR} ${JDK_HOME}
 	cd ${WRKSRC} ; ${GTAR} pcf - . | ( cd ${JDK_HOME} ; ${GTAR} pvxf - )
-	${SED} \
-		-e 's|@JDK_HOME@|${JDK_HOME}|g' \
-		<${PKGDIR}/MESSAGE >${MESSAGE_FILE}
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/jdk/pkg/MESSAGE b/lang/jdk/pkg/MESSAGE
index 388248f5acc..49b9fb04ec5 100644
--- a/lang/jdk/pkg/MESSAGE
+++ b/lang/jdk/pkg/MESSAGE
@@ -1,8 +1,13 @@
-You may want to read @JDK_HOME@/README for details about running
+======================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:30 wiz Exp $
+
+You may want to read ${JDK_HOME}/README for details about running
 this jdk. In a nutshell you may want to set the following in your
 shell environment:
 
-        CLASSPATH to @JDK_HOME@/lib/classes.zip:.
-        JAVA_HOME to @JDK_HOME@
+        CLASSPATH to ${JDK_HOME}/lib/classes.zip:.
+        JAVA_HOME to ${JDK_HOME}
+
+and add ${JDK_HOME}/bin to your ${PATH}.
 
-and add @JDK_HOME@/bin to your ${PATH}.
+======================================================================
-- 
cgit v1.2.3