From 84763e2c13a3d38a04af6fed18a2f95ca0ed7d9d Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 1 Jan 2002 01:21:18 +0000
Subject: [PATCH] 3.0.3, at least working on i386. Rename libstdc++ to
 libestdc++ to avoid confusion with /usr/src

---
 lang/egcs/stable/Makefile                     | 13 +++++++++---
 lang/egcs/stable/distinfo                     |  6 ++++++
 lang/egcs/stable/files/md5                    |  3 ---
 .../stable/patches/patch-gcc_config_openbsd_h |  7 +++++++
 .../patch-libstdc++-v3_src_Makefile_in        | 20 +++++++++++++++++++
 lang/egcs/stable/patches/patch-ltcf-gcj_sh    | 19 ++++++++++++++++++
 lang/egcs/stable/pkg/PFRAG.shared-c++         |  5 +++--
 lang/egcs/stable/pkg/PFRAG.shared-objc        |  2 +-
 lang/egcs/stable/pkg/PLIST                    |  7 +++++--
 lang/egcs/stable/pkg/PLIST-c++                | 12 ++++++-----
 10 files changed, 78 insertions(+), 16 deletions(-)
 create mode 100644 lang/egcs/stable/distinfo
 delete mode 100644 lang/egcs/stable/files/md5
 create mode 100644 lang/egcs/stable/patches/patch-gcc_config_openbsd_h
 create mode 100644 lang/egcs/stable/patches/patch-libstdc++-v3_src_Makefile_in
 create mode 100644 lang/egcs/stable/patches/patch-ltcf-gcj_sh

diff --git a/lang/egcs/stable/Makefile b/lang/egcs/stable/Makefile
index ae13be44694..9b1a1ffbcae 100644
--- a/lang/egcs/stable/Makefile
+++ b/lang/egcs/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2001/10/31 18:46:28 espie Exp $
+# $OpenBSD: Makefile,v 1.52 2002/01/01 01:21:18 espie Exp $
 
 # This is a configuration file for egcs
 
@@ -63,7 +63,7 @@ BUILD_DEPENDS+=:bison-*:devel/bison
 
 #### fetch section
 
-V=3.0.2
+V=3.0.3
 DIRECTORY=releases/${DISTNAME}/
 DISTNAME=   gcc-$V
 
@@ -72,7 +72,8 @@ MASTER_SITE_SUBDIR=${LATEST_DATE}
 
 DIST_SUBDIR=egcs
 
-DISTFILES=  gcc-$V${EXTRACT_SUFX}
+DISTFILES=  gcc-3.0.2${EXTRACT_SUFX}
+PATCHFILES=	gcc-3.0.2-3.0.3.diff.bz2
 
 SITES=	
 
@@ -137,6 +138,12 @@ MASTER_SITES=${SITES:S/%DATE%/${LATEST_DATE}/}
 #### 
 # Patch section
 
+pre-patch:
+	cd ${WRKDIR} && mv gcc-3.0.2 gcc-3.0.3
+
+PATCH_DIST_STRIP=-p1
+
+
 # get openbsd configuration files where they should be
 post-patch:
 #	cp -R ${FILESDIR}/config/* ${WRKSRC}
