converters/libiconv:

- Remove const qualifier from iconv(3) to match POSIX:
  http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
- Patch iconv.h to expose more GNU extensions when LIBICONV_PLUG is
  defined because the base system iconv supports these extensions too.

Add/remove patches to/from ports to call iconv with non-const arguments.

This breaks some ports on FreeBSD 10 because base system iconv.h still has
the const qualifier.  Fix this by letting USES=iconv add a build dependency
on converters/libiconv so ports can use its iconv.h (with LIBICONV_PLUG
defined) instead of the base system iconv.h.

This exposed some ports that link with libiconv when it is available instead
of using libc iconv.  In these cases one of the following changes has been
made:
- patch configure scripts to test for libc iconv first
- add ac_cv_lib_iconv_libiconv=no or similar to CONFIGURE_ARGS to disable
  some configure tests
- converters/wkhtmltopdf: this includes Qt4 so add a patch from devel/qt4
- lang/gcc5-aux: respect CFLAGS and friends during configure such that
  LIBICONV_PLUG is defined in the iconv test, also switch to external
  gettext
- mail/gnarwl: replace patches with CPPFLAGS/LIBS
- multimedia/ffmpeg2theora: remove iconv test from SConstruct and use
  ICONV_LIB in port Makefile instead, also fix a bug in subtitles.c
- net-im/licq: finish conversion to cmake
- net-mgmt/bandwidthd, net-mgmt/icinga, net-mgmt/nagios, net-mgmt/nagios4:
  don't need iconv
- textproc/p5-XML-TinyXML: finish conversion to USES=perl5

Other changes:
- databases/qdbm and slaves: respect CFLAGS and friends, also enable bzip2
  and lzo support
- games/ldmud: respect CFLAGS and friends
- graphics/inventor: replace some patches with MAKE_ARGS/MAKE_ENV to respect
  CFLAGS and friends, also remove FreeBSD/alpha patch and add missing xorg
  dependencies

PR:		199099
Exp-run by:	antoine
Approved by:	portmgr (antoine)

6 files changed, 20 insertions, 163 deletions

diff --git a/graphics/inventor/files/patch-SoText2.c++ b/graphics/inventor/files/patch-SoText2.c++
index bd890bf99a7d..4258bddfb534 100644
--- a/graphics/inventor/files/patch-SoText2.c++
+++ b/graphics/inventor/files/patch-SoText2.c++
@@ -1,23 +1,6 @@
 *** lib/database/src/so/nodes/SoText2.c++.orig	Tue Sep 25 00:45:41 2001
 --- lib/database/src/so/nodes/SoText2.c++	Mon Dec 23 13:28:11 2002
 ***************
