[pkgsrc/trunk]: pkgsrc/devel/gmake Use options framework for NLS support. Ena...

[hans <hans%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f8a0843ad1b9
branches:  trunk
changeset: 595922:f8a0843ad1b9
user:      hans <hans%pkgsrc.org@localhost>
date:      Sat Nov 26 19:01:15 2011 +0000

description:
Use options framework for NLS support. Enable by default on NetBSD, but
not on other platforms.

diffstat:

 devel/gmake/Makefile   |  18 +++---------------
 devel/gmake/options.mk |  23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diffs (69 lines):

diff -r 587fe6edd8c9 -r f8a0843ad1b9 devel/gmake/Makefile
--- a/devel/gmake/Makefile      Sat Nov 26 18:38:05 2011 +0000
+++ b/devel/gmake/Makefile      Sat Nov 26 19:01:15 2011 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2011/07/09 16:25:35 bsiegert Exp $
+# $NetBSD: Makefile,v 1.79 2011/11/26 19:01:15 hans Exp $
 
 DISTNAME=      make-3.82
 PKGNAME=       g${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
 EXTRACT_SUFX=  .tar.bz2
@@ -25,6 +25,7 @@
 TEST_TARGET=           check
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
 CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX:Q}
@@ -40,19 +41,6 @@
 
 PLIST_SRC=             ${PKGDIR}/PLIST
 
-GMAKE_LOCALE?=         yes
-BUILD_DEFS+=           GMAKE_LOCALE
-MAKEFLAGS+=            GMAKE_LOCALE=${GMAKE_LOCALE:Q}
-.if !empty(GMAKE_LOCALE:M[yY][eE][sS])
-USE_PKGLOCALEDIR=              yes
-PLIST_SRC+=                    ${PKGDIR}/PLIST.locale
-USE_TOOLS+=                    msgfmt
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-libintl
-CONFIGURE_ARGS+=       --without-libiconv
-.endif
-
 .if ${OPSYS} == "MirBSD"
 # workaround for broken strndup
 CONFIGURE_ARGS+=       ac_cv_func_strndup=no
diff -r 587fe6edd8c9 -r f8a0843ad1b9 devel/gmake/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gmake/options.mk    Sat Nov 26 19:01:15 2011 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2011/11/26 19:01:15 hans Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gmake
+PKG_SUPPORTED_OPTIONS= nls
+PKG_SUGGESTED_OPTIONS= 
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=        nls
+.endif
+
+PKG_OPTIONS_LEGACY_VARS=       GMAKE_LOCALE
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnls)
+USE_PKGLOCALEDIR=              yes
+PLIST_SRC+=                    ${PKGDIR}/PLIST.locale
+USE_TOOLS+=                    msgfmt
+.  include "../../devel/gettext-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-libintl-prefix
+CONFIGURE_ARGS+=       --without-libiconv-prefix
+CONFIGURE_ARGS+=       --disable-nls
+.endif