summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/gcc-ssp/Makefile4
-rw-r--r--lang/gcc/Makefile5
-rw-r--r--lang/gcc3-ada/Makefile6
-rw-r--r--lang/gcc3-c++/Makefile6
-rw-r--r--lang/gcc3-c/Makefile5
-rw-r--r--lang/gcc3-f77/Makefile6
-rw-r--r--lang/gcc3-java/Makefile6
-rw-r--r--lang/gcc3-objc/Makefile5
-rw-r--r--lang/gcc3/Makefile5
9 files changed, 26 insertions, 22 deletions
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index ea538042bd5..cb9f57aa148 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/06/02 01:19:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2003/07/06 12:31:57 grant Exp $
DISTNAME= gcc-2.95.3
GCC_VERSION= 2.95.3
@@ -120,7 +120,7 @@ post-install:
# remove empy file and directories that show up when one
# does make install; make deinstall; make install
post-install:
- -cd ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include && \
+ -cd ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include && \
${RM} -f fixed && \
${RMDIR} v7 v9
.endif
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index b462266ee35..d327e82ce9a 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2003/07/04 16:27:24 seb Exp $
+# $NetBSD: Makefile,v 1.63 2003/07/06 12:31:57 grant Exp $
DISTNAME= gcc-2.95.3
PKGREVISION= 3
@@ -56,7 +56,8 @@ ALL_TARGET= bootstrap
. endif
.endif
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX}
FILES_SUBST+= DISTNAME=${DISTNAME}
MESSAGE_SUBST+= DISTNAME=${DISTNAME}
diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile
index d5ddc5eb1ec..2151940706b 100644
--- a/lang/gcc3-ada/Makefile
+++ b/lang/gcc3-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:03 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:58 grant Exp $
#
DISTNAME= gcc-3.3
@@ -57,9 +57,9 @@ ALL_TARGET= bootstrap
. endif
.endif
-# as this is named gcc3, use DISTNAME instead.
GCC_PREFIX= ${PREFIX}/gcc3
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
#
# Bootstrap section. Define something to make the pkg usable.
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index 9ac773d08bc..e1b850dbdd0 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:09 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:58 grant Exp $
#
DISTNAME= gcc-3.3
@@ -53,9 +53,9 @@ ALL_TARGET= bootstrap
. endif
.endif
-# as this is named gcc3, use DISTNAME instead.
GCC_PREFIX= ${PREFIX}/gcc3
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
pre-configure:
${MKDIR} ${BUILD_DIRS}
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 46edb3a69b9..00a5130e01a 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:07 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:58 grant Exp $
#
DISTNAME= gcc-3.3
@@ -73,8 +73,9 @@ ALL_TARGET= bootstrap
.endif
GCC_PREFIX= ${PREFIX}/gcc3
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}
pre-configure:
${MKDIR} ${BUILD_DIRS}
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index 466e891be23..a322260cb3a 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:10 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:58 grant Exp $
#
DISTNAME= gcc-3.3
@@ -56,9 +56,9 @@ ALL_TARGET= bootstrap
. endif
.endif
-# as this is named gcc3, use DISTNAME instead.
GCC_PREFIX= ${PREFIX}/gcc3
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
pre-configure:
${MKDIR} ${BUILD_DIRS}
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 4dd45c1c5e7..8550528aa06 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:11 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:59 grant Exp $
#
DISTNAME= gcc-3.3
@@ -56,9 +56,9 @@ ALL_TARGET= bootstrap
. endif
.endif
-# as this is named gcc3, use DISTNAME instead.
GCC_PREFIX= ${PREFIX}/gcc3
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
pre-configure:
${MKDIR} ${BUILD_DIRS}
diff --git a/lang/gcc3-objc/Makefile b/lang/gcc3-objc/Makefile
index 415272a060a..2c41f90601d 100644
--- a/lang/gcc3-objc/Makefile
+++ b/lang/gcc3-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/06 12:15:12 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:59 grant Exp $
#
DISTNAME= gcc-3.3
@@ -51,7 +51,8 @@ ALL_TARGET= bootstrap
# as this is named gcc3, use DISTNAME instead.
GCC_PREFIX= ${PREFIX}/gcc3
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${PKGVERSION}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION}
pre-configure:
${MKDIR} ${BUILD_DIRS}
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index f42652f8762..d4cca003f1b 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/07/06 12:06:32 grant Exp $
+# $NetBSD: Makefile,v 1.34 2003/07/06 12:31:59 grant Exp $
#
DISTNAME= gcc-3.3
@@ -85,8 +85,9 @@ ALL_TARGET= bootstrap
# as this is named gcc3, use DISTNAME instead.
GCC_PREFIX= ${PREFIX}/${DISTNAME}
+GCC_VERSION= ${PKGVERSION:C|nb*||}
+GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/3.3
pre-configure:
${MKDIR} ${BUILD_DIRS}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 20:01:09 +0000