- enable staging

- add LICENSE
- clean up pkg-plist
- Switch to Uses gmake

4 files changed, 121 insertions, 100 deletions

diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index c5819e6ca2cf..6108c8978225 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -10,33 +10,28 @@ DISTNAME=	zpu-toolchain-${PORTVERSION}
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	ZPU toolchain
 
-USE_GMAKE=	yes
+LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/toolchain
+MANDIRS=	${PREFIX}/zpu/man
 
-USES=		gettext
-MANPREFIX=	${PREFIX}/zpu
-MANCOMPRESSED=	no
-MAN1=		zpu-elf-addr2line.1 zpu-elf-ar.1 zpu-elf-dlltool.1 \
-		zpu-elf-nlmconv.1 zpu-elf-nm.1 zpu-elf-objcopy.1 \
-		zpu-elf-objdump.1 zpu-elf-ranlib.1 zpu-elf-size.1 \
-		zpu-elf-strings.1 zpu-elf-strip.1 zpu-elf-windres.1 \
-		zpu-elf-c++filt.1 zpu-elf-as.1 zpu-elf-ld.1 zpu-elf-readelf.1
+USES=		gettext gmake
 
 INFO=		zpu/as zpu/bfd zpu/binutils zpu/configure zpu/ld zpu/standards
