svn commit: r338832 - in head/devel/zpu-binutils: . files

Sun Jan 5 23:22:15 UTC 2014

Author: db
Date: Sun Jan  5 23:22:14 2014
New Revision: 338832
URL: http://svnweb.freebsd.org/changeset/ports/338832

Log:
  - enable staging
  - add LICENSE
  - clean up pkg-plist
  - Switch to Uses gmake

Modified:
  head/devel/zpu-binutils/Makefile
  head/devel/zpu-binutils/files/patch-binutils_Makefile.in   (contents, props changed)
  head/devel/zpu-binutils/files/patch-build.sh   (contents, props changed)
  head/devel/zpu-binutils/pkg-plist   (contents, props changed)

Modified: head/devel/zpu-binutils/Makefile
==============================================================================

--- head/devel/zpu-binutils/Makefile	Sun Jan  5 23:08:44 2014	(r338831)
+++ head/devel/zpu-binutils/Makefile	Sun Jan  5 23:22:14 2014	(r338832)
@@ -10,33 +10,28 @@ DISTNAME=	zpu-toolchain-${PORTVERSION}
 MAINTAINER=	db at 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>

Modified: head/devel/zpu-binutils/files/patch-binutils_Makefile.in
==============================================================================
--- head/devel/zpu-binutils/files/patch-binutils_Makefile.in	Sun Jan  5 23:08:44 2014	(r338831)
+++ head/devel/zpu-binutils/files/patch-binutils_Makefile.in	Sun Jan  5 23:22:14 2014	(r338832)
@@ -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)" \

Modified: head/devel/zpu-binutils/files/patch-build.sh
==============================================================================
--- head/devel/zpu-binutils/files/patch-build.sh	Sun Jan  5 23:08:44 2014	(r338831)
+++ head/devel/zpu-binutils/files/patch-build.sh	Sun Jan  5 23:22:14 2014	(r338832)
@@ -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

Modified: head/devel/zpu-binutils/pkg-plist
==============================================================================
--- head/devel/zpu-binutils/pkg-plist	Sun Jan  5 23:08:44 2014	(r338831)
+++ head/devel/zpu-binutils/pkg-plist	Sun Jan  5 23:22:14 2014	(r338832)
@@ -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
- at dirrmtry zpu/man/man1
- at dirrmtry zpu/man
- at dirrmtry zpu/bin
- at 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
- at dirrmtry zpu/zpu-elf/bin
 @dirrmtry zpu/zpu-elf/lib
+ at dirrmtry zpu/zpu-elf/bin
 @dirrmtry zpu/zpu-elf
+ at dirrmtry zpu/share/locale/zh_CN/LC_MESSAGES
+ at dirrmtry zpu/share/locale/zh_CN
 @dirrmtry zpu/share/locale/tr/LC_MESSAGES
 @dirrmtry zpu/share/locale/tr
- at dirrmtry zpu/share/locale/fr/LC_MESSAGES
- at dirrmtry zpu/share/locale/fr
- at dirrmtry zpu/share/locale/ja/LC_MESSAGES
- at dirrmtry zpu/share/locale/ja
- at dirrmtry zpu/share/locale/es/LC_MESSAGES
- at dirrmtry zpu/share/locale/es
 @dirrmtry zpu/share/locale/sv/LC_MESSAGES
 @dirrmtry zpu/share/locale/sv
- at dirrmtry zpu/share/locale/da/LC_MESSAGES
- at dirrmtry zpu/share/locale/da
- at dirrmtry zpu/share/locale/zh_CN/LC_MESSAGES
- at dirrmtry zpu/share/locale/zh_CN
+ at dirrmtry zpu/share/locale/ru/LC_MESSAGES
+ at dirrmtry zpu/share/locale/ru
 @dirrmtry zpu/share/locale/ro/LC_MESSAGES
 @dirrmtry zpu/share/locale/ro
- at dirrmtry zpu/share/locale/de/LC_MESSAGES
- at dirrmtry zpu/share/locale/de
- at dirrmtry zpu/share/locale/id/LC_MESSAGES
- at 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
- at dirrmtry zpu/share/locale/ru/LC_MESSAGES
- at dirrmtry zpu/share/locale/ru
+ at dirrmtry zpu/share/locale/ja/LC_MESSAGES
+ at dirrmtry zpu/share/locale/ja
+ at dirrmtry zpu/share/locale/id/LC_MESSAGES
+ at dirrmtry zpu/share/locale/id
+ at dirrmtry zpu/share/locale/fr/LC_MESSAGES
+ at dirrmtry zpu/share/locale/fr
+ at dirrmtry zpu/share/locale/es/LC_MESSAGES
+ at dirrmtry zpu/share/locale/es
+ at dirrmtry zpu/share/locale/de/LC_MESSAGES
+ at dirrmtry zpu/share/locale/de
+ at dirrmtry zpu/share/locale/da/LC_MESSAGES
+ at dirrmtry zpu/share/locale/da
 @dirrmtry zpu/share/locale
 @dirrmtry zpu/share
+ at dirrmtry zpu/man/man1
+ at dirrmtry zpu/man
+ at dirrmtry zpu/lib
+ at dirrmtry zpu/bin
 @dirrmtry zpu
+ at dirrmtry info/zpu