diff --git a/lang/egcs/stable/distinfo b/lang/egcs/stable/distinfo
new file mode 100644
index 00000000000..e088ecf82cf
--- /dev/null
+++ b/lang/egcs/stable/distinfo
@@ -0,0 +1,6 @@
+MD5 (egcs/gcc-3.0.2-3.0.3.diff.bz2) = cdae9c4748133fa40b4fa74a46ccc6b2
+MD5 (egcs/gcc-3.0.2.tar.gz) = 129edec1d543d0ca1aeedaf4b49e8d45
+RMD160 (egcs/gcc-3.0.2-3.0.3.diff.bz2) = e2090db1f1bb891292b803a260f6fa4dc990a5e0
+RMD160 (egcs/gcc-3.0.2.tar.gz) = c23a18346178173d558a3a8fb6fc45d719550303
+SHA1 (egcs/gcc-3.0.2-3.0.3.diff.bz2) = a1229454ef0afc14a7f9471a9ea7af5e904b86e3
+SHA1 (egcs/gcc-3.0.2.tar.gz) = 55d98bf8ac96d10aea7a5965f086ea8b8cf16f7e
diff --git a/lang/egcs/stable/files/md5 b/lang/egcs/stable/files/md5
deleted file mode 100644
index 2b17277521a..00000000000
--- a/lang/egcs/stable/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (egcs/gcc-3.0.2.tar.gz) = 129edec1d543d0ca1aeedaf4b49e8d45
-RMD160 (egcs/gcc-3.0.2.tar.gz) = c23a18346178173d558a3a8fb6fc45d719550303
-SHA1 (egcs/gcc-3.0.2.tar.gz) = 55d98bf8ac96d10aea7a5965f086ea8b8cf16f7e
diff --git a/lang/egcs/stable/patches/patch-gcc_config_openbsd_h b/lang/egcs/stable/patches/patch-gcc_config_openbsd_h
new file mode 100644
index 00000000000..7f1dfac749c
--- /dev/null
+++ b/lang/egcs/stable/patches/patch-gcc_config_openbsd_h
@@ -0,0 +1,7 @@
+--- gcc/config/openbsd.h.orig	Mon Dec 31 21:02:38 2001
++++ gcc/config/openbsd.h	Mon Dec 31 21:03:04 2001
+@@ -311,3 +311,4 @@ do {									 \
+    as this depends on a few other details as well...  */
+ #define HANDLE_SYSV_PRAGMA
+ 
++#define LIBSTDCXX "-lestdc++"
diff --git a/lang/egcs/stable/patches/patch-libstdc++-v3_src_Makefile_in b/lang/egcs/stable/patches/patch-libstdc++-v3_src_Makefile_in
new file mode 100644
index 00000000000..66bd532857e
--- /dev/null
+++ b/lang/egcs/stable/patches/patch-libstdc++-v3_src_Makefile_in
@@ -0,0 +1,20 @@
+--- libstdc++-v3/src/Makefile.in.orig	Mon Dec 31 21:04:07 2001
++++ libstdc++-v3/src/Makefile.in	Mon Dec 31 21:06:05 2001
+@@ -128,7 +128,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd
+ CXX = @glibcpp_CXX@
+ toolexecdir = @glibcpp_toolexecdir@
+ toolexeclibdir = @glibcpp_toolexeclibdir@
+-toolexeclib_LTLIBRARIES = libstdc++.la
++toolexeclib_LTLIBRARIES = libestdc++.la
+ 
+ # Compile flags that should be constant throughout the build, both for
+ # SUBDIRS and for libstdc++-v3 in general.
+@@ -320,7 +320,7 @@ distclean-libtool:
+ 
+ maintainer-clean-libtool:
+ 
+-libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
++libestdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
+ 	$(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+ .cc.o:
+ 	$(CXXCOMPILE) -c $<
diff --git a/lang/egcs/stable/patches/patch-ltcf-gcj_sh b/lang/egcs/stable/patches/patch-ltcf-gcj_sh
new file mode 100644
index 00000000000..48c79a17098
--- /dev/null
+++ b/lang/egcs/stable/patches/patch-ltcf-gcj_sh
@@ -0,0 +1,19 @@
+$OpenBSD: patch-ltcf-gcj_sh,v 1.1 2002/01/01 01:21:18 espie Exp $
+--- ltcf-gcj.sh.orig	Sun Sep 16 15:52:22 2001
++++ ltcf-gcj.sh	Sun Sep 16 15:55:09 2001
+@@ -445,10 +445,13 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
++    archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    remove_lgcc=yes
++    output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+     ;;
+ 
+   os2*)
diff --git a/lang/egcs/stable/pkg/PFRAG.shared-c++ b/lang/egcs/stable/pkg/PFRAG.shared-c++
index 5094a3cf946..a7327a25d2e 100644
--- a/lang/egcs/stable/pkg/PFRAG.shared-c++
+++ b/lang/egcs/stable/pkg/PFRAG.shared-c++
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared-c++,v 1.2 2001/10/31 18:46:29 espie Exp $
-lib/libstdc++.so.3.2
+@comment $OpenBSD: PFRAG.shared-c++,v 1.3 2002/01/01 01:21:18 espie Exp $
+lib/libestdc++.so.3.2
+DYNLIBDIR(%B)
diff --git a/lang/egcs/stable/pkg/PFRAG.shared-objc b/lang/egcs/stable/pkg/PFRAG.shared-objc
index ba88ca25173..06e40e43461 100644
--- a/lang/egcs/stable/pkg/PFRAG.shared-objc
+++ b/lang/egcs/stable/pkg/PFRAG.shared-objc
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared-objc,v 1.2 2001/08/22 09:03:04 espie Exp $
+@comment $OpenBSD: PFRAG.shared-objc,v 1.3 2002/01/01 01:21:18 espie Exp $
 lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libobjc.so.1.0
diff --git a/lang/egcs/stable/pkg/PLIST b/lang/egcs/stable/pkg/PLIST
index 214dd1da770..cc475a40d2d 100644
--- a/lang/egcs/stable/pkg/PLIST
+++ b/lang/egcs/stable/pkg/PLIST
@@ -1,10 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.8 2001/10/31 18:46:29 espie Exp $
+@comment $OpenBSD: PLIST,v 1.9 2002/01/01 01:21:18 espie Exp $
 @pkgcfl egcs-*-core
 @unexec install-info --delete --info-dir=%D/info %D/info/cpp.info
 @unexec install-info --delete --info-dir=%D/info %D/info/cppinternals.info
 @unexec install-info --delete --info-dir=%D/info %D/info/gcc.info
 bin/ecpp
-bin/eg++
 bin/egcc
 bin/egccbug
 bin/egcov
@@ -74,6 +73,10 @@ lib/libiberty.a
 man/man1/cpp.1
 man/man1/egcc.1
 man/man1/gcov.1
+man/man7/fsf-funding.7
+man/man7/gfdl.7
+man/man7/gpl.7
+%%SHARED%%
 @dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/machine
 @dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include
 @dirrm lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/fpic
diff --git a/lang/egcs/stable/pkg/PLIST-c++ b/lang/egcs/stable/pkg/PLIST-c++
index 7dfdf81be19..a6aeb7ff904 100644
--- a/lang/egcs/stable/pkg/PLIST-c++
+++ b/lang/egcs/stable/pkg/PLIST-c++
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-c++,v 1.4 2001/10/31 18:46:29 espie Exp $
+@comment $OpenBSD: PLIST-c++,v 1.5 2002/01/01 01:21:18 espie Exp $
 @pkgcfl egcs-*-c++
 @pkgcfl gcc-*-c++
 bin/ec++
 bin/ec++filt
+bin/eg++
 bin/${MACHINE_ARCH}-unknown-openbsd${OSREV}-c++
 bin/${MACHINE_ARCH}-unknown-openbsd${OSREV}-g++
 include/g++-v3/algorithm
@@ -225,16 +226,17 @@ include/g++-v3/typeinfo
 include/g++-v3/utility
 include/g++-v3/valarray
 include/g++-v3/vector
-lib/fpic/libstdc++.a
-lib/fpic/libstdc++.la
+lib/fpic/libestdc++.a
+lib/fpic/libestdc++.la
 lib/fpic/libsupc++.a
 lib/fpic/libsupc++.la
 lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/cc1plus
-lib/libstdc++.a
-lib/libstdc++.la
+lib/libestdc++.a
+lib/libestdc++.la
 lib/libsupc++.a
 lib/libsupc++.la
 man/man1/eg++.1
+%%SHARED%%
 @dirrm include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits
 @dirrm include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}
 @dirrm include/g++-v3/ext