+INFO_PATH=	PREFIX/info/zpu
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' ${WRKSRC}/build.sh
-	${CP}	${FILESDIR}/install.sh ${WRKSRC}
-	@${REINPLACE_CMD} -e 's/%%GMAKE%%/${GMAKE}/' ${WRKSRC}/build.sh \
+	@${CP}  ${FILESDIR}/install.sh ${WRKSRC}
+	@${REINPLACE_CMD} -e 's|%%GMAKE%%|${GMAKE}|g' ${WRKSRC}/build.sh \
 		${WRKSRC}/install.sh
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.sh
+	@${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' ${WRKSRC}/binutils/Makefile.in
 
 do-install:
-	cd ${WRKSRC} && ${SH} install.sh
+	@cd ${WRKSRC} && ${SH} install.sh
 
 do-build:
-	cd ${WRKSRC} && ${SH} build.sh
+	@cd ${WRKSRC} && ${SH} build.sh
 
 .include <bsd.port.mk>
diff --git a/devel/zpu-binutils/files/patch-binutils_Makefile.in b/devel/zpu-binutils/files/patch-binutils_Makefile.in
index c5e2f14759f1..79aa587a94d9 100644
--- a/devel/zpu-binutils/files/patch-binutils_Makefile.in
+++ b/devel/zpu-binutils/files/patch-binutils_Makefile.in
@@ -1,5 +1,5 @@
---- binutils/Makefile.in.orig	2012-10-11 18:40:22.000000000 -0500
-+++ binutils/Makefile.in	2012-10-13 10:55:52.000000000 -0500
+--- binutils/Makefile.in.orig	2013-12-30 21:37:55.575079987 -0500
++++ binutils/Makefile.in	2013-12-30 21:38:33.751076604 -0500
 @@ -141,8 +141,8 @@
  
  # compilers to use to create programs which must be run in the build
@@ -11,3 +11,12 @@
  
  CXX_FOR_BUILD = $(CXX)
  
+@@ -385,7 +385,7 @@
+ 
+ # Flags to pass down to all sub-makes.
+ BASE_FLAGS_TO_PASS = \
+-	"DESTDIR=$(DESTDIR)" \
++	"DESTDIR=%%DESTDIR%%" \
+ 	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
+ 	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+ 	"bindir=$(bindir)" \
diff --git a/devel/zpu-binutils/files/patch-build.sh b/devel/zpu-binutils/files/patch-build.sh
index bb93d9117898..cbe6dce46746 100644
--- a/devel/zpu-binutils/files/patch-build.sh
+++ b/devel/zpu-binutils/files/patch-build.sh
@@ -1,7 +1,8 @@
---- build.sh.orig	2012-10-11 18:40:23.000000000 -0500
-+++ build.sh	2012-10-19 18:50:50.000000000 -0500
-@@ -1,18 +1,19 @@
+--- build.sh.orig	2012-10-11 19:40:23.000000000 -0400
++++ build.sh	2013-12-30 21:20:35.147443323 -0500
+@@ -1,18 +1,20 @@
 +export CC=cc
++export DISTDIR=%%DISTDIR%%
  set -e
  rm -rf build
  mkdir build
diff --git a/devel/zpu-binutils/pkg-plist b/devel/zpu-binutils/pkg-plist
index 43de848cc1dc..d25ead73363c 100644
--- a/devel/zpu-binutils/pkg-plist
+++ b/devel/zpu-binutils/pkg-plist
@@ -1,98 +1,114 @@
-info/zpu/dir
-zpu/bin/zpu-elf-addr2line
-zpu/bin/zpu-elf-ar
-zpu/bin/zpu-elf-as
-zpu/bin/zpu-elf-c++filt
-zpu/bin/zpu-elf-ld
-zpu/bin/zpu-elf-nm
-zpu/bin/zpu-elf-objcopy
-zpu/bin/zpu-elf-objdump
-zpu/bin/zpu-elf-ranlib
-zpu/bin/zpu-elf-readelf
-zpu/bin/zpu-elf-size
-zpu/bin/zpu-elf-strings
-zpu/bin/zpu-elf-strip
-zpu/lib/libiberty.a
-zpu/share/locale/da/LC_MESSAGES/bfd.mo
-zpu/share/locale/da/LC_MESSAGES/binutils.mo
-zpu/share/locale/da/LC_MESSAGES/ld.mo
-zpu/share/locale/da/LC_MESSAGES/opcodes.mo
-zpu/share/locale/de/LC_MESSAGES/opcodes.mo
-zpu/share/locale/es/LC_MESSAGES/bfd.mo
-zpu/share/locale/es/LC_MESSAGES/binutils.mo
-zpu/share/locale/es/LC_MESSAGES/gas.mo
-zpu/share/locale/es/LC_MESSAGES/ld.mo
-zpu/share/locale/es/LC_MESSAGES/opcodes.mo
-zpu/share/locale/fr/LC_MESSAGES/bfd.mo
-zpu/share/locale/fr/LC_MESSAGES/binutils.mo
-zpu/share/locale/fr/LC_MESSAGES/gas.mo
-zpu/share/locale/fr/LC_MESSAGES/ld.mo
-zpu/share/locale/fr/LC_MESSAGES/opcodes.mo
-zpu/share/locale/id/LC_MESSAGES/opcodes.mo
-zpu/share/locale/ja/LC_MESSAGES/bfd.mo
-zpu/share/locale/ja/LC_MESSAGES/binutils.mo
-zpu/share/locale/nl/LC_MESSAGES/opcodes.mo
-zpu/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-zpu/share/locale/ro/LC_MESSAGES/bfd.mo
-zpu/share/locale/ro/LC_MESSAGES/opcodes.mo
-zpu/share/locale/ru/LC_MESSAGES/binutils.mo
-zpu/share/locale/sv/LC_MESSAGES/bfd.mo
-zpu/share/locale/sv/LC_MESSAGES/binutils.mo
-zpu/share/locale/sv/LC_MESSAGES/ld.mo
-zpu/share/locale/sv/LC_MESSAGES/opcodes.mo
-zpu/share/locale/tr/LC_MESSAGES/bfd.mo
-zpu/share/locale/tr/LC_MESSAGES/binutils.mo
-zpu/share/locale/tr/LC_MESSAGES/gas.mo
-zpu/share/locale/tr/LC_MESSAGES/ld.mo
-zpu/share/locale/tr/LC_MESSAGES/opcodes.mo
-zpu/share/locale/zh_CN/LC_MESSAGES/bfd.mo
-zpu/share/locale/zh_CN/LC_MESSAGES/binutils.mo
-zpu/zpu-elf/bin/ar
-zpu/zpu-elf/bin/as
-zpu/zpu-elf/bin/ld
-zpu/zpu-elf/bin/nm
-zpu/zpu-elf/bin/ranlib
-zpu/zpu-elf/bin/strip
-zpu/zpu-elf/lib/ldscripts/zpuelf.x
-zpu/zpu-elf/lib/ldscripts/zpuelf.xbn
-zpu/zpu-elf/lib/ldscripts/zpuelf.xn
-zpu/zpu-elf/lib/ldscripts/zpuelf.xr
-zpu/zpu-elf/lib/ldscripts/zpuelf.xs
 zpu/zpu-elf/lib/ldscripts/zpuelf.xu
-@dirrmtry zpu/man/man1
-@dirrmtry zpu/man
-@dirrmtry zpu/bin
-@dirrmtry zpu/lib
+zpu/zpu-elf/lib/ldscripts/zpuelf.xs
+zpu/zpu-elf/lib/ldscripts/zpuelf.xr
+zpu/zpu-elf/lib/ldscripts/zpuelf.xn
+zpu/zpu-elf/lib/ldscripts/zpuelf.xbn
+zpu/zpu-elf/lib/ldscripts/zpuelf.x
+zpu/zpu-elf/bin/strip
+zpu/zpu-elf/bin/ranlib
+zpu/zpu-elf/bin/nm
+zpu/zpu-elf/bin/ld
+zpu/zpu-elf/bin/as
+zpu/zpu-elf/bin/ar
+zpu/share/locale/zh_CN/LC_MESSAGES/binutils.mo
+zpu/share/locale/zh_CN/LC_MESSAGES/bfd.mo
+zpu/share/locale/tr/LC_MESSAGES/opcodes.mo
+zpu/share/locale/tr/LC_MESSAGES/ld.mo
+zpu/share/locale/tr/LC_MESSAGES/gas.mo
+zpu/share/locale/tr/LC_MESSAGES/binutils.mo
+zpu/share/locale/tr/LC_MESSAGES/bfd.mo
+zpu/share/locale/sv/LC_MESSAGES/opcodes.mo
+zpu/share/locale/sv/LC_MESSAGES/ld.mo
+zpu/share/locale/sv/LC_MESSAGES/binutils.mo
+zpu/share/locale/sv/LC_MESSAGES/bfd.mo
+zpu/share/locale/ru/LC_MESSAGES/binutils.mo
+zpu/share/locale/ro/LC_MESSAGES/opcodes.mo
+zpu/share/locale/ro/LC_MESSAGES/bfd.mo
+zpu/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+zpu/share/locale/nl/LC_MESSAGES/opcodes.mo
+zpu/share/locale/ja/LC_MESSAGES/binutils.mo
+zpu/share/locale/ja/LC_MESSAGES/bfd.mo
+zpu/share/locale/id/LC_MESSAGES/opcodes.mo
+zpu/share/locale/fr/LC_MESSAGES/opcodes.mo
+zpu/share/locale/fr/LC_MESSAGES/ld.mo
+zpu/share/locale/fr/LC_MESSAGES/gas.mo
+zpu/share/locale/fr/LC_MESSAGES/binutils.mo
+zpu/share/locale/fr/LC_MESSAGES/bfd.mo
+zpu/share/locale/es/LC_MESSAGES/opcodes.mo
+zpu/share/locale/es/LC_MESSAGES/ld.mo
+zpu/share/locale/es/LC_MESSAGES/gas.mo
+zpu/share/locale/es/LC_MESSAGES/binutils.mo
+zpu/share/locale/es/LC_MESSAGES/bfd.mo
+zpu/share/locale/de/LC_MESSAGES/opcodes.mo
+zpu/share/locale/da/LC_MESSAGES/opcodes.mo
+zpu/share/locale/da/LC_MESSAGES/ld.mo
+zpu/share/locale/da/LC_MESSAGES/binutils.mo
+zpu/share/locale/da/LC_MESSAGES/bfd.mo
+zpu/man/man1/zpu-elf-windres.1.gz
+zpu/man/man1/zpu-elf-strip.1.gz
+zpu/man/man1/zpu-elf-strings.1.gz
+zpu/man/man1/zpu-elf-size.1.gz
+zpu/man/man1/zpu-elf-readelf.1.gz
+zpu/man/man1/zpu-elf-ranlib.1.gz
+zpu/man/man1/zpu-elf-objdump.1.gz
+zpu/man/man1/zpu-elf-objcopy.1.gz
+zpu/man/man1/zpu-elf-nm.1.gz
+zpu/man/man1/zpu-elf-nlmconv.1.gz
+zpu/man/man1/zpu-elf-ld.1.gz
+zpu/man/man1/zpu-elf-dlltool.1.gz
+zpu/man/man1/zpu-elf-c++filt.1.gz
+zpu/man/man1/zpu-elf-as.1.gz
+zpu/man/man1/zpu-elf-ar.1.gz
+zpu/man/man1/zpu-elf-addr2line.1.gz
+zpu/lib/libiberty.a
+zpu/bin/zpu-elf-strip
+zpu/bin/zpu-elf-strings
+zpu/bin/zpu-elf-size
+zpu/bin/zpu-elf-readelf
+zpu/bin/zpu-elf-ranlib
+zpu/bin/zpu-elf-objdump
+zpu/bin/zpu-elf-objcopy
+zpu/bin/zpu-elf-nm
+zpu/bin/zpu-elf-ld
+zpu/bin/zpu-elf-c++filt
+zpu/bin/zpu-elf-as
+zpu/bin/zpu-elf-ar
+zpu/bin/zpu-elf-addr2line
 @dirrm zpu/zpu-elf/lib/ldscripts
-@dirrmtry zpu/zpu-elf/bin
 @dirrmtry zpu/zpu-elf/lib
+@dirrmtry zpu/zpu-elf/bin
 @dirrmtry zpu/zpu-elf
+@dirrmtry zpu/share/locale/zh_CN/LC_MESSAGES
+@dirrmtry zpu/share/locale/zh_CN
 @dirrmtry zpu/share/locale/tr/LC_MESSAGES
 @dirrmtry zpu/share/locale/tr
-@dirrmtry zpu/share/locale/fr/LC_MESSAGES
-@dirrmtry zpu/share/locale/fr
-@dirrmtry zpu/share/locale/ja/LC_MESSAGES
-@dirrmtry zpu/share/locale/ja
-@dirrmtry zpu/share/locale/es/LC_MESSAGES
-@dirrmtry zpu/share/locale/es
 @dirrmtry zpu/share/locale/sv/LC_MESSAGES
 @dirrmtry zpu/share/locale/sv
-@dirrmtry zpu/share/locale/da/LC_MESSAGES
-@dirrmtry zpu/share/locale/da
-@dirrmtry zpu/share/locale/zh_CN/LC_MESSAGES
-@dirrmtry zpu/share/locale/zh_CN
+@dirrmtry zpu/share/locale/ru/LC_MESSAGES
+@dirrmtry zpu/share/locale/ru
 @dirrmtry zpu/share/locale/ro/LC_MESSAGES
 @dirrmtry zpu/share/locale/ro
-@dirrmtry zpu/share/locale/de/LC_MESSAGES
-@dirrmtry zpu/share/locale/de
-@dirrmtry zpu/share/locale/id/LC_MESSAGES
-@dirrmtry zpu/share/locale/id
 @dirrmtry zpu/share/locale/pt_BR/LC_MESSAGES
 @dirrmtry zpu/share/locale/pt_BR
 @dirrmtry zpu/share/locale/nl/LC_MESSAGES
 @dirrmtry zpu/share/locale/nl
-@dirrmtry zpu/share/locale/ru/LC_MESSAGES
-@dirrmtry zpu/share/locale/ru
+@dirrmtry zpu/share/locale/ja/LC_MESSAGES
+@dirrmtry zpu/share/locale/ja
+@dirrmtry zpu/share/locale/id/LC_MESSAGES
+@dirrmtry zpu/share/locale/id
+@dirrmtry zpu/share/locale/fr/LC_MESSAGES
+@dirrmtry zpu/share/locale/fr
+@dirrmtry zpu/share/locale/es/LC_MESSAGES
+@dirrmtry zpu/share/locale/es
+@dirrmtry zpu/share/locale/de/LC_MESSAGES
+@dirrmtry zpu/share/locale/de
+@dirrmtry zpu/share/locale/da/LC_MESSAGES
+@dirrmtry zpu/share/locale/da
 @dirrmtry zpu/share/locale
 @dirrmtry zpu/share
+@dirrmtry zpu/man/man1
+@dirrmtry zpu/man
+@dirrmtry zpu/lib
+@dirrmtry zpu/bin
 @dirrmtry zpu
+@dirrmtry info/zpu