Fix plist, don't use hardcoded OPSYS

2 files changed, 76 insertions, 72 deletions

diff --git a/devel/riscv64-binutils/Makefile b/devel/riscv64-binutils/Makefile
index 9b078d2fc57b..4179685b0121 100644
--- a/devel/riscv64-binutils/Makefile
+++ b/devel/riscv64-binutils/Makefile
@@ -24,8 +24,10 @@ GH_ACCOUNT=	freebsd-riscv
 GH_PROJECT=	riscv-binutils-gdb
 GH_TAGNAME=	dc03ed3
 
+BUTARGET=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} \
+CONFIGURE_ARGS=	--target=${BUTARGET} \
 		--with-sysroot=/ \
 		--disable-gdb \
 		--disable-sim \
@@ -38,6 +40,8 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} \
 		--with-gmp=${LOCALBASE} \
 		--with-mpfr=${LOCALBASE}
 
+PLIST_SUB=	BUTARGET=${BUTARGET}
+
 .include <bsd.port.pre.mk>
 
 post-install:
diff --git a/devel/riscv64-binutils/pkg-plist b/devel/riscv64-binutils/pkg-plist
index 55683dc692ca..fc867db3a61f 100644
--- a/devel/riscv64-binutils/pkg-plist
+++ b/devel/riscv64-binutils/pkg-plist
@@ -1,71 +1,71 @@
-bin/riscv64-unknown-freebsd11.1-addr2line
-bin/riscv64-unknown-freebsd11.1-ar
-bin/riscv64-unknown-freebsd11.1-as
-bin/riscv64-unknown-freebsd11.1-c++filt
-bin/riscv64-unknown-freebsd11.1-elfedit
-bin/riscv64-unknown-freebsd11.1-gprof
-bin/riscv64-unknown-freebsd11.1-ld
-bin/riscv64-unknown-freebsd11.1-ld.bfd
-bin/riscv64-unknown-freebsd11.1-nm
-bin/riscv64-unknown-freebsd11.1-objcopy
-bin/riscv64-unknown-freebsd11.1-objdump
-bin/riscv64-unknown-freebsd11.1-ranlib
-bin/riscv64-unknown-freebsd11.1-readelf
-bin/riscv64-unknown-freebsd11.1-size
-bin/riscv64-unknown-freebsd11.1-strings
-bin/riscv64-unknown-freebsd11.1-strip
-man/man1/riscv64-unknown-freebsd11.1-addr2line.1.gz
-man/man1/riscv64-unknown-freebsd11.1-ar.1.gz
-man/man1/riscv64-unknown-freebsd11.1-as.1.gz
-man/man1/riscv64-unknown-freebsd11.1-c++filt.1.gz
-man/man1/riscv64-unknown-freebsd11.1-dlltool.1.gz
-man/man1/riscv64-unknown-freebsd11.1-elfedit.1.gz
-man/man1/riscv64-unknown-freebsd11.1-gprof.1.gz
-man/man1/riscv64-unknown-freebsd11.1-ld.1.gz
-man/man1/riscv64-unknown-freebsd11.1-nlmconv.1.gz
-man/man1/riscv64-unknown-freebsd11.1-nm.1.gz
-man/man1/riscv64-unknown-freebsd11.1-objcopy.1.gz
-man/man1/riscv64-unknown-freebsd11.1-objdump.1.gz
-man/man1/riscv64-unknown-freebsd11.1-ranlib.1.gz
-man/man1/riscv64-unknown-freebsd11.1-readelf.1.gz
-man/man1/riscv64-unknown-freebsd11.1-size.1.gz
-man/man1/riscv64-unknown-freebsd11.1-strings.1.gz
-man/man1/riscv64-unknown-freebsd11.1-strip.1.gz
-man/man1/riscv64-unknown-freebsd11.1-windmc.1.gz
-man/man1/riscv64-unknown-freebsd11.1-windres.1.gz
-riscv64-unknown-freebsd11.1/bin/ar
-riscv64-unknown-freebsd11.1/bin/as
-riscv64-unknown-freebsd11.1/bin/ld
-riscv64-unknown-freebsd11.1/bin/ld.bfd
-riscv64-unknown-freebsd11.1/bin/nm
-riscv64-unknown-freebsd11.1/bin/objcopy
-riscv64-unknown-freebsd11.1/bin/objdump
-riscv64-unknown-freebsd11.1/bin/ranlib
-riscv64-unknown-freebsd11.1/bin/readelf
-riscv64-unknown-freebsd11.1/bin/strip
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.x
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xbn
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xc
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xd
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xdc
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xdw
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xn
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xr
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xs
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xsc
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xsw
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xu
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf32lriscv.xw
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.x
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xbn
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xc
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xd
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xdc
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xdw
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xn
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xr
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xs
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xsc
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xsw
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xu
-riscv64-unknown-freebsd11.1/lib/ldscripts/elf64lriscv.xw
+bin/%%BUTARGET%%-addr2line
+bin/%%BUTARGET%%-ar
+bin/%%BUTARGET%%-as
+bin/%%BUTARGET%%-c++filt
+bin/%%BUTARGET%%-elfedit
+bin/%%BUTARGET%%-gprof
+bin/%%BUTARGET%%-ld
+bin/%%BUTARGET%%-ld.bfd
+bin/%%BUTARGET%%-nm
+bin/%%BUTARGET%%-objcopy
+bin/%%BUTARGET%%-objdump
+bin/%%BUTARGET%%-ranlib
+bin/%%BUTARGET%%-readelf
+bin/%%BUTARGET%%-size
+bin/%%BUTARGET%%-strings
+bin/%%BUTARGET%%-strip
+man/man1/%%BUTARGET%%-addr2line.1.gz
+man/man1/%%BUTARGET%%-ar.1.gz
+man/man1/%%BUTARGET%%-as.1.gz
+man/man1/%%BUTARGET%%-c++filt.1.gz
+man/man1/%%BUTARGET%%-dlltool.1.gz
+man/man1/%%BUTARGET%%-elfedit.1.gz
+man/man1/%%BUTARGET%%-gprof.1.gz
+man/man1/%%BUTARGET%%-ld.1.gz
+man/man1/%%BUTARGET%%-nlmconv.1.gz
+man/man1/%%BUTARGET%%-nm.1.gz
+man/man1/%%BUTARGET%%-objcopy.1.gz
+man/man1/%%BUTARGET%%-objdump.1.gz
+man/man1/%%BUTARGET%%-ranlib.1.gz
+man/man1/%%BUTARGET%%-readelf.1.gz
+man/man1/%%BUTARGET%%-size.1.gz
+man/man1/%%BUTARGET%%-strings.1.gz
+man/man1/%%BUTARGET%%-strip.1.gz
+man/man1/%%BUTARGET%%-windmc.1.gz
+man/man1/%%BUTARGET%%-windres.1.gz
+%%BUTARGET%%/bin/ar
+%%BUTARGET%%/bin/as
+%%BUTARGET%%/bin/ld
+%%BUTARGET%%/bin/ld.bfd
+%%BUTARGET%%/bin/nm
+%%BUTARGET%%/bin/objcopy
+%%BUTARGET%%/bin/objdump
+%%BUTARGET%%/bin/ranlib
+%%BUTARGET%%/bin/readelf
+%%BUTARGET%%/bin/strip
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.x
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xd
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xn
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xr
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xs
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xu
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.x
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xbn
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xd
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xn
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xr
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xs
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xu
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xw