3 files changed, 62 insertions, 23 deletions

diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 285783b4a3e7..d47e6a89a112 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -8,7 +8,6 @@
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${PATCHVERSION}
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
@@ -17,24 +16,27 @@ DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-g++-${GCCVERSION}${EXTRACT_SUFX}  \
 		${PORTNAME}-objc-${GCCVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-g77-${GCCVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-ada-${GCCVERSION}${EXTRACT_SUFX}
+		${PORTNAME}-ada-${GCCVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-java-${GCCVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-testsuite-${GCCVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
 # Special hack: I don't use SITE_SUBDIR & DIST_SUBDIR, and only pathces
 #               will be placed to subdirectory
 #               It allows to use main gcc sources from other ports.
 PATCHFILES=	mingw/${PORTNAME}-${GCCVERSION}-${PATCHVERSION:S/./-/}-src.diff.gz
-PATCH_DIST_STRIP=	-p1
+# Skip patching of bohem-gc, it is bug of patch's authors
+PATCH_DIST_STRIP=	-p1 -S + -S +
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF gcc-3.2 for Windows cross-development
+COMMENT=	FSF gcc-3.3 for Windows cross-development
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
-GCCVERSION=	3.2.3
-PATCHVERSION=	20030504.1
+GCCVERSION=	3.3.1
+PATCHVERSION=	20030804.1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 
@@ -43,21 +45,27 @@ USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
-		--enable-languages=c,c++,f77,objc \
+		--enable-languages=c,c++,f77,objc,java \
 		--with-gcc --with-gnu-ld --with-gnu-as \
 		--enable-threads --disable-nls \
 		--disable-win32-registry --disable-shared \
-		--enable-sjlj-exceptions
+		--enable-sjlj-exceptions --enable-libgcj \
+		--disable-java-awt --without-x \
+		--enable-java-gc=boehm --disable-libgcj-debug \
+		--enable-interpreter --enable-hash-synchronization \
+		--without-newlib
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 LIBTOOLFILES=	configure gcc/configure
+INFO=		fastjar
 MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}g77.1  \
-		cpp.1 gcov.1
+		cpp.1 gcov.1 ${PKGNAMEPREFIX}gcj.1 gcjh.1 gij.1 grepjar.1 jar.1 \
+		jcf-dump.1 jv-convert.1 jv-scan.1 rmic.1 rmiregistry.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCCVERSION}
 
-BINARIES=	gcc cpp g++ g77 gcov
+BINARIES=	gcc cpp g++ g77 gcov gcj gcjh jcf-dump jv-scan
 
 post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=\s*).+$$,\1libstdc++-v3 libf2c libobjc mingw,' ${WRKSRC}/Makefile
diff --git a/devel/mingw32-gcc/distinfo b/devel/mingw32-gcc/distinfo
index 01ecf690dd92..093ca336a736 100644
--- a/devel/mingw32-gcc/distinfo
+++ b/devel/mingw32-gcc/distinfo
@@ -1,6 +1,8 @@
-MD5 (gcc-core-3.2.3.tar.bz2) = 66664a84b383ba8d68612cd89b9478b2
-MD5 (gcc-g++-3.2.3.tar.bz2) = ebb7932d0dc526b10c222a22cc02f180
-MD5 (gcc-objc-3.2.3.tar.bz2) = eaca8b22d4ef2b42b84b877edbdf896b
-MD5 (gcc-g77-3.2.3.tar.bz2) = 8bea8cf9734995738552d90cf3f80b62
-MD5 (gcc-ada-3.2.3.tar.bz2) = 068008f530fc8892fd9075e00e580735
-MD5 (mingw/gcc-3.2.3-20030504-1-src.diff.gz) = 1fd22ca0c6d40d1d8ad76e850cf309f4
+MD5 (gcc-core-3.3.1.tar.bz2) = 8c113f495402c5ab8bf35133268de561
+MD5 (gcc-g++-3.3.1.tar.bz2) = 0e74dc443140e287f471cd1d607bb663
+MD5 (gcc-objc-3.3.1.tar.bz2) = 2cdba3dc089eb45674a91792c546e0bd
+MD5 (gcc-g77-3.3.1.tar.bz2) = 6a310c055eb69d7aa1bd42add128cecc
+MD5 (gcc-ada-3.3.1.tar.bz2) = b96cc88d9061fb695e1506863735a241
+MD5 (gcc-java-3.3.1.tar.bz2) = 32dbcc2715ea59137ec36a4035e4bad7
+MD5 (gcc-testsuite-3.3.1.tar.bz2) = 46f17d58a070104999b84e70610bc563
+MD5 (mingw/gcc-3.3.1-20030804-1-src.diff.gz) = 881d91809e79452b593d12b73130913f
diff --git a/devel/mingw32-gcc/pkg-plist b/devel/mingw32-gcc/pkg-plist
index 677a877d4f33..8cbc2af9ff98 100644
--- a/devel/mingw32-gcc/pkg-plist
+++ b/devel/mingw32-gcc/pkg-plist
@@ -3,7 +3,11 @@
 %%GCC_TARG%%/bin/g++
 %%GCC_TARG%%/bin/g77
 %%GCC_TARG%%/bin/gcc
+%%GCC_TARG%%/bin/gcj
+%%GCC_TARG%%/bin/gcjh
 %%GCC_TARG%%/bin/gcov
+%%GCC_TARG%%/bin/jcf-dump
+%%GCC_TARG%%/bin/jv-scan
 %%GCC_TARG%%/lib/libfrtbegin.a
 %%GCC_TARG%%/lib/libg2c.a
 %%GCC_TARG%%/lib/libg2c.la
@@ -18,15 +22,21 @@ bin/%%GCC_TARG%%-cpp
 bin/%%GCC_TARG%%-g++
 bin/%%GCC_TARG%%-g77
 bin/%%GCC_TARG%%-gcc
+bin/%%GCC_TARG%%-gcc-%%GCC_REV%%
 bin/%%GCC_TARG%%-gccbug
+bin/%%GCC_TARG%%-gcj
+bin/%%GCC_TARG%%-gcjh
 bin/%%GCC_TARG%%-gcov
+bin/%%GCC_TARG%%-jcf-dump
+bin/%%GCC_TARG%%-jv-scan
+bin/grepjar
+bin/jar
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/atomicity.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/basic_file.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++config.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++io.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/c++locale.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/codecvt_specializations.h
-include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/cpu_limits.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_base.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_inline.h
 include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits/ctype_noninline.h
@@ -71,7 +81,6 @@ include/c++/%%GCC_REV%%/backward/stack.h
 include/c++/%%GCC_REV%%/backward/stream.h
 include/c++/%%GCC_REV%%/backward/streambuf.h
 include/c++/%%GCC_REV%%/backward/strstream
-include/c++/%%GCC_REV%%/backward/strstream.h
 include/c++/%%GCC_REV%%/backward/tempbuf.h
 include/c++/%%GCC_REV%%/backward/tree.h
 include/c++/%%GCC_REV%%/backward/vector.h
@@ -85,22 +94,23 @@ include/c++/%%GCC_REV%%/bits/cmath.tcc
 include/c++/%%GCC_REV%%/bits/codecvt.h
 include/c++/%%GCC_REV%%/bits/concept_check.h
 include/c++/%%GCC_REV%%/bits/cpp_type_traits.h
+include/c++/%%GCC_REV%%/bits/deque.tcc
 include/c++/%%GCC_REV%%/bits/fpos.h
 include/c++/%%GCC_REV%%/bits/fstream.tcc
 include/c++/%%GCC_REV%%/bits/functexcept.h
-include/c++/%%GCC_REV%%/bits/generic_shadow.h
 include/c++/%%GCC_REV%%/bits/gslice.h
 include/c++/%%GCC_REV%%/bits/gslice_array.h
 include/c++/%%GCC_REV%%/bits/indirect_array.h
 include/c++/%%GCC_REV%%/bits/ios_base.h
 include/c++/%%GCC_REV%%/bits/istream.tcc
+include/c++/%%GCC_REV%%/bits/list.tcc
+include/c++/%%GCC_REV%%/bits/locale_classes.h
 include/c++/%%GCC_REV%%/bits/locale_facets.h
 include/c++/%%GCC_REV%%/bits/locale_facets.tcc
 include/c++/%%GCC_REV%%/bits/localefwd.h
 include/c++/%%GCC_REV%%/bits/mask_array.h
 include/c++/%%GCC_REV%%/bits/ostream.tcc
 include/c++/%%GCC_REV%%/bits/pthread_allocimpl.h
-include/c++/%%GCC_REV%%/bits/slice.h
 include/c++/%%GCC_REV%%/bits/slice_array.h
 include/c++/%%GCC_REV%%/bits/sstream.tcc
 include/c++/%%GCC_REV%%/bits/stl_algo.h
@@ -139,6 +149,7 @@ include/c++/%%GCC_REV%%/bits/type_traits.h
 include/c++/%%GCC_REV%%/bits/valarray_array.h
 include/c++/%%GCC_REV%%/bits/valarray_array.tcc
 include/c++/%%GCC_REV%%/bits/valarray_meta.h
+include/c++/%%GCC_REV%%/bits/vector.tcc
 include/c++/%%GCC_REV%%/bitset
 include/c++/%%GCC_REV%%/cassert
 include/c++/%%GCC_REV%%/cctype
@@ -209,7 +220,6 @@ include/c++/%%GCC_REV%%/vector
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1obj
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1plus
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cpp0
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/crtbegin.o
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/crtend.o
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/f771
@@ -234,11 +244,28 @@ lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stdarg.h
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stdbool.h
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stddef.h
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/syslimits.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/unwind.h
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/varargs.h
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/xmmintrin.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/fixinc.sh
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/gsyslimits.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/float.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/iso646.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/limits.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/mmintrin.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/README
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdarg.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdbool.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stddef.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/unwind.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/varargs.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/xmmintrin.h
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders.conf
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/jc1
+lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/jvgenmain
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/specs
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/tradcpp0
 @dirrm include/c++/%%GCC_REV%%/%%GCC_TARG%%/bits
 @dirrm include/c++/%%GCC_REV%%/%%GCC_TARG%%
 @dirrm include/c++/%%GCC_REV%%/backward
@@ -247,7 +274,9 @@ lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/tradcpp0
 @dirrm include/c++/%%GCC_REV%%
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include
+@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include
+@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/install-tools
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%
 @dirrm lib/gcc-lib/%%GCC_TARG%%
 @unexec rmdir %D/include/c++ 2> /dev/null || true
-@unexec rmdir %D/lib/gcc-lib 2> /dev/null || true
\ No newline at end of file
+@unexec rmdir %D/lib/gcc-lib 2> /dev/null || true