3 files changed, 13 insertions, 39 deletions

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 410ca538a04d..7c9adcfb2e63 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -7,39 +7,32 @@
 
 PORTNAME=	binutils
 PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	mingw
-# Wait for release, which will be based on orognal sources
-#MASTER_SITE_SUBDIR=	binutils/releases
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=	mingw32-
-# Wait for release, which will be based on orignal sources
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION:S/./-/}-src
-#DISTNAME=	${PORTNAME}-${BINUTILVERSION}
+DISTNAME=	${PORTNAME}-${BINUTILVERSION}
 
-# Wait for release, which will be based on orognal sources
-#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/./-/}.diff.gz
-#PATCH_DIST_STRIP=	-p1
+PATCHFILES=	mingw/${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF binutils-2.13 for Windows cross-development
+COMMENT=	FSF binutils-2.14 for Windows cross-development
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
 
-BINUTILVERSION=	2.13.90
-PATCHVERSION=	20030111.1
+BINUTILVERSION=	2.14
+PATCHVERSION=	90.20030807.1
 
-#WRKSRC=		${WRKDIR}/${PORTNAME}-${BINUTILVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${BINUTILVERSION}
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index ed727b4c4d65..c460e7c9f741 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1 +1,2 @@
-MD5 (binutils-2.13.90-20030111-1-src.tar.gz) = c6f7bcafc853a14d06b9ca7659b9d3b6
+MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a
+MD5 (mingw/binutils-2.14.90-20030807-1-src.diff.gz) = 1e7a7868b78e755bdc678bc12e62e461
diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist
index d3b876b5c8e6..ad0078f070f4 100644
--- a/devel/mingw32-binutils/pkg-plist
+++ b/devel/mingw32-binutils/pkg-plist
@@ -55,33 +55,13 @@ bin/%%BINUTILS_TARG%%-windres
 %%BINUTILS_TARG%%/info/bfd.info-8
 %%BINUTILS_TARG%%/info/bfd.info-9
 %%BINUTILS_TARG%%/info/binutils.info
-%%BINUTILS_TARG%%/info/binutils.info-1
-%%BINUTILS_TARG%%/info/binutils.info-2
-%%BINUTILS_TARG%%/info/binutils.info-3
 %%BINUTILS_TARG%%/info/standards.info
 %%BINUTILS_TARG%%/info/configure.info
 %%BINUTILS_TARG%%/info/configure.info-1
 %%BINUTILS_TARG%%/info/configure.info-2
 %%BINUTILS_TARG%%/info/configure.info-3
 %%BINUTILS_TARG%%/info/as.info
-%%BINUTILS_TARG%%/info/as.info-1
-%%BINUTILS_TARG%%/info/as.info-2
-%%BINUTILS_TARG%%/info/as.info-3
-%%BINUTILS_TARG%%/info/as.info-4
-%%BINUTILS_TARG%%/info/as.info-5
-%%BINUTILS_TARG%%/info/as.info-6
-%%BINUTILS_TARG%%/info/as.info-7
-%%BINUTILS_TARG%%/info/as.info-8
-%%BINUTILS_TARG%%/info/as.info-9
-%%BINUTILS_TARG%%/info/as.info-10
-%%BINUTILS_TARG%%/info/as.info-11
 %%BINUTILS_TARG%%/info/ld.info
-%%BINUTILS_TARG%%/info/ld.info-1
-%%BINUTILS_TARG%%/info/ld.info-2
-%%BINUTILS_TARG%%/info/ld.info-3
-%%BINUTILS_TARG%%/info/ld.info-4
-%%BINUTILS_TARG%%/info/ld.info-5
-%%BINUTILS_TARG%%/info/ld.info-6
 @exec   install-info          %D/%%BINUTILS_TARG%%/info/bfd.info %D/%%BINUTILS_TARG%%/info/dir
 @exec   install-info          %D/%%BINUTILS_TARG%%/info/binutils.info %D/%%BINUTILS_TARG%%/info/dir
 @exec   install-info          %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir