3 files changed, 20 insertions, 21 deletions

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index a54d12d220e4..69473f4ebfe9 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -8,19 +8,23 @@
 PORTNAME=	binutils
 PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}  	# ${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	mingw			# binutils/releases
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}  	# ${MASTER_SITE_SOURCEWARE}
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+#MASTER_SITE_SUBDIR=	mingw			# binutils/releases
+MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=	mingw32-
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src
-DIST_SUBDIR=	mingw
+#DISTNAME=	${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src
+DISTNAME=	${PORTNAME}-${BINUTILVERSION}
+#DIST_SUBDIR=	mingw
 
 # No patches for this release
-#PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
+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
+PATCHFILES=	mingw/${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src.diff.gz
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	FSF binutils-2.14 for Windows cross-development
@@ -29,8 +33,9 @@ BINUTILVERSION=	2.15
 PATCHVERSION=	90.20040222.1
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+PATCH_DIST_STRIP=	-p1
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
@@ -56,6 +61,9 @@ PLIST_SUB+=	BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//}
 BINARIES=	addr2line ar as c++filt ld nm objcopy objdump ranlib \
 		readelf size strings strip dlltool dllwrap windres
 
+pre-configure:
+	${CHMOD} 755 ${WRKSRC}/configure
+
 post-install:
 # Register these too
 	install-info ${PREFIX}/${INFO_PATH}/configure.info ${PREFIX}/${INFO_PATH}/dir
@@ -65,9 +73,9 @@ post-install:
 	${ECHO} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
 	${ECHO} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
 .for F in ${BINARIES}
-	@${STRIP_CMD} ${PREFIX}/bin/${PKGNAMEPREFIX}$F
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
 
 .include <bsd.port.mk>
+
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index 18896922f307..7999188818f8 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1,2 +1,4 @@
-MD5 (mingw/binutils-2.15.90-20040222-1-src.tar.gz) = 2cc7e5ade6915364130a3da8ece1570e
-SIZE (mingw/binutils-2.15.90-20040222-1-src.tar.gz) = 14182109
+MD5 (binutils-2.15.tar.bz2) = 624e6b74983ac6b2960edaf2d522ca58
+SIZE (binutils-2.15.tar.bz2) = 11515075
+MD5 (mingw/binutils-2.15.90-20040222-1-src.diff.gz) = 086ab2aa32be47e159e7ccdddd463b0b
+SIZE (mingw/binutils-2.15.90-20040222-1-src.diff.gz) = 2009
diff --git a/devel/mingw32-binutils/files/patch-gas::doc::Makefile.in b/devel/mingw32-binutils/files/patch-gas::doc::Makefile.in
deleted file mode 100644
index a29b81ae229e..000000000000
--- a/devel/mingw32-binutils/files/patch-gas::doc::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gas/doc/Makefile.in.orig	Wed Mar  3 17:53:16 2004
-+++ gas/doc/Makefile.in	Wed Mar  3 17:53:32 2004
-@@ -521,7 +521,7 @@
- 
- # We want install to imply install-info as per GNU standards, despite the
- # cygnus option.
--install: install-info
-+install: install-info install-man
- install-info: install-info-am
- 
- # Maintenance