3 files changed, 28 insertions, 36 deletions

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 3558b9152b09..9750628a657d 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -6,35 +6,20 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
+PORTVERSION=	${BINUTILVERSION}
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	mingw
-#MASTER_SITE_SUBDIR=	binutils/releases
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	binutils/snapshots
 PKGNAMEPREFIX=	mingw32-
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src
-#DISTNAME=	${PORTNAME}-${BINUTILVERSION}
-DIST_SUBDIR=	mingw
-
-# No patches 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 binutils sources from other ports.
-#PATCHFILES=	mingw/${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src.diff
+DISTNAME=	${PORTNAME}-${BINUTILVERSION}
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF binutils-2.16 for Windows cross-development
-
-BINUTILVERSION=	2.16
-PATCHVERSION=	91.20060119.1
+COMMENT=	FSF binutils-2.17 for Windows cross-development
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-PATCH_DIST_STRIP=	-p1
+BINUTILVERSION=	2.17.50
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
@@ -43,22 +28,23 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--disable-shared
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
-MAN1=	${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1    \
-	${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}dlltool.1      \
-	${PKGNAMEPREFIX}c++filt.1 ${PKGNAMEPREFIX}ld.1      \
-	${PKGNAMEPREFIX}nlmconv.1 ${PKGNAMEPREFIX}nm.1      \
-	${PKGNAMEPREFIX}objcopy.1 ${PKGNAMEPREFIX}objdump.1 \
-	${PKGNAMEPREFIX}ranlib.1 ${PKGNAMEPREFIX}readelf.1  \
-	${PKGNAMEPREFIX}size.1 ${PKGNAMEPREFIX}strings.1    \
-	${PKGNAMEPREFIX}strip.1 ${PKGNAMEPREFIX}windres.1
+MAN1=	${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1   \
+	${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}dlltool.1     \
+	${PKGNAMEPREFIX}c++filt.1 ${PKGNAMEPREFIX}gprof.1  \
+	${PKGNAMEPREFIX}ld.1 ${PKGNAMEPREFIX}nlmconv.1     \
+	${PKGNAMEPREFIX}nm.1 ${PKGNAMEPREFIX}objcopy.1     \
+	${PKGNAMEPREFIX}objdump.1 ${PKGNAMEPREFIX}ranlib.1 \
+	${PKGNAMEPREFIX}readelf.1 ${PKGNAMEPREFIX}size.1   \
+	${PKGNAMEPREFIX}strings.1 ${PKGNAMEPREFIX}strip.1  \
+	${PKGNAMEPREFIX}windmc.1 ${PKGNAMEPREFIX}windres.1
 
-INFO=		as bfd binutils ld configure standards
+INFO=		as bfd binutils ld configure gprof standards
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
 PLIST_SUB+=	BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//}
 
-BINARIES=	addr2line ar as c++filt ld nm objcopy objdump ranlib \
-		readelf size strings strip dlltool dllwrap windres
+BINARIES=	addr2line ar as c++filt gprof ld nm objcopy objdump ranlib \
+		readelf size strings strip dlltool dllwrap windmc windres
 
 pre-configure:
 	${CHMOD} 755 ${WRKSRC}/configure
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index 01788942e3bd..6d265446981a 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1,3 +1,3 @@
-MD5 (mingw/binutils-2.16.91-20060119-1-src.tar.gz) = 42e3a665111121075480244cafc27ce7
-SHA256 (mingw/binutils-2.16.91-20060119-1-src.tar.gz) = d3cd48bd7bd99b83f90c4caaaf23fa94316e7d8ea91199dd3294e50e3ebbe6d5
-SIZE (mingw/binutils-2.16.91-20060119-1-src.tar.gz) = 16214443
+MD5 (binutils-2.17.50.tar.bz2) = 7a6d647a0b6aac9bfa5ae7769423a235
+SHA256 (binutils-2.17.50.tar.bz2) = 2541a51dd66b3f2a3e5e5c7f6325ed62be78d67796bb05e464a4ea188902a9f6
+SIZE (binutils-2.17.50.tar.bz2) = 15448915
diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist
index 04ddebd60258..2d14d6861d16 100644
--- a/devel/mingw32-binutils/pkg-plist
+++ b/devel/mingw32-binutils/pkg-plist
@@ -5,6 +5,7 @@
 %%BINUTILS_TARG%%/bin/c++filt
 %%BINUTILS_TARG%%/bin/dlltool
 %%BINUTILS_TARG%%/bin/dllwrap
+%%BINUTILS_TARG%%/bin/gprof
 %%BINUTILS_TARG%%/bin/ld
 %%BINUTILS_TARG%%/bin/nm
 %%BINUTILS_TARG%%/bin/objcopy
@@ -14,6 +15,7 @@
 %%BINUTILS_TARG%%/bin/strip
 %%BINUTILS_TARG%%/bin/size
 %%BINUTILS_TARG%%/bin/strings
+%%BINUTILS_TARG%%/bin/windmc
 %%BINUTILS_TARG%%/bin/windres
 %%BINUTILS_TARG%%/lib/ldscripts/i386pe.x
 %%BINUTILS_TARG%%/lib/ldscripts/i386pe.xbn
@@ -26,6 +28,7 @@ bin/%%BINUTILS_TARG%%-as
 bin/%%BINUTILS_TARG%%-c++filt
 bin/%%BINUTILS_TARG%%-dlltool
 bin/%%BINUTILS_TARG%%-dllwrap
+bin/%%BINUTILS_TARG%%-gprof
 bin/%%BINUTILS_TARG%%-ld
 bin/%%BINUTILS_TARG%%-nm
 bin/%%BINUTILS_TARG%%-objcopy
@@ -35,7 +38,10 @@ bin/%%BINUTILS_TARG%%-readelf
 bin/%%BINUTILS_TARG%%-strip
 bin/%%BINUTILS_TARG%%-size
 bin/%%BINUTILS_TARG%%-strings
+bin/%%BINUTILS_TARG%%-windmc
 bin/%%BINUTILS_TARG%%-windres
 @dirrm %%BINUTILS_TARG%%/bin
 @dirrm %%BINUTILS_TARG%%/lib/ldscripts
 @dirrm %%BINUTILS_TARG%%/lib
+@dirrmtry %%BINUTILS_TARG%%
+