-*** 778,784 ****
-  	size_t outbytes = 2*inbytes+2;
-  	char* output = (char*)UCSStrings[i];
-      
-! 	if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){
-  #ifdef DEBUG
-  	    SoDebugError::post("SoBitmapFontCache::convertToUCS", 
-  		"Error converting text to UCS-2");
---- 778,784 ----
-  	size_t outbytes = 2*inbytes+2;
-  	char* output = (char*)UCSStrings[i];
-      
-! 	if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){
-  #ifdef DEBUG
-  	    SoDebugError::post("SoBitmapFontCache::convertToUCS", 
-  		"Error converting text to UCS-2");
-***************
 *** 1498,1503 ****
 --- 1498,1504 ----
       // And some font library stuff:
diff --git a/graphics/inventor/files/patch-SoText3.c++ b/graphics/inventor/files/patch-SoText3.c++
deleted file mode 100644
index e5be93d7a900..000000000000
--- a/graphics/inventor/files/patch-SoText3.c++
+++ /dev/null
@@ -1,19 +0,0 @@
-*** lib/database/src/so/nodes/SoText3.c++.orig	Mon Dec 23 13:37:59 2002
---- lib/database/src/so/nodes/SoText3.c++	Mon Dec 23 13:38:15 2002
-***************
-*** 2291,2297 ****
-  	size_t outbytes = 2*inbytes+2;
-  	char* output = (char*)UCSStrings[i];
-      
-! 	if ((iconv(conversionCode, &input, &inbytes, &output, &outbytes) == (size_t)-1)){
-  #ifdef DEBUG
-  	    SoDebugError::post("SoOutlineFontCache::convertToUCS", 
-  		"Error converting text to UCS-2");
---- 2291,2297 ----
-  	size_t outbytes = 2*inbytes+2;
-  	char* output = (char*)UCSStrings[i];
-      
-! 	if ((iconv(conversionCode, (const char **)&input, &inbytes, &output, &outbytes) == (size_t)-1)){
-  #ifdef DEBUG
-  	    SoDebugError::post("SoOutlineFontCache::convertToUCS", 
-  		"Error converting text to UCS-2");
diff --git a/graphics/inventor/files/patch-TextWrapper.c++ b/graphics/inventor/files/patch-TextWrapper.c++
deleted file mode 100644
index 29a30fcebffe..000000000000
--- a/graphics/inventor/files/patch-TextWrapper.c++
+++ /dev/null
@@ -1,36 +0,0 @@
-*** apps/demos/textomatic/TextWrapper.c++.orig	Thu Jan  2 15:29:27 2003
---- apps/demos/textomatic/TextWrapper.c++	Thu Jan  2 15:31:00 2003
-***************
-*** 77,83 ****
-      char    *output       = outbuf;
-      //
-      if ( global_iconvCodeL2 == (iconv_t)-1   ||
-! 	 iconv(global_iconvCodeL2,&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 )
-      {
-  	 fprintf( stderr, "textomatic: iconv error.\n" );
-  	 (*(UCS2 *)outbuf)=0;
---- 77,83 ----
-      char    *output       = outbuf;
-      //
-      if ( global_iconvCodeL2 == (iconv_t)-1   ||
-! 	 iconv(global_iconvCodeL2,(const char **)&input,&inbytesleft,&output,&outbytesleft) == (size_t)-1 )
-      {
-  	 fprintf( stderr, "textomatic: iconv error.\n" );
-  	 (*(UCS2 *)outbuf)=0;
-***************
-*** 229,235 ****
-  	char    *output       = outbuf;
-  	//
-  	if ( global_iconvCode28 == (iconv_t)-1   ||
-! 	     iconv( global_iconvCode28,&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 )
-  	{
-  	     fprintf( stderr, "textomatic: iconv error.\n" );
-  	     (*(UCS2 *)outbuf)=0;
---- 229,235 ----
-  	char    *output       = outbuf;
-  	//
-  	if ( global_iconvCode28 == (iconv_t)-1   ||
-! 	     iconv( global_iconvCode28,(const char **)&input,&inbytesleft,&output,&outbytesleft ) == (size_t)-1 )
-  	{
-  	     fprintf( stderr, "textomatic: iconv error.\n" );
-  	     (*(UCS2 *)outbuf)=0;
diff --git a/graphics/inventor/files/patch-ivcommondefs b/graphics/inventor/files/patch-ivcommondefs
index c894661c958b..52404fcd9fdc 100644
--- a/graphics/inventor/files/patch-ivcommondefs
+++ b/graphics/inventor/files/patch-ivcommondefs
@@ -1,82 +1,30 @@
---- make/ivcommondefs.orig	Sat Jul 12 07:40:54 2003
-+++ make/ivcommondefs	Sun Aug  3 15:10:28 2003
-@@ -49,9 +49,9 @@
- 
- ifeq ($(usingLinux), 1)
- 
--CC  = /usr/bin/gcc
--C++ = /usr/bin/g++
--LD  = /usr/bin/g++
-+CC  = %%CC%%
-+C++ = %%CXX%%
-+LD  = %%CXX%%
- 
- INSTALL = /usr/bin/install
- 
-@@ -74,7 +74,7 @@
- LCXXOPTS += $(LINUXOPTS)
- LCOPTS += $(LINUXOPTS)
- 
--X11DIR = /usr/X11R6
-+X11DIR = ${LOCALBASE}
- X11INCDIR = $(X11DIR)/include
- X11LIBDIR = $(X11DIR)/lib
- 
-@@ -86,6 +86,10 @@
- 
- endif
- 
-+ifeq ($(usingFreeBSD), 1)
-+LCINCS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-+LCXXINCS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-+endif
- 
- 
- #
-@@ -131,9 +135,9 @@
+--- make/ivcommondefs.orig	2003-07-11 22:40:54 UTC
++++ make/ivcommondefs
+@@ -131,9 +131,9 @@ endif
  # Determine optimization from LIBTYPE.
  #
  
 -OPTIMIZER = -O -DNDEBUG
-+OPTIMIZER = %%CXXFLAGS%% -DNDEBUG
++OPTIMIZER = -DNDEBUG
  ifneq (, $(findstring debug, $(LIBTYPE)))
 -OPTIMIZER = -g
-+OPTIMIZER = %%CXXFLAGS%% -g -DDEBUG
++OPTIMIZER = -DDEBUG
  endif
  
  
-@@ -158,6 +162,10 @@
- # Font library directories.
+@@ -206,12 +206,6 @@ IVDEMODATADIR = $(IVDEMODIR)/data/Invent
+ # Locate installed Inventor libraries when linking applications.
  #
  
-+ifeq ($(usingFreeBSD), 1)
-+FREETYPE=1
-+endif
-+
- FLDIR = $(IVDEPTH)/libFL/src
- FLLIB = -lFL
- ifdef FREETYPE
-@@ -183,7 +191,12 @@
- # Inventor install directories.
- #
- 
-+ifeq ($(usingFreeBSD), 1)
-+IVPREFIX = ${PREFIX}
-+else
- IVPREFIX = /usr
-+endif
-+
- LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
- LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
- 
-@@ -213,5 +226,10 @@
- else
- LLDDSOOPTS += -L$(IVLIBDIR)
- LLDOPTS += -L$(IVLIBDIR)
-+endif
-+
-+ifeq ($(usingFreeBSD), 1)
+-ifneq (, $(findstring debug, $(LIBTYPE)))
+-LLDDSOOPTS += -L$(IVDLIBDIR)
+-LLDOPTS += -L$(IVDLIBDIR)
+-CXXDSOOPTS += -L$(IVDLIBDIR)
+-else
+-LLDDSOOPTS += -L$(IVLIBDIR)
+-LLDOPTS += -L$(IVLIBDIR)
+-CXXDSOOPTS += -L$(IVLIBDIR)
+-endif
++LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
 +LLDOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
-+LLDDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt -L$(LOCALBASE)/lib
- CXXDSOOPTS += -L$(IVLIBDIR)
- endif
++CXXDSOOPTS += -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
diff --git a/graphics/inventor/files/patch-machine.h b/graphics/inventor/files/patch-machine.h
index a18f79e74d62..1279ab8c1380 100644
--- a/graphics/inventor/files/patch-machine.h
+++ b/graphics/inventor/files/patch-machine.h
@@ -9,26 +9,7 @@
  
  #define MACHINE_WORD_FORMAT	DGL_LITTLE_ENDIAN
  #define MACHINE_FLOAT_FORMAT	DGL_NON_IEEE
-@@ -152,6 +152,18 @@
- 
- 
- /*
-+ * Alpha under FreeBSD
-+ */
-+
-+#if __alpha__ && __FreeBSD__
-+
-+#define MACHINE_WORD_FORMAT	DGL_LITTLE_ENDIAN
-+#define MACHINE_FLOAT_FORMAT	DGL_NON_IEEE
-+
-+#endif /* __alpha__ && __FreeBSD__ */
-+
-+
-+/*
-  * Apple Darwin (Mac OS X) machine dependent setup
-  */
- 
-@@ -321,7 +333,7 @@
+@@ -321,7 +321,7 @@
   */
  
  #if MACHINE_FLOAT_FORMAT == DGL_NON_IEEE
diff --git a/graphics/inventor/files/pkg-message.in b/graphics/inventor/files/pkg-message.in
index c3dbe6ba69a7..0eb31adfcaf2 100644
--- a/graphics/inventor/files/pkg-message.in
+++ b/graphics/inventor/files/pkg-message.in
@@ -3,7 +3,7 @@
 
 Please set the environment variable FL_FONT_PATH to the directory where your
 TrueType fonts are installed. If you do not set this variable, Open Inventor(TM)
-will use %%PREFIX%%/lib/X11/fonts/TTF as default.
+will use %%PREFIX%%/share/fonts/TTF as default.
 
 Open Inventor (TM) needs the following TrueType fonts: