[pkgsrc/trunk]: pkgsrc/lang Rename option "gcc-c++" to "gcc-cpp" (with legacy...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75a10e560f96
branches:  trunk
changeset: 601946:75a10e560f96
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Wed Apr 04 22:18:29 2012 +0000

description:
Rename option "gcc-c++" to "gcc-cpp" (with legacy support) as pkglint
complains with: "gcc-c++" is not a valid option name.

diffstat:

 lang/gcc44/options.mk |  15 ++++++++-------
 lang/gcc46/options.mk |  15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diffs (84 lines):

diff -r 2ca494df1e5d -r 75a10e560f96 lang/gcc44/options.mk
--- a/lang/gcc44/options.mk     Wed Apr 04 22:12:25 2012 +0000
+++ b/lang/gcc44/options.mk     Wed Apr 04 22:18:29 2012 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.7 2012/01/14 02:09:36 hans Exp $
+# $NetBSD: options.mk,v 1.8 2012/04/04 22:18:29 sbd Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc44
-PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
-PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-java gcc-objc
+PKG_SUPPORTED_OPTIONS= nls gcc-cpp gcc-fortran gcc-java gcc-objc #gcc-ada
+PKG_SUGGESTED_OPTIONS= gcc-cpp gcc-fortran gcc-java gcc-objc
+PKG_OPTIONS_LEGACY_OPTS= gcc-c++:gcc-cpp
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        nls
 .endif
 
-PKG_OPTIONS_LEGACY_VARS+=      BUILD_CXX:gcc-c++
+PKG_OPTIONS_LEGACY_VARS+=      BUILD_CXX:gcc-cpp
 PKG_OPTIONS_LEGACY_VARS+=      BUILD_FORTRAN:gcc-fortran
 PKG_OPTIONS_LEGACY_VARS+=      BUILD_JAVA:gcc-java
 PKG_OPTIONS_LEGACY_VARS+=      BUILD_OBJC:gcc-objc
@@ -35,8 +36,8 @@
 LANGS=                 c
 
 .if !empty(PKG_OPTIONS:Mgcc-java)
-.  if empty(PKG_OPTIONS:Mgcc-c++)
-PKG_OPTIONS+=          gcc-c++
+.  if empty(PKG_OPTIONS:Mgcc-cpp)
+PKG_OPTIONS+=          gcc-cpp
 .  endif
 
 LANGS+=                        java
@@ -63,7 +64,7 @@
 .include "../../lang/python/application.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mgcc-c++)
+.if !empty(PKG_OPTIONS:Mgcc-cpp)
 LANGS+=                        c++
 USE_TOOLS+=            perl
 CONFIGURE_ARGS+=       --enable-__cxa_atexit
diff -r 2ca494df1e5d -r 75a10e560f96 lang/gcc46/options.mk
--- a/lang/gcc46/options.mk     Wed Apr 04 22:12:25 2012 +0000
+++ b/lang/gcc46/options.mk     Wed Apr 04 22:18:29 2012 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2012/01/14 02:09:36 hans Exp $
+# $NetBSD: options.mk,v 1.5 2012/04/04 22:20:37 sbd Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc46
-PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
-PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc
+PKG_SUPPORTED_OPTIONS= nls gcc-cpp gcc-fortran gcc-java gcc-objc #gcc-ada
+PKG_SUGGESTED_OPTIONS= gcc-cpp gcc-fortran gcc-objc
+PKG_OPTIONS_LEGACY_OPTS= gcc-c++:gcc-cpp
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        nls
 .endif
 
-PKG_OPTIONS_LEGACY_VARS+=      BUILD_CXX:gcc-c++
+PKG_OPTIONS_LEGACY_VARS+=      BUILD_CXX:gcc-cpp
 PKG_OPTIONS_LEGACY_VARS+=      BUILD_FORTRAN:gcc-fortran
 PKG_OPTIONS_LEGACY_VARS+=      BUILD_JAVA:gcc-java
 PKG_OPTIONS_LEGACY_VARS+=      BUILD_OBJC:gcc-objc
@@ -36,8 +37,8 @@
 LANGS=                 c
 
 .if !empty(PKG_OPTIONS:Mgcc-java)
-.  if empty(PKG_OPTIONS:Mgcc-c++)
-PKG_OPTIONS+=          gcc-c++
+.  if empty(PKG_OPTIONS:Mgcc-cpp)
+PKG_OPTIONS+=          gcc-cpp
 .  endif
 
 LANGS+=                        java
@@ -64,7 +65,7 @@
 .include "../../lang/python/application.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mgcc-c++)
+.if !empty(PKG_OPTIONS:Mgcc-cpp)
 LANGS+=                        c++
 USE_TOOLS+=            perl
 CONFIGURE_ARGS+=       --enable-__cxa_atexit