diff --git a/lang/egcs/snapshot/Makefile b/lang/egcs/snapshot/Makefile
index fce2501baaf..0b93a6d8d5b 100644
--- a/lang/egcs/snapshot/Makefile
+++ b/lang/egcs/snapshot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2000/07/26 14:01:46 espie Exp $
+# $OpenBSD: Makefile,v 1.79 2000/08/01 14:44:43 espie Exp $
 
 # This is a configuration file for egcs, snapshot flavor
 # PLEASE use the regular egcs-stable for serious work, resort to this one
@@ -86,7 +86,7 @@ BUILD_DEPENDS+=	runtest::lang/egcs/dejagnu
 BUILD_DEPENDS+=bison::devel/bison
 .endif
 
-LATEST_DATE=2000-07-24
+LATEST_DATE=2000-07-31
 
 #### fetch section
 # configuration is built so that you can test the next snapshot easily,
@@ -220,34 +220,33 @@ CONFIGURE_STYLE=	gnu dest
 
 LANGS=c
 .if defined(MAKE_GXX)
-LANGS+=c++
+LANGS:=${LANGS},c++
 .endif
 .if defined(MAKE_FORTRAN)
-LANGS+=f77
+LANGS:=${LANGS},f77
 .endif
 .if defined(MAKE_CHILL)
-LANGS+=CHILL
+LANGS.=${LANGS},CHILL
 .endif
 .if defined(MAKE_OBJC)
-LANGS+=objc
+LANGS:=${LANGS},objc
 .endif
 .if defined(MAKE_JAVA)
-LANGS+=java
+LANGS:=${LANGS},java
 .endif
 
 # Note: the configure target passes CFLAGS to the configure script anyways.
 
 CFLAGS=-O2 -g
-CONFIGURE_ENV=LANGUAGES='${LANGS}'  
-
 
 
 CONFIGURE_ARGS= --verbose --program-transform-name=s,^,e, \
---disable-nls
+--disable-nls 
 
 # This is needed, as internal cpp is no longer compatible with the
 # visible beast
 CONFIGURE_ARGS+=--enable-cpp
+CONFIGURE_ARGS+=--enable-languages=${LANGS}
 
 
 # if you wish to try your luck
@@ -280,7 +279,7 @@ SEPARATE_BUILD=concurrent
 
 # you shouldn't skip bootstrap unless you know what you're doing
 # use bootstrap-lean if you're pressed for space
-ALL_TARGET=bootstrap 
+ALL_TARGET=bootstrap
 #ALL_TARGET=bootstrap3
 # ALL_TARGET=bootstrap-lean
 
diff --git a/lang/egcs/snapshot/files/md5 b/lang/egcs/snapshot/files/md5
index a4e86480e16..176eac707d1 100644
--- a/lang/egcs/snapshot/files/md5
+++ b/lang/egcs/snapshot/files/md5
@@ -7,6 +7,7 @@ MD5 (egcs/egcs-20000703.tar.gz) = 2a0081475dfdf8a7ed9bf0464f26eacc
 MD5 (egcs/egcs-20000710.tar.gz) = 8bf0dcfcf415c77493d354a6abf121d0
 MD5 (egcs/egcs-20000717.tar.gz) = cb001505a4e58d8b332c0c420dc7e53f
 MD5 (egcs/egcs-20000724.tar.gz) = 3d556edd207b3d6bb1a22a83d79a6708
+MD5 (egcs/egcs-20000731.tar.gz) = 422a6cc41350c4a7f2ab97c6d6348948
 RMD160 (egcs/egcs-20000313.tar.gz) = be8a57c500107f3d261e65c0857865a540d5f9fe
 RMD160 (egcs/egcs-20000320.tar.gz) = 95901fd29f59ef1d2249a832d87ff3261e68edfd
 RMD160 (egcs/egcs-20000327.tar.gz) = 68c3527e2ab44b8c7b3c3f2dc4a071d992dbe27a
@@ -16,6 +17,7 @@ RMD160 (egcs/egcs-20000703.tar.gz) = 8ed97a6e113ae717a7d629e473ea6d4ab9242374
 RMD160 (egcs/egcs-20000710.tar.gz) = 5be95b049f942a63ca97db25d95260558b89dd44
 RMD160 (egcs/egcs-20000717.tar.gz) = c683eebed476267ee09934e39286cdbd06e4e1c1
 RMD160 (egcs/egcs-20000724.tar.gz) = 24cc7dcf1842e454e50db2428b531c24e5ee2982
