diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc/Makefile | 8 | ||||
| -rw-r--r-- | lang/gcc/pkg/MESSAGE | 9 | ||||
| -rw-r--r-- | lang/gcc/pkg/MESSAGE.SunOS | 5 | ||||
| -rw-r--r-- | lang/jdk/Makefile | 8 | ||||
| -rw-r--r-- | lang/jdk/pkg/MESSAGE | 13 |
5 files changed, 28 insertions, 15 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 537d0d9e9ea..cc42237d973 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/01/13 00:34:55 tron Exp $ +# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:29 wiz Exp $ DISTNAME= gcc-2.95.2 CATEGORIES= lang @@ -29,6 +29,7 @@ CONFIGURE_ARGS= --host=${MACHINE_GCC_PLATFORM} \ CONFIGURE_SCRIPT= ${SRCDIR}/configure GCC_VERSION= ${PKGNAME:C/.*-//} +MESSAGE_SUBST+= MAKE=${MAKE} PLIST_SUBST+= GCC_VERSION=${GCC_VERSION} \ MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM} SRCDIR= ${WRKDIR}/${PKGNAME} @@ -39,14 +40,13 @@ WRKSRC= ${WRKDIR}/objdir .if (${OPSYS} != SunOS) CONFIGURE_ARGS+= --with-gnu-as --with-gnu-ld GCC_PREFIX= ${LOCALBASE}/${PKGNAME} -MESSAGE_FILE= ${WRKDIR}/MESSAGE .else .if (${CC} != gcc) ALL_TARGET= bootstrap .endif GCC_PREFIX= ${LOCALBASE} PLIST_SRC= ${PKGDIR}/PLIST.SunOS -MESSAGE_FILE= ${PKGDIR}/MESSAGE.SunOS +MESSAGE= ${PKGDIR}/MESSAGE.SunOS .endif post-extract: @@ -57,7 +57,7 @@ post-patch: .if (${OPSYS} != SunOS) post-build: - for FILE in ${FILESDIR}/gcc.mk ${PKGDIR}/MESSAGE; do \ + for FILE in ${FILESDIR}/gcc.mk do \ ${SED} -e 's#@@MAKE@@#${MAKE}#g' \ -e 's#@@PKGNAME@@#${PKGNAME}#g' \ -e 's#@@PREFIX@@#${PREFIX}#g' \ diff --git a/lang/gcc/pkg/MESSAGE b/lang/gcc/pkg/MESSAGE index c30c15c9a09..e6ffcf58cc9 100644 --- a/lang/gcc/pkg/MESSAGE +++ b/lang/gcc/pkg/MESSAGE @@ -1,3 +1,8 @@ -To use "@@PKGNAME@@" invoke "@@MAKE@@" like this: +====================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:29 wiz Exp $ -@@MAKE@@ MAKECONF=@@PREFIX@@/etc/@@PKGNAME@@.mk [...] +To use ${PKGNAME} invoke "${MAKE}" like this: + +${MAKE} MAKECONF=${PREFIX}/etc/${PKGNAME}.mk [...] + +====================================================================== diff --git a/lang/gcc/pkg/MESSAGE.SunOS b/lang/gcc/pkg/MESSAGE.SunOS index 52df517a2ed..93be4ad57ac 100644 --- a/lang/gcc/pkg/MESSAGE.SunOS +++ b/lang/gcc/pkg/MESSAGE.SunOS @@ -1,2 +1,7 @@ +====================================================================== +$NetBSD: MESSAGE.SunOS,v 1.2 2001/01/29 11:34:29 wiz Exp $ + To avoid conflicts with e.g. Sun WorkShop the GNU C compiler can only be invoked as "gcc" but not as "cc". + +====================================================================== 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}. +====================================================================== |