[pkgsrc/trunk]: pkgsrc Prefix the gcc options with gcc- and add descriptions ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/377368849e9e
branches:  trunk
changeset: 590555:377368849e9e
user:      hans <hans%pkgsrc.org@localhost>
date:      Wed Jul 13 13:13:43 2011 +0000

description:
Prefix the gcc options with gcc- and add descriptions for each option.
Requested by wiz.

diffstat:

 lang/gcc44/options.mk           |  28 ++++++++++++++--------------
 mk/defaults/options.description |   5 +++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diffs (76 lines):

diff -r 1f198b1ed368 -r 377368849e9e lang/gcc44/options.mk
--- a/lang/gcc44/options.mk     Wed Jul 13 12:23:33 2011 +0000
+++ b/lang/gcc44/options.mk     Wed Jul 13 13:13:43 2011 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.4 2011/07/12 18:05:58 hans Exp $
+# $NetBSD: options.mk,v 1.5 2011/07/13 13:13:43 hans Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc44
-PKG_SUPPORTED_OPTIONS= nls c++ fortran java objc #ada
-PKG_SUGGESTED_OPTIONS= c++ fortran java objc
+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
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        nls
 .endif
 
-PKG_OPTIONS_LEGACY_VARS+=      BUILD_CXX:c++
-PKG_OPTIONS_LEGACY_VARS+=      BUILD_FORTRAN:fortran
-PKG_OPTIONS_LEGACY_VARS+=      BUILD_JAVA:java
-PKG_OPTIONS_LEGACY_VARS+=      BUILD_OBJC:objc
+PKG_OPTIONS_LEGACY_VARS+=      BUILD_CXX:gcc-c++
+PKG_OPTIONS_LEGACY_VARS+=      BUILD_FORTRAN:gcc-fortran
+PKG_OPTIONS_LEGACY_VARS+=      BUILD_JAVA:gcc-java
+PKG_OPTIONS_LEGACY_VARS+=      BUILD_OBJC:gcc-objc
 
 .include "../../mk/bsd.options.mk"
 
@@ -34,26 +34,26 @@
 
 LANGS=         c
 
-.if !empty(PKG_OPTIONS:Mjava)
-.  if empty(PKG_OPTIONS:Mc++)
-PKG_OPTIONS+=  c++
+.if !empty(PKG_OPTIONS:Mgcc-java)
+.  if empty(PKG_OPTIONS:Mgcc-c++)
+PKG_OPTIONS+=  gcc-c++
 .  endif
 LANGS+=                java
 REPLACE_PYTHON=        libjava/contrib/aot-compile.in
 .endif
 
-.if !empty(PKG_OPTIONS:Mc++)
+.if !empty(PKG_OPTIONS:Mgcc-c++)
 LANGS+=                c++
 .endif
 
-.if !empty(PKG_OPTIONS:Mfortran)
+.if !empty(PKG_OPTIONS:Mgcc-fortran)
 LANGS+=                fortran
 .endif
 
-.if !empty(PKG_OPTIONS:Mobjc)
+.if !empty(PKG_OPTIONS:Mgcc-objc)
 LANGS+=                objc
 .endif
 
-#.if !empty(PKG_OPTIONS:Mada)
+#.if !empty(PKG_OPTIONS:Mgcc-ada)
 #LANGS+=       ada
 #.endif
diff -r 1f198b1ed368 -r 377368849e9e mk/defaults/options.description
--- a/mk/defaults/options.description   Wed Jul 13 12:23:33 2011 +0000
+++ b/mk/defaults/options.description   Wed Jul 13 13:13:43 2011 +0000
@@ -155,6 +155,11 @@
 freetype               Enable freetype support.
 ftp                    Enable File Transfer Protocol (FTP) support.
 fts                    Enable full-text searching.
+gcc-ada                        Build the gcc Ada frontend and libraries.
+gcc-c++                        Build the gcc C++ frontend and libraries.
+gcc-fortran            Build the gcc Fortran frontend and libraries.
+gcc-java               Build the gcc Java frontend, tools and libraries.
+gcc-objc               Build the gcc Objective-C frontend and libraries.
 gd                     Use GD to render graphical output.
 gdal                   Use the GDAL library.
 gdb6-tui               Build the tui application.