+RMD160 (egcs/egcs-20000731.tar.gz) = 1a964d945d525d5530b94cac5bfe2493a032f075
 SHA1 (egcs/egcs-20000313.tar.gz) = c60141c2739ab7800f243fd363813b2ffdb56767
 SHA1 (egcs/egcs-20000320.tar.gz) = 7150f3ea6cb46de835728d0c766a40377955d5e4
 SHA1 (egcs/egcs-20000327.tar.gz) = 6d01c0538d04e26a7098d44ace6377b68c6eb3f3
@@ -25,3 +27,4 @@ SHA1 (egcs/egcs-20000703.tar.gz) = f150cd96f38a5bd06bfa63c330b11cf30fb178e9
 SHA1 (egcs/egcs-20000710.tar.gz) = 4cf2a5b68b84f671666ab7b5339fbb38ab059798
 SHA1 (egcs/egcs-20000717.tar.gz) = 5252d85c2b519379f09310aa5eaffb6e2fed565b
 SHA1 (egcs/egcs-20000724.tar.gz) = 6a9f5a023c8315a9a37bc7ef1ccc68b609823d08
+SHA1 (egcs/egcs-20000731.tar.gz) = 1228fc34abcabbcf73e0e4b34e0ccb5eb28a8f9e
diff --git a/lang/egcs/snapshot/patches/patch-g++-parser b/lang/egcs/snapshot/patches/patch-g++-parser
deleted file mode 100644
index 328ec781891..00000000000
--- a/lang/egcs/snapshot/patches/patch-g++-parser
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/cp/parse.y.orig	Wed Jul 26 13:42:33 2000
-+++ gcc/cp/parse.y	Wed Jul 26 13:42:45 2000
-@@ -935,7 +935,7 @@ member_init:
- 		{ $$ = expand_member_init (current_class_ref, $1,
- 					   void_type_node); }
-         | error
--                { $$ = NULL_TREE }
-+                { $$ = NULL_TREE; }
- 	;
- 
- identifier:
diff --git a/lang/egcs/snapshot/pkg/PLIST b/lang/egcs/snapshot/pkg/PLIST
index 7cadd60f209..87565a34ecc 100644
--- a/lang/egcs/snapshot/pkg/PLIST
+++ b/lang/egcs/snapshot/pkg/PLIST
@@ -12,10 +12,10 @@ bin/@GCCARCH@-gcc
 @comment lib/gcc-lib/@GCCARCH@/@VERSION@/SYSCALLS.c.X
 lib/gcc-lib/@GCCARCH@/@VERSION@/cc1
 lib/gcc-lib/@GCCARCH@/@VERSION@/collect2
-lib/gcc-lib/@GCCARCH@/@VERSION@/cpp
+lib/gcc-lib/@GCCARCH@/@VERSION@/cpp0
 lib/gcc-lib/@GCCARCH@/@VERSION@/libgcc.a
 lib/gcc-lib/@GCCARCH@/@VERSION@/specs
-lib/gcc-lib/@GCCARCH@/@VERSION@/tradcpp
+lib/gcc-lib/@GCCARCH@/@VERSION@/tradcpp0
 lib/gcc-lib/@GCCARCH@/@VERSION@/include/syslimits.h
 lib/gcc-lib/@GCCARCH@/@VERSION@/include/limits.h
 lib/gcc-lib/@GCCARCH@/@VERSION@/include/float.h
diff --git a/lang/egcs/snapshot/pkg/PLIST-objc b/lang/egcs/snapshot/pkg/PLIST-objc
index 9f357b05192..e3ac88df35a 100644
--- a/lang/egcs/snapshot/pkg/PLIST-objc
+++ b/lang/egcs/snapshot/pkg/PLIST-objc
@@ -3,6 +3,7 @@
 @pkgdep @COREPKG@
 lib/gcc-lib/@GCCARCH@/@VERSION@/cc1obj
 lib/gcc-lib/@GCCARCH@/@VERSION@/libobjc.a
+lib/gcc-lib/@GCCARCH@/@VERSION@/libobjc.la
 lib/gcc-lib/@GCCARCH@/@VERSION@/include/objc/NXConstStr.h
 lib/gcc-lib/@GCCARCH@/@VERSION@/include/objc/Object.h
 lib/gcc-lib/@GCCARCH@/@VERSION@/include/objc/Protocol.h