Log Message:
Revert the below commit as it has been decided that plus (+) characters are
allowed in option names (pkglint has been updated).

---
   Module Name:	pkgsrc
   Committed By:	sbd
   Date:		Wed Apr  4 22:20:37 UTC 2012

   Modified Files:
   	pkgsrc/lang/gcc46: options.mk

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

   To generate a diff of this commit:
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc46/options.mk