lang/gnatdroid-binutils: Upgrade version 2.24 => 2.25

While here, remove te ARMv5 support; the gnatdroid-armv5 port has
been removed.

3 files changed, 5 insertions, 63 deletions

diff --git a/lang/gnatdroid-binutils/Makefile b/lang/gnatdroid-binutils/Makefile
index 3a35aa73e3b7..531d7aaf29f5 100644
--- a/lang/gnatdroid-binutils/Makefile
+++ b/lang/gnatdroid-binutils/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		binutils
-PORTVERSION=		2.24
-PORTREVISION=		4
+PORTVERSION=		2.25
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -28,17 +27,14 @@ NO_LICENSES_INSTALL= yes
 
 WRKSRC=			${WRKDIR}/binutils-${PORTVERSION}
 PREFIX=			${LOCALBASE}/android
-BRANCH1=		ARMv5
 BRANCH2=		ARMv7
-BR1_PREFIX=		${PREFIX}/${BRANCH1}
 BR2_PREFIX=		${PREFIX}/${BRANCH2}
 ARMTARGET=		arm-aux-linux-androideabi
 PLIST_SUB+=		TARGET="${ARMTARGET}"
-PLIST_SUB+=		BRANCH1="${BRANCH1}"
 PLIST_SUB+=		BRANCH2="${BRANCH2}"
 
 CONFIGURE_ARGS+=	--target=${ARMTARGET}
-CONFIGURE_ARGS+=	--prefix=${BR1_PREFIX}
+CONFIGURE_ARGS+=	--prefix=${BR2_PREFIX}
 CONFIGURE_ARGS+=	--with-sysroot=${PREFIX}
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpfr=${LOCALBASE}
@@ -47,9 +43,6 @@ CONFIGURE_ARGS+=	--disable-nls
 
 post-install:
 #	Move the unwanted documentation out of the stage directory
-	${MV} ${STAGEDIR}${BR1_PREFIX}/share ${WRKDIR}
-	${MKDIR} ${STAGEDIR}${BR2_PREFIX}
-	(cd ${STAGEDIR}${BR1_PREFIX} && ${COPYTREE_BIN} \* \
-		${STAGEDIR}${BR2_PREFIX})
+	${MV} ${STAGEDIR}${BR2_PREFIX}/share ${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/gnatdroid-binutils/distinfo b/lang/gnatdroid-binutils/distinfo
index 642e3ea78d48..f2e3d1adbb94 100644
--- a/lang/gnatdroid-binutils/distinfo
+++ b/lang/gnatdroid-binutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
-SIZE (binutils-2.24.tar.bz2) = 22716802
+SHA256 (binutils-2.25.tar.bz2) = 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
+SIZE (binutils-2.25.tar.bz2) = 24049133
diff --git a/lang/gnatdroid-binutils/pkg-plist b/lang/gnatdroid-binutils/pkg-plist
index b5956c0b1de2..f637c6dcf035 100644
--- a/lang/gnatdroid-binutils/pkg-plist
+++ b/lang/gnatdroid-binutils/pkg-plist
@@ -1,54 +1,3 @@
-%%BRANCH1%%/%%TARGET%%/bin/ar
-%%BRANCH1%%/%%TARGET%%/bin/as
-%%BRANCH1%%/%%TARGET%%/bin/ld
-%%BRANCH1%%/%%TARGET%%/bin/ld.bfd
-%%BRANCH1%%/%%TARGET%%/bin/nm
-%%BRANCH1%%/%%TARGET%%/bin/objcopy
-%%BRANCH1%%/%%TARGET%%/bin/objdump
-%%BRANCH1%%/%%TARGET%%/bin/ranlib
-%%BRANCH1%%/%%TARGET%%/bin/strip
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.x
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xbn
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xc
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xd
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xdc
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xdw
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xn
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xr
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xs
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xsc
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xsw
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xu
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelf_linux_eabi.xw
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.x
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xbn
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xc
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xd
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xdc
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xdw
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xn
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xr
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xs
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xsc
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xsw
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xu
-%%BRANCH1%%/%%TARGET%%/lib/ldscripts/armelfb_linux_eabi.xw
-%%BRANCH1%%/bin/%%TARGET%%-addr2line
-%%BRANCH1%%/bin/%%TARGET%%-ar
-%%BRANCH1%%/bin/%%TARGET%%-as
-%%BRANCH1%%/bin/%%TARGET%%-c++filt
-%%BRANCH1%%/bin/%%TARGET%%-elfedit
-%%BRANCH1%%/bin/%%TARGET%%-gprof
-%%BRANCH1%%/bin/%%TARGET%%-ld
-%%BRANCH1%%/bin/%%TARGET%%-ld.bfd
-%%BRANCH1%%/bin/%%TARGET%%-nm
-%%BRANCH1%%/bin/%%TARGET%%-objcopy
-%%BRANCH1%%/bin/%%TARGET%%-objdump
-%%BRANCH1%%/bin/%%TARGET%%-ranlib
-%%BRANCH1%%/bin/%%TARGET%%-readelf
-%%BRANCH1%%/bin/%%TARGET%%-size
-%%BRANCH1%%/bin/%%TARGET%%-strings
-%%BRANCH1%%/bin/%%TARGET%%-strip
 %%BRANCH2%%/%%TARGET%%/bin/ar
 %%BRANCH2%%/%%TARGET%%/bin/as
 %%BRANCH2%%/%%TARGET%%/bin/ld