Update to latest snapshot.

 Unbreak with some ugly hack.

4 files changed, 41 insertions, 39 deletions

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 2e569a48c0a..b18cb263a92 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -8,36 +8,33 @@
 PORTNAME=	binutils
 PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}  	# ${MASTER_SITE_SOURCEWARE}
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-#MASTER_SITE_SUBDIR=	mingw			# binutils/releases
-MASTER_SITE_SUBDIR=	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
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}
+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.gz
+#PATCHFILES=	mingw/${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION:S/./-/g}-src.diff
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF binutils-2.14 for Windows cross-development
-
-BROKEN=		Incomplete pkg-plist
+COMMENT=	FSF binutils-2.15 for Windows cross-development
 
 BINUTILVERSION=	2.15
-PATCHVERSION=	90.20040222.1
+PATCHVERSION=	94.20050118.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/-$//} \
@@ -67,17 +64,22 @@ pre-configure:
 	${CHMOD} 755 ${WRKSRC}/configure
 
 post-install:
-# Register these too
-	install-info ${PREFIX}/${INFO_PATH}/configure.info ${PREFIX}/${INFO_PATH}/dir
-	install-info ${PREFIX}/${INFO_PATH}/standards.info ${PREFIX}/${INFO_PATH}/dir
-# Add this after all quto-generated info etries
-	${ECHO} "@unexec rm %D/${PKGNAMEPREFIX:S/-$//}/info/dir" >> ${TMPPLIST}
-	${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}
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
 
+#
+# UGLY HACK
+#
+add-plist-post:
+	@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
+.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
+.else
+	@${DO_NADA}
+.endif
+
 .include <bsd.port.mk>
 
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index 7999188818f..5bba4e95776 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1,4 +1,2 @@
-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
+MD5 (binutils-2.15.94-20050118-1-src.tar.gz) = 89adb382ac9a99953636d2986c85dd2a
+SIZE (binutils-2.15.94-20050118-1-src.tar.gz) = 15269504
diff --git a/devel/mingw32-binutils/files/patch-Makefile.in b/devel/mingw32-binutils/files/patch-Makefile.in
index 0f8af91685f..52792cad247 100644
--- a/devel/mingw32-binutils/files/patch-Makefile.in
+++ b/devel/mingw32-binutils/files/patch-Makefile.in
@@ -1,17 +1,19 @@
---- 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:
+--- Makefile.in.orig	Tue Jan  4 01:27:39 2005
++++ Makefile.in	Sun Apr 10 13:50:22 2005
+@@ -14162,11 +14162,11 @@
+ maybe-install-libiberty: install-libiberty
  
  install-libiberty: installdirs
 -	@r=`${PWD_COMMAND}`; export r; \
 -	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 -	$(SET_LIB_PATH) \
+-	$(HOST_EXPORTS) \
 -	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
 +#	@r=`${PWD_COMMAND}`; export r; \
 +#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +#	$(SET_LIB_PATH) \
++#	$(HOST_EXPORTS) \
 +#	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
  
+ @endif libiberty
  
- .PHONY: configure-libtool maybe-configure-libtool
diff --git a/devel/mingw32-binutils/files/patch-configure b/devel/mingw32-binutils/files/patch-configure
index 2e8ed41c187..bffbb58c333 100644
--- a/devel/mingw32-binutils/files/patch-configure
+++ b/devel/mingw32-binutils/files/patch-configure
@@ -1,11 +1,11 @@
---- 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.
+--- configure.orig	Tue Jan  4 01:27:41 2005
++++ configure	Sun Apr 10 13:54:26 2005
+@@ -2801,7 +2801,7 @@
+ done
+ test -n "$CONFIGURED_BISON" || CONFIGURED_BISON="$MISSING bison"
  
--for prog in 'bison -y' byacc yacc
-+for prog in byacc yacc
+-for ac_prog in 'bison -y' byacc yacc
++for ac_prog in byacc yacc
  do
-   set dummy $prog; tmp=$2
-   IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2