summaryrefslogtreecommitdiff
path: root/lang/gcc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-01-29 11:34:21 +0000
committerwiz <wiz@pkgsrc.org>2001-01-29 11:34:21 +0000
commitb979f7222ad9bade13f010cd27e5bc6afab1681c (patch)
tree86f14acd24842161759a420487862022044c2b4b /lang/gcc
parent6a13219ca89e5dae86f27159ff86006058c06859 (diff)
downloadpkgsrc-b979f7222ad9bade13f010cd27e5bc6afab1681c.tar.gz
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.
Diffstat (limited to 'lang/gcc')
-rw-r--r--lang/gcc/Makefile8
-rw-r--r--lang/gcc/pkg/MESSAGE9
-rw-r--r--lang/gcc/pkg/MESSAGE.SunOS5
3 files changed, 16 insertions, 6 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".
+
+======================================================================