git: d31fb9678d73 - main - devel/binutils: Pet portclippy

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Wed, 28 Aug 2024 06:02:06 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d31fb9678d7312593a49348e94d5d4bce3b2f0a7

commit d31fb9678d7312593a49348e94d5d4bce3b2f0a7
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-08-26 15:29:12 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-08-28 06:00:20 +0000

    devel/binutils: Pet portclippy
    
    In addition to petting portclippy, replace the "rm" command with its
    predefined variable.
    
    PR:     281070
    MFH:    2024Q3
---
 devel/binutils/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 366797b8a361..14c05bec499d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -26,8 +26,8 @@ FLAVORS=	native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
 FLAVOR?=	native
 
 USES=		bison:alias compiler:env cpe gmake localbase libtool perl5 pkgconfig tar:lz
-USE_PERL5=	build
 CPE_VENDOR=	gnu
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
@@ -53,15 +53,16 @@ CONFLICTS=	libbfd
 
 OPTIONS_DEFINE=	INFO NLS RELRO
 OPTIONS_DEFAULT=	INFO
+OPTIONS_EXCLUDE=	NLS
 OPTIONS_SUB=	yes
 
-RELRO_DESC=	Enable relocation memory corruption mitigation (-z relro) by default
-RELRO_CONFIGURE_ON=	--enable-relro
-RELRO_CONFIGURE_OFF=	--enable-relro=no
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
 INFO_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-no-info
 INFO_USES=	makeinfo
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+RELRO_CONFIGURE_ON=	--enable-relro
+RELRO_CONFIGURE_OFF=	--enable-relro=no
+RELRO_DESC=	Enable relocation memory corruption mitigation (-z relro) by default
 
 aarch64_COMMENT=	GNU binutils for ${FLAVOR} development
 
@@ -75,7 +76,6 @@ BUTARGET?=	${PKGNAMEPREFIX}${OPSYS:tl}${OSREL}
 BUTARGET?=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
 .endif
 PLIST_SUB=	BUTARGET=${BUTARGET}
-OPTIONS_EXCLUDE=	NLS
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/share/info
 
 .if ${FLAVOR} == aarch64
@@ -102,7 +102,6 @@ CONFIGURE_ARGS+=	--disable-shared
 PLIST_SUB+=		SHARED='@comment'
 .endif
 
-
 .if ${FLAVOR} == native
 BUREMOVE=	coffdump \
 		dlltool \
@@ -174,7 +173,7 @@ post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
 .endif
 	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
-	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
+	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then ${RM} -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
 	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/bfd-plugins
 .endif