[Midnightbsd-cvs] mports [17622] binutils 2.24

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 27 23:41:59 EDT 2014


Revision: 17622
          http://svnweb.midnightbsd.org/mports/?rev=17622
Author:   laffer1
Date:     2014-09-27 23:41:59 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
binutils 2.24

Modified Paths:
--------------
    trunk/devel/binutils/Makefile
    trunk/devel/binutils/distinfo
    trunk/devel/binutils/files/patch-gold_Makefile.in
    trunk/devel/binutils/files/patch-gold_script.cc
    trunk/devel/binutils/pkg-plist

Removed Paths:
-------------
    trunk/devel/binutils/files/patch-bfd_Makefile.in

Property Changed:
----------------
    trunk/devel/binutils/files/patch-gold_Makefile.in
    trunk/devel/binutils/files/patch-gold_script.cc

Modified: trunk/devel/binutils/Makefile
===================================================================
--- trunk/devel/binutils/Makefile	2014-09-28 03:39:46 UTC (rev 17621)
+++ trunk/devel/binutils/Makefile	2014-09-28 03:41:59 UTC (rev 17622)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	2.23.1
+PORTVERSION=	2.24
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -9,47 +9,34 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNU binary tools
 
-LICENSE=	gpl3
+LICENSE=	gpl3 lgpl3
+LICENSE_COMB=	multi
 
