Make mingw32 a slave port of binutils, this bumps it to 2.25

This allows to keep the mingw32 target in sync with other binutils

PR:		196911
Submitted by:	Naram Qashat (maintainer)

6 files changed, 43 insertions, 126 deletions

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index d90a6e548bc1..bd776c9c2592 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -1,54 +1,18 @@
 # Created by: Lev Serebryakov <lev@serebryakov.spb.ru>
 # $FreeBSD$
 
-PORTNAME=	binutils
-PORTVERSION=	${BINUTILVERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=	mingw32-
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	GNU Binutils for Windows cross-development
 
-BINUTILVERSION=	2.24
+MASTERDIR=	${.CURDIR}/../binutils
+PLIST=		${.CURDIR}/pkg-plist
 
-USES=		gmake iconv tar:bzip2
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
-		--with-gcc --with-gnu-ld --with-gnu-as \
-		--disable-nls --disable-win32-registry \
-		--disable-shared --disable-werror
-INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
+BUTARGET=	${PKGNAMEPREFIX:S/-$//}
 
-INFO=		as bfd binutils ld configure gprof standards
-INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
+INFO=		as bfd binutils gprof ld
+INFO_PATH=	${BUTARGET}/info
 
-PLIST_SUB+=	BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//}
-
-BINARIES=	addr2line ar as c++filt gprof ld nm objcopy objdump ranlib \
-		readelf size strings strip dlltool dllwrap windmc windres
-
-post-install:
-.for F in ${BINARIES}
-	@${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}$F \
-		${STAGEDIR}${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) && defined(LOCALBASE) && defined(LINUXBASE) \
-	&& ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} \
-	&& ${PREFIX} != "/usr")
-	@${ECHO_CMD} "@unexec ${RMDIR} %D 2> /dev/null || true" >> ${TMPPLIST}
-.else
-	@${DO_NADA}
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
deleted file mode 100644
index 642e3ea78d48..000000000000
--- a/devel/mingw32-binutils/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
-SIZE (binutils-2.24.tar.bz2) = 22716802
diff --git a/devel/mingw32-binutils/files/patch-Makefile.in b/devel/mingw32-binutils/files/patch-Makefile.in
deleted file mode 100644
index 10cd702f9c20..000000000000
--- a/devel/mingw32-binutils/files/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	Mon Dec  4 14:32:56 2006
-+++ Makefile.in	Mon Dec  4 14:33:11 2006
-@@ -17927,12 +17927,12 @@
- maybe-install-libiberty: install-libiberty
- 
- install-libiberty: installdirs
--	@: $(MAKE); $(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(HOST_EXPORTS) \
--	(cd $(HOST_SUBDIR)/libiberty && \
--	  $(MAKE) $(FLAGS_TO_PASS)  install)
-+#	@: $(MAKE); $(unstage)
-+#	@r=`${PWD_COMMAND}`; export r; \
-+#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+#	$(HOST_EXPORTS) \
-+#	(cd $(HOST_SUBDIR)/libiberty && \
-+#	  $(MAKE) $(FLAGS_TO_PASS)  install)
- 
- @endif libiberty
- 
diff --git a/devel/mingw32-binutils/files/patch-configure b/devel/mingw32-binutils/files/patch-configure
deleted file mode 100644
index bffbb58c333c..000000000000
--- a/devel/mingw32-binutils/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 ac_prog in 'bison -y' byacc yacc
-+for ac_prog in byacc yacc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/devel/mingw32-binutils/pkg-descr b/devel/mingw32-binutils/pkg-descr
deleted file mode 100644
index 640721df177c..000000000000
--- a/devel/mingw32-binutils/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-FSF binutils-2.13 for Windows cross-development.
-
-This port is needed by devel/mingw32-gcc
-
-WWW: http://www.mingw.org/
diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist
index b3eac86d1f83..01b71b9de0d0 100644
--- a/devel/mingw32-binutils/pkg-plist
+++ b/devel/mingw32-binutils/pkg-plist
@@ -17,48 +17,40 @@ man/man1/mingw32-strings.1.gz
 man/man1/mingw32-strip.1.gz
 man/man1/mingw32-windmc.1.gz
 man/man1/mingw32-windres.1.gz
-%%BINUTILS_TARG%%/bin/addr2line
-%%BINUTILS_TARG%%/bin/ar
-%%BINUTILS_TARG%%/bin/as
-%%BINUTILS_TARG%%/bin/c++filt
-%%BINUTILS_TARG%%/bin/dlltool
-%%BINUTILS_TARG%%/bin/dllwrap
-%%BINUTILS_TARG%%/bin/gprof
-%%BINUTILS_TARG%%/bin/ld
-%%BINUTILS_TARG%%/bin/ld.bfd
-%%BINUTILS_TARG%%/bin/nm
-%%BINUTILS_TARG%%/bin/objcopy
-%%BINUTILS_TARG%%/bin/objdump
-%%BINUTILS_TARG%%/bin/ranlib
-%%BINUTILS_TARG%%/bin/readelf
-%%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.xa
-%%BINUTILS_TARG%%/lib/ldscripts/i386pe.xbn
-%%BINUTILS_TARG%%/lib/ldscripts/i386pe.xn
-%%BINUTILS_TARG%%/lib/ldscripts/i386pe.xr
-%%BINUTILS_TARG%%/lib/ldscripts/i386pe.xu
-bin/%%BINUTILS_TARG%%-addr2line
-bin/%%BINUTILS_TARG%%-ar
-bin/%%BINUTILS_TARG%%-as
-bin/%%BINUTILS_TARG%%-c++filt
-bin/%%BINUTILS_TARG%%-dlltool
-bin/%%BINUTILS_TARG%%-dllwrap
-bin/%%BINUTILS_TARG%%-elfedit
-bin/%%BINUTILS_TARG%%-gprof
-bin/%%BINUTILS_TARG%%-ld
-bin/%%BINUTILS_TARG%%-ld.bfd
-bin/%%BINUTILS_TARG%%-nm
-bin/%%BINUTILS_TARG%%-objcopy
-bin/%%BINUTILS_TARG%%-objdump
-bin/%%BINUTILS_TARG%%-ranlib
-bin/%%BINUTILS_TARG%%-readelf
-bin/%%BINUTILS_TARG%%-strip
-bin/%%BINUTILS_TARG%%-size
-bin/%%BINUTILS_TARG%%-strings
-bin/%%BINUTILS_TARG%%-windmc
-bin/%%BINUTILS_TARG%%-windres
+mingw32/bin/ar
+mingw32/bin/as
+mingw32/bin/dlltool
+mingw32/bin/ld
+mingw32/bin/ld.bfd
+mingw32/bin/nm
+mingw32/bin/objcopy
+mingw32/bin/objdump
+mingw32/bin/ranlib
+mingw32/bin/strip
+mingw32/bin/size
+mingw32/lib/ldscripts/i386pe.x
+mingw32/lib/ldscripts/i386pe.xa
+mingw32/lib/ldscripts/i386pe.xbn
+mingw32/lib/ldscripts/i386pe.xn
+mingw32/lib/ldscripts/i386pe.xr
+mingw32/lib/ldscripts/i386pe.xu
+bin/mingw32-addr2line
+bin/mingw32-ar
+bin/mingw32-as
+bin/mingw32-c++filt
+bin/mingw32-dlltool
+bin/mingw32-dllwrap
+bin/mingw32-elfedit
+bin/mingw32-gprof
+bin/mingw32-ld
+bin/mingw32-ld.bfd
+bin/mingw32-nm
+bin/mingw32-objcopy
+bin/mingw32-objdump
+bin/mingw32-ranlib
+bin/mingw32-readelf
+bin/mingw32-strip
+bin/mingw32-size
+bin/mingw32-strings
+bin/mingw32-windmc
+bin/mingw32-windres