aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/gcc-devel/Makefile27
-rw-r--r--lang/gcc-devel/pkg-plist8
-rw-r--r--lang/gcc-ooo/Makefile27
-rw-r--r--lang/gcc-ooo/pkg-plist8
-rw-r--r--lang/gcc/Makefile27
-rw-r--r--lang/gcc/pkg-plist8
-rw-r--r--lang/gcc30/Makefile27
-rw-r--r--lang/gcc30/pkg-plist8
-rw-r--r--lang/gcc31/Makefile27
-rw-r--r--lang/gcc31/pkg-plist8
-rw-r--r--lang/gcc32/Makefile27
-rw-r--r--lang/gcc32/pkg-plist8
-rw-r--r--lang/gcc33/Makefile27
-rw-r--r--lang/gcc33/pkg-plist8
-rw-r--r--lang/gcc34/Makefile27
-rw-r--r--lang/gcc34/pkg-plist8
-rw-r--r--lang/gcc35/Makefile27
-rw-r--r--lang/gcc35/pkg-plist8
-rw-r--r--lang/gcc40/Makefile27
-rw-r--r--lang/gcc40/pkg-plist8
-rw-r--r--lang/gcc41/Makefile27
-rw-r--r--lang/gcc41/pkg-plist8
-rw-r--r--lang/gcc42/Makefile27
-rw-r--r--lang/gcc42/pkg-plist8
-rw-r--r--lang/gcc43/Makefile27
-rw-r--r--lang/gcc43/pkg-plist8
-rw-r--r--lang/gcc44/Makefile27
-rw-r--r--lang/gcc44/pkg-plist8
-rw-r--r--lang/gcc45/Makefile27
-rw-r--r--lang/gcc45/pkg-plist8
-rw-r--r--lang/gcc46/Makefile27
-rw-r--r--lang/gcc46/pkg-plist8
-rw-r--r--lang/gcc47/Makefile27
-rw-r--r--lang/gcc47/pkg-plist8
-rw-r--r--lang/gcc48/Makefile27
-rw-r--r--lang/gcc48/pkg-plist8
36 files changed, 306 insertions, 324 deletions
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc-devel/pkg-plist b/lang/gcc-devel/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc-devel/pkg-plist
+++ b/lang/gcc-devel/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc30/pkg-plist
+++ b/lang/gcc30/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 41832fb0d06b..fa6b2fc6a0ae 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -34,7 +34,6 @@ NO_CDROM= 'dated material'
##INSTALL_WRKSRC= ${WRKDIR}/build
##CONFIGURE_SCRIPT= ${WRKSRC}/configure
EGCS_REV= 2.97
-LIBSTDCPP_REV= 4
SRCDIR= ${WRKDIR}/gcc-${SNAPVER}
WRKSRC= ${WRKDIR}/build
PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP}
@@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
.endif
PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \
- LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER}
+ SNAPVER=${SNAPVER}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BISON= yes
@@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
.endif
.if defined(WANT_THREADS_SUPPORT)
CONFIGURE_ARGS+= --enable-threads
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
-MAN1= ecpp.1 eg++.1 eg77.1 egcc.1
+MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1
pre-configure:
@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
@@ -102,10 +103,10 @@ post-install:
do \
strip $$prog ; \
done )
- ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
- ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
- ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
- ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+ ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
+ ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
+ ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
+ ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
${RM} -f ${PREFIX}/bin/cpp
@@ -113,16 +114,14 @@ post-install:
# with the stock compiler.
${MV} ${PREFIX}/lib/libiberty.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \
+ ${MV} -f ${PREFIX}/lib/libstdc++.a \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \
- ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a
${MV} -f ${PREFIX}/lib/libzgcj.* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
- ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
- ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
- ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
- ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1
+ ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
+ ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
+ ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
+ ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* \
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 937fbde90edf..264f8e69036e 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
-bin/eg++filt
-bin/eg++
-bin/eg77
-bin/egcc
+bin/gg++filt
+bin/gg++
+bin/gg77
+bin/ggcc
bin/%%GNU_HOST%%-gcc
bin/%%GNU_HOST%%-g++
bin/gccbug-%%SNAPVER%%