-USES=		gmake tar:bzip2
-USE_BISON=	build
-GNU_CONFIGURE=	yes
-
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \
 		${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr
 
 CONFLICTS=	libbfd-[0-9]*
 
-OPTIONS_DEFINE=       NLS
+OPTIONS_DEFINE=	NLS
 
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
+
+USES=		bison gmake libtool tar:bzip2
+GNU_CONFIGURE=	yes
+
+.if defined(PKGNAMEPREFIX)
+BUTARGET?=	${PKGNAMEPREFIX}${OPSYS:tl}
+OPTIONS_EXCLUDE=	NLS
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
+CONFIGURE_ARGS+=	--disable-shared \
+			--target=${BUTARGET}
+.else
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-system-zlib \
-			--with-sysroot=/ \
-			--disable-werror \
 			--with-gmp=${LOCALBASE} \
 			--with-mpfr=${LOCALBASE}
-
-MAN1=		addr2line.1 \
-		ar.1 \
-		as.1 \
-		c++filt.1 \
-		gprof.1 \
-		dlltool.1 \
-		elfedit.1 \
-		ld.1 \
-		nlmconv.1 \
-		nm.1 \
-		objcopy.1 \
-		objdump.1 \
-		ranlib.1 \
-		readelf.1 \
-		size.1 \
-		strings.1 \
-		strip.1 \
-		windmc.1 \
-		windres.1
-
 INFO=		as \
 		binutils \
 		standards \
@@ -57,7 +44,15 @@
 		bfd \
 		configure \
 		ld
+.endif
 
+CONFIGURE_ARGS+=	--disable-werror \
+			--with-sysroot=/
+
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 .include <bsd.mport.options.mk>
 
 # Actual earliest version may differ slightly
@@ -68,20 +63,14 @@
 PLIST_SUB+=	GOLD="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-freebsd9.1
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd9.1
 .endif
 
-.if ${ARCH} == "amd64"
-ARCH=		x86_64
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd9.1
-.endif
-
 post-install:
+.if !defined(PKGNAMEPREFIX)
 .if ${OSVERSION} >= 4016
 	${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${PREFIX}/include/
 .endif
@@ -89,5 +78,10 @@
 		${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} -type d | \
 		${SED} -e 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
+	${RM} ${PREFIX}/include/ansidecl.h
+	${REINPLACE_CMD} '/#include "ansidecl.h"/d' ${PREFIX}/include/bfd.h
+.else
+	${RM} -rf ${PREFIX}/${PKGNAMEPREFIX:S/-$//}
+.endif
 
 .include <bsd.port.mk>

Modified: trunk/devel/binutils/distinfo
===================================================================
--- trunk/devel/binutils/distinfo	2014-09-28 03:39:46 UTC (rev 17621)
+++ trunk/devel/binutils/distinfo	2014-09-28 03:41:59 UTC (rev 17622)
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.23.1.tar.bz2) = 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
-SIZE (binutils-2.23.1.tar.bz2) = 21455321
+SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+SIZE (binutils-2.24.tar.bz2) = 22716802

Deleted: trunk/devel/binutils/files/patch-bfd_Makefile.in
===================================================================
--- trunk/devel/binutils/files/patch-bfd_Makefile.in	2014-09-28 03:39:46 UTC (rev 17621)
+++ trunk/devel/binutils/files/patch-bfd_Makefile.in	2014-09-28 03:41:59 UTC (rev 17622)
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- bfd/Makefile.in.orig
-+++ bfd/Makefile.in
-@@ -336,7 +336,6 @@
- @INSTALL_LIBBFD_FALSE at noinst_LTLIBRARIES = libbfd.la
- AM_CFLAGS = $(WARN_CFLAGS)
- AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
-- at PLUGINS_TRUE@LIBDL = -ldl
- 
- # bfd.h goes here, for now
- BFD_H = bfd.h

Modified: trunk/devel/binutils/files/patch-gold_Makefile.in
===================================================================
--- trunk/devel/binutils/files/patch-gold_Makefile.in	2014-09-28 03:39:46 UTC (rev 17621)
+++ trunk/devel/binutils/files/patch-gold_Makefile.in	2014-09-28 03:41:59 UTC (rev 17622)
@@ -1,12 +1,11 @@
-
-$FreeBSD$
-
---- gold/Makefile.in.orig
-+++ gold/Makefile.in
-@@ -368,7 +368,6 @@
- 	@INCINTL@
+--- gold/Makefile.in.orig	2013-11-04 16:33:39.000000000 +0100
++++ gold/Makefile.in	2013-12-13 17:15:03.279391312 +0100
+@@ -419,7 +419,7 @@
+ 	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
  
  LIBIBERTY = ../libiberty/libiberty.a
-- at PLUGINS_TRUE@LIBDL = -ldl
+- at PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
++ at PLUGINS_TRUE@LIBDL = 
  @THREADS_TRUE at THREADSLIB = -lpthread
  AM_YFLAGS = -d
+ 


Property changes on: trunk/devel/binutils/files/patch-gold_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/binutils/files/patch-gold_script.cc
===================================================================
--- trunk/devel/binutils/files/patch-gold_script.cc	2014-09-28 03:39:46 UTC (rev 17621)
+++ trunk/devel/binutils/files/patch-gold_script.cc	2014-09-28 03:41:59 UTC (rev 17622)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- gold/script.cc.dist	2012-09-01 19:52:34.000000000 -0500
 +++ gold/script.cc	2012-09-01 19:53:22.000000000 -0500
 @@ -2534,8 +2534,6 @@


Property changes on: trunk/devel/binutils/files/patch-gold_script.cc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/binutils/pkg-plist
===================================================================
--- trunk/devel/binutils/pkg-plist	2014-09-28 03:39:46 UTC (rev 17621)
+++ trunk/devel/binutils/pkg-plist	2014-09-28 03:41:59 UTC (rev 17622)
@@ -2,6 +2,7 @@
 bin/ar
 bin/as
 bin/c++filt
+%%GOLD%%bin/dwp
 bin/elfedit
 bin/gprof
 bin/ld
@@ -15,7 +16,6 @@
 bin/size
 bin/strings
 bin/strip
-include/ansidecl.h
 include/bfd.h
 include/bfdlink.h
 include/dis-asm.h
@@ -22,10 +22,26 @@
 %%GOLD%%include/plugin-api.h
 include/symcat.h
 lib/libbfd.a
-lib/libbfd.la
-lib/libiberty.a
 lib/libopcodes.a
-lib/libopcodes.la
+man/man1/addr2line.1.gz
+man/man1/ar.1.gz
+man/man1/as.1.gz
+man/man1/c++filt.1.gz
+man/man1/gprof.1.gz
+man/man1/dlltool.1.gz
+man/man1/elfedit.1.gz
+man/man1/ld.1.gz
+man/man1/nlmconv.1.gz
+man/man1/nm.1.gz
+man/man1/objcopy.1.gz
+man/man1/objdump.1.gz
+man/man1/ranlib.1.gz
+man/man1/readelf.1.gz
+man/man1/size.1.gz
+man/man1/strings.1.gz
+man/man1/strip.1.gz
+man/man1/windmc.1.gz
+man/man1/windres.1.gz
 %%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/ld.mo
@@ -60,6 +76,7 @@
 %%NLS%%share/locale/ga/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/ld.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/id/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bfd.mo
@@ -124,5 +141,3 @@
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/opcodes.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/ld.mo
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw



More information about the Midnightbsd-cvs mailing list