6 files changed, 47 insertions, 43 deletions

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index ef521b900fa8..d8b9860598e4 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -9,26 +9,28 @@ PORTNAME=	binutils
 PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	binutils/releases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}  	# ${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	mingw			# binutils/releases
 PKGNAMEPREFIX=	mingw32-
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}
+DISTNAME=	${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src
+DIST_SUBDIR=	mingw
 
-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
+# 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
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	FSF binutils-2.14 for Windows cross-development
 
-BINUTILVERSION=	2.14
-PATCHVERSION=	90.20040120.1
+BINUTILVERSION=	2.15
+PATCHVERSION=	90.20040222.1
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${BINUTILVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index 0fd851380b2b..18896922f307 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1,4 +1,2 @@
-MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a
-SIZE (binutils-2.14.tar.bz2) = 10921504
-MD5 (mingw/binutils-2.14.90-20040120-1-src.diff) = 83960a0ee3edf54f12238a477f86f897
-SIZE (mingw/binutils-2.14.90-20040120-1-src.diff) = 2014
+MD5 (mingw/binutils-2.15.90-20040222-1-src.tar.gz) = 2cc7e5ade6915364130a3da8ece1570e
+SIZE (mingw/binutils-2.15.90-20040222-1-src.tar.gz) = 14182109
diff --git a/devel/mingw32-binutils/files/patch-Makefile.in b/devel/mingw32-binutils/files/patch-Makefile.in
index 45418efa052b..0f8af91685fd 100644
--- a/devel/mingw32-binutils/files/patch-Makefile.in
+++ b/devel/mingw32-binutils/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Wed Oct 15 16:22:59 2003
-+++ Makefile.in	Wed Oct 15 16:23:32 2003
-@@ -3542,10 +3542,10 @@
- .PHONY: install-libiberty maybe-install-libiberty
+--- Makefile.in.orig	Sat Feb 21 09:18:59 2004
++++ Makefile.in	Wed Mar  3 17:15:18 2004
+@@ -20093,10 +20093,10 @@
  maybe-install-libiberty:
+ 
  install-libiberty: installdirs
--	@r=`${PWD}`; export r; \
--	s=`cd $(srcdir); ${PWD}`; export s; \
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 -	$(SET_LIB_PATH) \
 -	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
-+#	@r=`${PWD}`; export r; \
-+#	s=`cd $(srcdir); ${PWD}`; export s; \
++#	@r=`${PWD_COMMAND}`; export r; \
++#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +#	$(SET_LIB_PATH) \
 +#	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
  
diff --git a/devel/mingw32-binutils/files/patch-configure b/devel/mingw32-binutils/files/patch-configure
index 99d65d41d32c..2e8ed41c187a 100644
--- a/devel/mingw32-binutils/files/patch-configure
+++ b/devel/mingw32-binutils/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Dec 23 09:17:24 2002
-+++ configure	Mon Dec 23 09:17:42 2002
-@@ -848,7 +848,7 @@
+--- configure.orig	Wed Mar  3 17:17:27 2004
++++ configure	Wed Mar  3 17:17:50 2004
+@@ -2070,7 +2070,7 @@
  # Generate a default definition for YACC.  This is used if the makefile can't
  # locate bison or byacc in objdir.
  
diff --git a/devel/mingw32-binutils/files/patch-gas::doc::Makefile.in b/devel/mingw32-binutils/files/patch-gas::doc::Makefile.in
new file mode 100644
index 000000000000..a29b81ae229e
--- /dev/null
+++ b/devel/mingw32-binutils/files/patch-gas::doc::Makefile.in
@@ -0,0 +1,11 @@
+--- 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
diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist
index 9fa97f1028e7..8cbe42e28a78 100644
--- a/devel/mingw32-binutils/pkg-plist
+++ b/devel/mingw32-binutils/pkg-plist
@@ -36,37 +36,30 @@ bin/%%BINUTILS_TARG%%-strip
 bin/%%BINUTILS_TARG%%-size
 bin/%%BINUTILS_TARG%%-strings
 bin/%%BINUTILS_TARG%%-windres
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/as.info %D/%%BINUTILS_TARG%%/info/dir
 @unexec install-info --delete %D/%%BINUTILS_TARG%%/info/bfd.info %D/%%BINUTILS_TARG%%/info/dir
 @unexec install-info --delete %D/%%BINUTILS_TARG%%/info/binutils.info %D/%%BINUTILS_TARG%%/info/dir
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir 2> /dev/null
 @unexec install-info --delete %D/%%BINUTILS_TARG%%/info/configure.info %D/%%BINUTILS_TARG%%/info/dir 2> /dev/null
-@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/as.info %D/%%BINUTILS_TARG%%/info/dir
 @unexec install-info --delete %D/%%BINUTILS_TARG%%/info/ld.info %D/%%BINUTILS_TARG%%/info/dir
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir 2> /dev/null
 @unexec rm -f %D/%%BINUTILS_TARG%%/info/dir
+%%BINUTILS_TARG%%/info/as.info
+%%BINUTILS_TARG%%/info/as.info-1
 %%BINUTILS_TARG%%/info/bfd.info
 %%BINUTILS_TARG%%/info/bfd.info-1
-%%BINUTILS_TARG%%/info/bfd.info-2
-%%BINUTILS_TARG%%/info/bfd.info-3
-%%BINUTILS_TARG%%/info/bfd.info-4
-%%BINUTILS_TARG%%/info/bfd.info-5
-%%BINUTILS_TARG%%/info/bfd.info-6
-%%BINUTILS_TARG%%/info/bfd.info-7
-%%BINUTILS_TARG%%/info/bfd.info-8
-%%BINUTILS_TARG%%/info/bfd.info-9
 %%BINUTILS_TARG%%/info/binutils.info
-%%BINUTILS_TARG%%/info/standards.info
+%%BINUTILS_TARG%%/info/binutils.info-1
 %%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/ld.info
+%%BINUTILS_TARG%%/info/ld.info-1
+%%BINUTILS_TARG%%/info/standards.info
+@exec   install-info          %D/%%BINUTILS_TARG%%/info/as.info %D/info/dir
 @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
 @exec   install-info          %D/%%BINUTILS_TARG%%/info/configure.info %D/%%BINUTILS_TARG%%/info/dir
-@exec   install-info          %D/%%BINUTILS_TARG%%/info/as.info %D/info/dir
 @exec   install-info          %D/%%BINUTILS_TARG%%/info/ld.info %D/%%BINUTILS_TARG%%/info/dir
+@exec   install-info          %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir
 @dirrm %%BINUTILS_TARG%%/bin
 @dirrm %%BINUTILS_TARG%%/lib/ldscripts
 @dirrm %%BINUTILS_TARG%%/lib