Wed Jul 13 13:13:43 2011 UTC ()
Prefix the gcc options with gcc- and add descriptions for each option.
Requested by wiz.


(hans)
diff -r1.4 -r1.5 pkgsrc/lang/gcc44/options.mk
diff -r1.363 -r1.364 pkgsrc/mk/defaults/options.description
cvs diff -r1.4 -r1.5 pkgsrc/lang/gcc44/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/options.mk 2011/07/12 18:05:58 1.4
+++ pkgsrc/lang/gcc44/Attic/options.mk 2011/07/13 13:13:43 1.5
@@ -1,59 +1,59 @@ @@ -1,59 +1,59 @@
1# $NetBSD: options.mk,v 1.4 2011/07/12 18:05:58 hans Exp $ 1# $NetBSD: options.mk,v 1.5 2011/07/13 13:13:43 hans Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44
4PKG_SUPPORTED_OPTIONS= nls c++ fortran java objc #ada 4PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
5PKG_SUGGESTED_OPTIONS= c++ fortran java objc 5PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-java gcc-objc
6.if ${OPSYS} == "NetBSD" 6.if ${OPSYS} == "NetBSD"
7PKG_SUGGESTED_OPTIONS+= nls 7PKG_SUGGESTED_OPTIONS+= nls
8.endif 8.endif
9 9
10PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:c++ 10PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++
11PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:fortran 11PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran
12PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:java 12PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java
13PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:objc 13PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc
14 14
15.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
16 16
17### 17###
18### Native Language Support 18### Native Language Support
19### 19###
20.if !empty(PKG_OPTIONS:Mnls) 20.if !empty(PKG_OPTIONS:Mnls)
21CONFIGURE_ARGS+= --enable-nls 21CONFIGURE_ARGS+= --enable-nls
22USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
23.include "../../converters/libiconv/buildlink3.mk" 23.include "../../converters/libiconv/buildlink3.mk"
24.include "../../devel/gettext-lib/buildlink3.mk" 24.include "../../devel/gettext-lib/buildlink3.mk"
25.else 25.else
26CONFIGURE_ARGS+= --disable-nls 26CONFIGURE_ARGS+= --disable-nls
27.endif 27.endif
28 28
29### 29###
30### Optional languages 30### Optional languages
31### Ada could be added although there is a bootstrapping issue. See 31### Ada could be added although there is a bootstrapping issue. See
32### ../gcc34-ada for guidance 32### ../gcc34-ada for guidance
33### 33###
34 34
35LANGS= c 35LANGS= c
36 36
37.if !empty(PKG_OPTIONS:Mjava) 37.if !empty(PKG_OPTIONS:Mgcc-java)
38. if empty(PKG_OPTIONS:Mc++) 38. if empty(PKG_OPTIONS:Mgcc-c++)
39PKG_OPTIONS+= c++ 39PKG_OPTIONS+= gcc-c++
40. endif 40. endif
41LANGS+= java 41LANGS+= java
42REPLACE_PYTHON= libjava/contrib/aot-compile.in 42REPLACE_PYTHON= libjava/contrib/aot-compile.in
43.endif 43.endif
44 44
45.if !empty(PKG_OPTIONS:Mc++) 45.if !empty(PKG_OPTIONS:Mgcc-c++)
46LANGS+= c++ 46LANGS+= c++
47.endif 47.endif
48 48
49.if !empty(PKG_OPTIONS:Mfortran) 49.if !empty(PKG_OPTIONS:Mgcc-fortran)
50LANGS+= fortran 50LANGS+= fortran
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Mobjc) 53.if !empty(PKG_OPTIONS:Mgcc-objc)
54LANGS+= objc 54LANGS+= objc
55.endif 55.endif
56 56
57#.if !empty(PKG_OPTIONS:Mada) 57#.if !empty(PKG_OPTIONS:Mgcc-ada)
58#LANGS+= ada 58#LANGS+= ada
59#.endif 59#.endif
cvs diff -r1.363 -r1.364 pkgsrc/mk/defaults/options.description (expand / switch to unified diff)

--- pkgsrc/mk/defaults/options.description 2011/06/19 10:10:02 1.363
+++ pkgsrc/mk/defaults/options.description 2011/07/13 13:13:43 1.364
@@ -145,26 +145,31 @@ fam Support using File Alteration Moni @@ -145,26 +145,31 @@ fam Support using File Alteration Moni
145farsight Enable farsight2 support. 145farsight Enable farsight2 support.
146fastcgi Use FastCGI as the CGI manager. 146fastcgi Use FastCGI as the CGI manager.
147fd-small Build smaller misc/fd package. 147fd-small Build smaller misc/fd package.
148ffmpeg Enable ffmpeg support. 148ffmpeg Enable ffmpeg support.
149fftw Use the fftw library for Discrete Fourier Transforms. 149fftw Use the fftw library for Discrete Fourier Transforms.
150finger Enable finger support. 150finger Enable finger support.
151firefox Use firefox as gecko rendering engine. 151firefox Use firefox as gecko rendering engine.
152firefox3 Use firefox3 as gecko rendering engine. 152firefox3 Use firefox3 as gecko rendering engine.
153flac Enable FLAC support. 153flac Enable FLAC support.
154freeradius-simul-use Enable Simultaneous-Use. 154freeradius-simul-use Enable Simultaneous-Use.
155freetype Enable freetype support. 155freetype Enable freetype support.
156ftp Enable File Transfer Protocol (FTP) support. 156ftp Enable File Transfer Protocol (FTP) support.
157fts Enable full-text searching. 157fts Enable full-text searching.
 158gcc-ada Build the gcc Ada frontend and libraries.
 159gcc-c++ Build the gcc C++ frontend and libraries.
 160gcc-fortran Build the gcc Fortran frontend and libraries.
 161gcc-java Build the gcc Java frontend, tools and libraries.
 162gcc-objc Build the gcc Objective-C frontend and libraries.
158gd Use GD to render graphical output. 163gd Use GD to render graphical output.
159gdal Use the GDAL library. 164gdal Use the GDAL library.
160gdb6-tui Build the tui application. 165gdb6-tui Build the tui application.
161gdbm Use the GNU gdbm database library. 166gdbm Use the GNU gdbm database library.
162gdk-pixbuf Use gdk-pixbuf as imaging library. 167gdk-pixbuf Use gdk-pixbuf as imaging library.
163geoip Enable IP-to-country-lookup using the GeoIP C library. 168geoip Enable IP-to-country-lookup using the GeoIP C library.
164ggi Enable GGI support. 169ggi Enable GGI support.
165ghostscript Enable GhostScript support. 170ghostscript Enable GhostScript support.
166gif Enable GIF support. 171gif Enable GIF support.
167gimp Enable GIMP support. 172gimp Enable GIMP support.
168gimp1-helpbrowser Link against gnome1 to get a help browser. 173gimp1-helpbrowser Link against gnome1 to get a help browser.
169gmp Enable gmp (GNU Multiple Precision Arithmetic Library) support. 174gmp Enable gmp (GNU Multiple Precision Arithmetic Library) support.
170gmp-fat Build-in all x86 assembler code, detecting CPU at run-time. 175gmp-fat Build-in all x86 assembler code, detecting CPU at run-time.