Index: head/devel/riscv64-binutils/Makefile
===================================================================
--- head/devel/riscv64-binutils/Makefile
+++ head/devel/riscv64-binutils/Makefile
@@ -1,50 +1,9 @@
 # $FreeBSD$
 
-PORTNAME=	binutils
-PORTVERSION=	2.29
-PORTREVISION=	20180214
-PORTEPOCH=	1
-CATEGORIES=	devel
+COMMENT=	GNU binutils for RISC-V cross-development
 PKGNAMEPREFIX=	riscv64-
+PLIST=	${.CURDIR}/pkg-plist
 
-MAINTAINER=	lwhsu@FreeBSD.org
-COMMENT=	GNU binutils for RISC-V cross-development
+MASTERDIR=	${.CURDIR}/../binutils
 
-LICENSE=	GPLv3 LGPL3
-LICENSE_COMB=	multi
-
-LIB_DEPENDS=	libgmp.so:math/gmp \
-		libmpfr.so:math/mpfr \
-		libmpc.so:math/mpc
-
-USES=	bison gmake libtool makeinfo
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	freebsd-riscv
-GH_PROJECT=	riscv-binutils-gdb
-GH_TAGNAME=	dc03ed3
-
-BUTARGET=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${BUTARGET} \
-		--with-sysroot=/ \
-		--disable-gdb \
-		--disable-sim \
-		--enable-tls \
-		--disable-werror \
-		--disable-nls \
-		--disable-intl \
-		--disable-shared \
-		--with-system-zlib \
-		--with-gmp=${LOCALBASE} \
-		--with-mpfr=${LOCALBASE}
-
-PLIST_SUB=	BUTARGET=${BUTARGET}
-
-.include <bsd.port.pre.mk>
-
-post-install:
-	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH} ] ; then ${RM} -r ${STAGEDIR}${PREFIX}/${INFO_PATH}; fi
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/devel/riscv64-binutils/distinfo
===================================================================
--- head/devel/riscv64-binutils/distinfo
+++ head/devel/riscv64-binutils/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1515136354
-SHA256 (freebsd-riscv-riscv-binutils-gdb-2.29-dc03ed3_GH0.tar.gz) = 0ba426cbb0e1fa2ff8e82971c397e4f3ef1a8cb8af2c2c4030bb37f22a201e33
-SIZE (freebsd-riscv-riscv-binutils-gdb-2.29-dc03ed3_GH0.tar.gz) = 54278415
Index: head/devel/riscv64-binutils/pkg-descr
===================================================================
--- head/devel/riscv64-binutils/pkg-descr
+++ head/devel/riscv64-binutils/pkg-descr
@@ -1,3 +0,0 @@
-The GNU binutils for RISC-V cross-development.
-
-WWW: https://github.com/freebsd-riscv/riscv-binutils-gdb
Index: head/devel/riscv64-binutils/pkg-plist
===================================================================
--- head/devel/riscv64-binutils/pkg-plist
+++ head/devel/riscv64-binutils/pkg-plist
@@ -42,30 +42,49 @@
 %%BUTARGET%%/bin/objdump
 %%BUTARGET%%/bin/ranlib
 %%BUTARGET%%/bin/readelf
+%%BUTARGET%%/bin/size
 %%BUTARGET%%/bin/strip
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.x
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xce
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xd
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xde
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xn
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xr
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xs
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xse
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xswe
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xu
 %%BUTARGET%%/lib/ldscripts/elf32lriscv.xw
+%%BUTARGET%%/lib/ldscripts/elf32lriscv.xwe
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.x
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xbn
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xce
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xd
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xdc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xde
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xdw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdwe
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xe
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xn
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xr
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xs
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xsc
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsce
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xse
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xsw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xswe
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xu
 %%BUTARGET%%/lib/ldscripts/elf64lriscv.xw
+%%BUTARGET%%/lib/ldscripts/elf64lriscv.xwe