ports/172422: [PATCH] devel/binutils: Converting port to new options framework

[Michael Gmelin]

>Number:         172422
>Category:       ports
>Synopsis:       [PATCH] devel/binutils: Converting port to new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 07 04:20:15 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Michael Gmelin
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD bsd64.grem.de 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

The patch below converts the port to use the new options framework[1]
and converts the Makefile header to the new format[2].

The patch is to be applied using:

patch -p0 -E </path/to/patchfile

Please note that using OptionsNg there is no way of defining NLS to be
Off by default. If this is a problem a different approach should be
taken.

See also:
1. http://lists.freebsd.org/pipermail/freebsd-ports/2012-October/078676.html
2. http://lists.freebsd.org/pipermail/freebsd-ports/2012-August/077801.html



Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- binutils-2.22_1.patch begins here ---
diff -ruN --exclude=CVS ../binutils.orig/Makefile ./Makefile
--- ../binutils.orig/Makefile	2012-10-07 02:07:53.285200630 +0200
+++ ./Makefile	2012-10-07 02:33:28.675214165 +0200
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	binutils
-# Date created:		9 July 2009
-# Whom:			Martin Matuska <mm at FreeBSD.org>
-#
-# $FreeBSD: ports/devel/binutils/Makefile,v 1.19 2012/09/04 06:45:40 mm Exp $
-#
+# Created by: Martin Matuska <mm at FreeBSD.org>
+# $FreeBSD: $
 
 PORTNAME=	binutils
 PORTVERSION=	2.22
@@ -23,7 +19,7 @@
 
 CONFLICTS=	libbfd-[0-9]*
 
-OPTIONS=	NLS "Enable National Language Support" off
+OPTIONS_DEFINE=	NLS
 
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
@@ -69,7 +65,7 @@
 		configure \
 		ld
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # Actual earliest version may differ slightly
 .if ${OSVERSION} >= 900044
@@ -79,7 +75,7 @@
 PLIST_SUB+=	GOLD="@comment "
 .endif
 
-.if defined(WITH_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -100,4 +96,4 @@
 	@${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} -type d | \
 		${SED} -e 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- binutils-2.22_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: