4 files changed, 48 insertions, 44 deletions

diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 50e0d0afa523..4aec9259ce1c 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -9,24 +9,33 @@ PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${PATCHVERSION}
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	mingw
+#MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
 PKGNAMEPREFIX=	mingw32-
-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}-java-${GCCVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-testsuite-${GCCVERSION}${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}-core-${GCCVERSION}-${PATCHVERSION:S/./-/g}-src${EXTRACT_SUFX} \
+		${PORTNAME}-g++-${GCCVERSION}-${PATCHVERSION:S/./-/g}-src${EXTRACT_SUFX} \
+		${PORTNAME}-objc-${GCCVERSION}-${PATCHVERSION:S/./-/g}-src${EXTRACT_SUFX} \
+		${PORTNAME}-g77-${GCCVERSION}-${PATCHVERSION:S/./-/g}-src${EXTRACT_SUFX} \
+		${PORTNAME}-ada-${GCCVERSION}-${PATCHVERSION:S/./-/g}-src${EXTRACT_SUFX} \
+		${PORTNAME}-java-${GCCVERSION}-${PATCHVERSION:S/./-/g}-src${EXTRACT_SUFX}
+#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}-java-${GCCVERSION}${EXTRACT_SUFX} \
+#		${PORTNAME}-testsuite-${GCCVERSION}${EXTRACT_SUFX}
 
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
+# No pathes for this release
+#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
+#PATCHFILES=	mingw/${PORTNAME}-${GCCVERSION}-${PATCHVERSION:S/./-/}-src.diff.gz
 # Skip patching of bohem-gc, it is bug of patch's authors
-PATCH_DIST_STRIP=	-p1
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	FSF gcc-3.4 for Windows cross-development
@@ -35,12 +44,12 @@ 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.4.2
-PATCHVERSION=	20040916.1
+GCCVERSION=	3.4.5
+PATCHVERSION=	20060117.1
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}-${PATCHVERSION:S/./-/g}
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/mingw32-gcc/distinfo b/devel/mingw32-gcc/distinfo
index e8fcf2e52f33..9307e3c732a9 100644
--- a/devel/mingw32-gcc/distinfo
+++ b/devel/mingw32-gcc/distinfo
@@ -1,24 +1,18 @@
-MD5 (gcc-core-3.4.2.tar.bz2) = cb1613efd03f4ed9969f076c012b9fee
-SHA256 (gcc-core-3.4.2.tar.bz2) = 254dba1cf126db6c4e69dbb8305b0db80aba151f5fdd05b61be88aff3088f2d2
-SIZE (gcc-core-3.4.2.tar.bz2) = 12938168
-MD5 (gcc-g++-3.4.2.tar.bz2) = 247e312c5f4d8baa7fdfc16597ec2b4b
-SHA256 (gcc-g++-3.4.2.tar.bz2) = ccd30a0a9cf8530940663e799d51a243c60059a57142727920503eaaab9c3090
-SIZE (gcc-g++-3.4.2.tar.bz2) = 2469082
-MD5 (gcc-objc-3.4.2.tar.bz2) = 65c112b8464a034d9f14a3ebf2966feb
-SHA256 (gcc-objc-3.4.2.tar.bz2) = 4adf22d2e5cfeaf3c22992928edea42131dfc8e5c9eedaf1285740333019a53a
-SIZE (gcc-objc-3.4.2.tar.bz2) = 212296
-MD5 (gcc-g77-3.4.2.tar.bz2) = ed3113df2913fd700bb5daa5ff0a41ce
-SHA256 (gcc-g77-3.4.2.tar.bz2) = 39744ba3202c9f4b1a883fba3042e1a3dbf23f26a0a52fc87fb0a361373fa3ad
-SIZE (gcc-g77-3.4.2.tar.bz2) = 902942
-MD5 (gcc-ada-3.4.2.tar.bz2) = 4da6cf1e7bb20ed6f0f1c860b31a1a54
-SHA256 (gcc-ada-3.4.2.tar.bz2) = 6d80192b8baadb4d8d49bb250f3332e44c2d4c22d22d284a8cf4a684bff2ee85
-SIZE (gcc-ada-3.4.2.tar.bz2) = 3461568
-MD5 (gcc-java-3.4.2.tar.bz2) = 112154d75173785cb983e88aa9ad4c73
-SHA256 (gcc-java-3.4.2.tar.bz2) = 68ef2eb62333a6d0e3b837a9d48b3c13a46ff7e06f0e3ce5cf4fcbdd0f6b3fff
-SIZE (gcc-java-3.4.2.tar.bz2) = 4701325
-MD5 (gcc-testsuite-3.4.2.tar.bz2) = 70046557dd99761709dd0613ace12329
-SHA256 (gcc-testsuite-3.4.2.tar.bz2) = d53f46300032b7f3bdf06ae812a02dac878210d3e963b14c2e36f31495bcdfb2
-SIZE (gcc-testsuite-3.4.2.tar.bz2) = 2615124
-MD5 (mingw/gcc-3.4.2-20040916-1-src.diff.gz) = b0a587fc228f5d980eb8ef36692045b7
-SHA256 (mingw/gcc-3.4.2-20040916-1-src.diff.gz) = 7f87a42069d6a2a27eb15d6fd41a5d524fceda9b3a088e9eab5e3a7e7dc41922
-SIZE (mingw/gcc-3.4.2-20040916-1-src.diff.gz) = 104532
+MD5 (gcc-core-3.4.5-20060117-1-src.tar.gz) = b72bffc6e7d5c7d1de099ad76ef0d45d
+SHA256 (gcc-core-3.4.5-20060117-1-src.tar.gz) = 938aa1010b04e362dfade5ac13fc24142ee60d4e7b153d5fa9ee5c2a48e854d8
+SIZE (gcc-core-3.4.5-20060117-1-src.tar.gz) = 17693587
+MD5 (gcc-g++-3.4.5-20060117-1-src.tar.gz) = 42c92b923adfe4c8943f05c326af1736
+SHA256 (gcc-g++-3.4.5-20060117-1-src.tar.gz) = 36e055325ae05f059ad414fde24bd53b01b8633e9e415135a6dd5316b2e2ebff
+SIZE (gcc-g++-3.4.5-20060117-1-src.tar.gz) = 3946638
+MD5 (gcc-objc-3.4.5-20060117-1-src.tar.gz) = d22f92c5c4ffe9b1d2e0244be95db3ba
+SHA256 (gcc-objc-3.4.5-20060117-1-src.tar.gz) = 3294981b22d896f288a83f2b4ec662357884e44e8143477fba724c4a8eb25aa4
+SIZE (gcc-objc-3.4.5-20060117-1-src.tar.gz) = 266441
+MD5 (gcc-g77-3.4.5-20060117-1-src.tar.gz) = 37e2558839f70ff2dd8c16c359e5e327
+SHA256 (gcc-g77-3.4.5-20060117-1-src.tar.gz) = e4cd33a78b0043188a8f799023c67eb9d7aa2dfb0c899bdee0b2b5e3711385e2
+SIZE (gcc-g77-3.4.5-20060117-1-src.tar.gz) = 1221984
+MD5 (gcc-ada-3.4.5-20060117-1-src.tar.gz) = 2ce267e4c7cefe6062c4f46df260667f
+SHA256 (gcc-ada-3.4.5-20060117-1-src.tar.gz) = 87ed83d353275e0d7633b9d6c9e45a2e8415ac164142bd9d16308f19b46ea687
+SIZE (gcc-ada-3.4.5-20060117-1-src.tar.gz) = 5020333
+MD5 (gcc-java-3.4.5-20060117-1-src.tar.gz) = 30e9d5984ca587f378d343eb455f1ce9
+SHA256 (gcc-java-3.4.5-20060117-1-src.tar.gz) = 190b0d64153befc2a2db8b75c058faa221a32b8395547e22d70d359ac12b7521
+SIZE (gcc-java-3.4.5-20060117-1-src.tar.gz) = 6303267
diff --git a/devel/mingw32-gcc/files/patch-Makefile.in b/devel/mingw32-gcc/files/patch-Makefile.in
index 50858b478ff7..1c956868f19e 100644
--- a/devel/mingw32-gcc/files/patch-Makefile.in
+++ b/devel/mingw32-gcc/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Aug  3 17:11:14 2004
-+++ Makefile.in	Tue Aug  3 17:11:33 2004
-@@ -19885,10 +19885,10 @@
+--- Makefile.in.orig	Mon Dec  4 15:02:51 2006
++++ Makefile.in	Mon Dec  4 15:03:06 2006
+@@ -19886,10 +19886,10 @@
  maybe-install-libiberty:
  
  install-libiberty: installdirs
diff --git a/devel/mingw32-gcc/pkg-plist b/devel/mingw32-gcc/pkg-plist
index 2ed48f8f6198..0acceb71107d 100644
--- a/devel/mingw32-gcc/pkg-plist
+++ b/devel/mingw32-gcc/pkg-plist
@@ -211,7 +211,6 @@ bin/%%GCC_TARG%%-jar
 %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/algorithm
 %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/bitmap_allocator.h
 %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/debug_allocator.h
-%%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/demangle.h
 %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/enc_filebuf.h
 %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/functional
 %%GCC_TARG%%/include/c++/%%GCC_REV%%/ext/hash_fun.h
@@ -2175,6 +2174,7 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/gcj/libgcj-config.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/iso646.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/libffi/ffitarget.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/mm_malloc.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/mmintrin.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/objc/encoding.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/objc/hash.h
@@ -2201,6 +2201,7 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/emmintrin.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/float.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/iso646.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/mm_malloc.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/mmintrin.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/pmmintrin.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/README