Upgrade cint from 5.15.174 to 5.16.19

cint is no longer developed upstream and was replaced with cling in root.
Add the latest version available from https://root.cern.ch/download/

New HOMEPAGE ships an unversioned tarball as the latest release, but its
conent is unrecognized and very different from the known cint from the old
cern.ch site.

FreeBSD claims to ship with cint-5.18 and there are references to it, but
it's probably root version 5.18 with possibly extracted files for cint.

If there is a newer version somewhere it will be upgraded later accordingly.

pkgsrc changes:
- refactor configure & build & install stages
- install demo files
- add license
- update DESCR
- new HOMEPAGE
- new MASTER_SITES
- remove conflict with devel/man-pages

Upstream changelog
==================
* 5.16.2, July 14 2005
* 6.1.2, July 14 2005
* -   , Convert most of the C source file from K&R C to Ansi C++
* -     The files *.c were renamed v6_*.cxx.  The interfaces are
* -     kept backward compatible (extern "C")
*
* 5.16.3, November 11, 2005
* 6.1.3, November 11, 2005
* -   , Port to windows visual C++ version 8
* -   , Many bugs fixes (see CVS change log for details)
*
* 5.16.4 November 30, 2005
* 6.1.4 November 30, 2005
* - Add support for generating dictionary using the reflex API (makecint -c3)
* - See CVS Change log for other updates.
*
* 5.16.5 November 30, 2005
* 6.1.5 November 30, 2005
* - Improve support for generating dictionary using the reflex API (makecint -c3)
* - Extend ClassInfo to better support array allocation and deallocation
* - See CVS Change log for other updates.
*
* 5.16.6 January 9, 2006
* 6.1.6 January 9, 2006
* - Import and use the shadow class mechanism from ROOT.  This allows the
*   calculation of the data member offset even if they are protected/private.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.7 January 19, 2006
* 6.1.7 January 19, 2006
* - Many improvement to the shadow class generation.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.8 February 9, 2006
* 6.1.8 February 9, 2006
* - Update and streamline the handling operator new and delete
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.9 March 3, 2006
* 6.1.9 March 3, 2006
* - Upgrade the support for operator new and delete in the dictionaries (improve usage
    of user provided operator new).
* - Add a new command line option (-E) to insure exit on error.
* - Improve error message in case of missing symbols.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.10 March 30, 2006
* 6.1.10 March 30, 2006
* - Refresh of the port to icc and alpha cxx
* - Fix for comment parsing in the CPP parser.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.11 April 14, 2006
* 6.1.10 April 14, 2006
* - Improve template support
* - Port to MacOS on Intel
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.12 May 16, 2006
* 6.1.12 May 16, 2006
* - Add support for variadic functions on AMD64 and EM64T.
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.13 June 8, 2006
* 6.1.13 June 8, 2006
* - New build system based on the configure/make model.  MAKEINFO is not longer used.
* - A few more function has been officially exported and/or added to the appropriate
*   header files
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.14 August 18, 2006
* 6.1.14 August 18, 2006
* - Clarification of the license (Now MIT License)
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.15 September 21, 2006
* 6.1.15 September 21, 2006
* - Various bug fixes (include a couple of cint dlls cleanups)
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.16 November 24, 2006
* 6.1.16 November 24, 2006
* - Some minor bug fixes: remove G__CINTVERSION from strm dict files, AMD64 vararg passing, long comments, extern "C" multiline issue
* - G__sizeof, G__getfunction now part of the API
* - respect system macros when generating dictionaries
* - Move public header files into inc/
* - Changes to achieve binary compatibility with cint7; some of these are temporary
* - Move C++ API into namespace Cint
* - added build support for linux x86_64
* - See CVS Change log for other updates (http://root.cern.ch/root/ChangeLog-cint.phtml)
*
* 5.16.17 December 12, 2006
* 6.1.17 December 12, 2006
* - Some previously publicly visibly types are now private. Please let us know if this
*   causes problems for you!
* - G__MethodInfo::Get/SetUserParam() added
* - extend G__ClassInfo::AddMethod
* - the relevant platform macros are now known to CINT, except when interpreting where the
*   compiler macros (e.g. __GNUC__) are hidden
* - Fix prec_stl for solarisgcc, cygwin (posix)
*
* 5.16.18 February 9, 2007
* 6.1.18 February 9, 2007
* - Fix a few bugs (fix arithmetics involving long double, "!",
*   LL suffix for operators' long long args, quoting of default
*   params,
* - Implement G__pop_tempobject_nodel() to "steal" temp object from CINT
* - modify algo.h's random_shuffle to use new Cint::G__long_random in new v6_random.cxx
* - make G__free_ifunc_table non-recursive
* - for ROOT, use R__HAVE_CONFIG, not HAVE_CONFIG
*
* 5.16.19 March 16, 2007
* 6.1.19 March 16, 2007
* - handle 1dim arrays properly (!= scalar)
* - more memory effient G__param and G__inherit
* - implement forward decl in dictionaries (e.g. if dict for "A* f()" is
*   setup, lib containing A will not be loaded)
* - add a reference layer between API ifunc* and internal ifunc*, so
*   reloading (scrupto of scripts) doesn't invalidate the external
*   ptrs for dependent libs
* - update tagnums below scrupto limit if they are autoload entries
* - allow multiple shared lib init routines
* - bug fixes: fix decl locations in .so-s, distinguish "class*",
*   "decl if unknown" in G__search_tagname
* - split Shadow.h off Api.h
* - remove temporary files on windows once they are unused (fixes problem
*   with tmp file flooding)
*


(kamil)

$NetBSD: patch-Makefile,v 1.1 2016/09/28 10:00:27 kamil Exp $

Fix shell syntax

--- Makefile.orig	2006-11-24 08:41:26.000000000 +0000
+++ Makefile
@@ -38,11 +38,11 @@ include/iosenum.h : cint$(G__CFG_EXEEXT)
 		touch include/iosenum.h; \
 	else \
 		(echo Generating iosenum.h. This might take a while...; \
-		cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..\
+		cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..; \
 		unset VS_UNICODE_OUTPUT; \
 		LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:. \
 		DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:. \
-		./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc iosenum.cxx); \
+		./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc include/iosenum.cxx); \
 	fi)
 	@echo > done
 

$NetBSD: patch-configure,v 1.1 2016/09/28 10:00:27 kamil Exp $

Don't check for running bash on SunOS.
Add NetBSD support.
Fix readlinelib parameter handling.

--- configure.orig	2006-11-24 08:30:23.000000000 +0000
+++ configure
@@ -6,21 +6,9 @@
 #
 ##############################################################
 #
-# This is a bash script, which works with any reasonable sh.
-# Solaris sh is not, so we have to start bash, and call ourselves again.
-
-[ "x$1" != "x__have_the_proper_shell@" ] && ( \
-uname -a | grep -i sunos > /dev/null \
-  && (bash $0 __have_the_proper_shell@ "$*") \
-  || (sh $0 __have_the_proper_shell@ "$*") \
-)
-
-[ "x$1" != "x__have_the_proper_shell@" ] && exit
-shift
-
 # configure settings to build CINT
 
-ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc)
+ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks netbsd hpux aix msvc7 msvc8 solaris solarisgcc)
 
 #############################################################
 ###
@@ -102,6 +90,27 @@ function config_linux {
     config_GCC_defaults
 }
 
+function config_netbsdx8664gcc {
+    config_GCC_defaults
+
+    EXTRA_LIB_DIR=/usr/lib64
+    CPP="gcc -E -C -m64"
+    CXXFLAGS="-m64  -fPIC ${CXXFLAGS}"
+    CFLAGS="-m64  -fPIC ${CFLAGS}"
+    LDFLAGS="-m64 ${LDFLAGS}"
+    DEFAULTLIBS="-lm -lterminfo"
+}
+
+function config_netbsd {
+    config_GCC_defaults
+
+    CPP="gcc -E -C"
+    CXXFLAGS="-fPIC ${CXXFLAGS}"
+    CFLAGS="-fPIC ${CFLAGS}"
+    LDFLAGS="${LDFLAGS}"
+    DEFAULTLIBS="-lm -lterminfo"
+}
+
 function config_linuxx8664gcc {
     config_GCC_defaults
 
@@ -327,6 +336,7 @@ function guess_arch {
 #        freebsd*:*:5*)         arch=freebsd5        ;;
 #        freebsd*:*:4*)         arch=freebsd4        ;;
 #        freebsd*:*:*)          arch=freebsd         ;;
+         netbsd:x86_64:*)       arch=netbsdx8664gcc  ;;
 #        hp-ux:ia64:*)          arch=hpuxia64acc     ;;
 #        hp-ux:*:*)             arch=hpuxacc         ;;
 #        hurd*:*:*)             arch=hurddeb         ;;
@@ -412,7 +422,7 @@ function processflag_cintex_libdir {
     CINTEXLIBDIR=$1
 }
 
-function processflag_readlinelib {
+function processflag_readline {
     READLINELIB=$1
     BUILDREADLINE=
 }
@@ -461,17 +471,22 @@ if [ "$ARCH" = "" ]; then
 fi
 
 if [ "$DEBUG" = "1" ]; then
-    LDFLAGS="$LDDBGFLAGS $LDFLAGS"
-    SOFLAGS="$SODBGFLAGS $SOFLAGS"
-    CFLAGS="$CDBGFLAGS $CFLAGS"
-    CXXFLAGS="$CXXDBGFLAGS $CXXFLAGS"
+    LDFLAGS="$LDDBGFLAGS $LDFLAGS $LDFLAGS_ADD"
+    SOFLAGS="$SODBGFLAGS $SOFLAGS $SOFLAGS_ADD"
+    CFLAGS="$CDBGFLAGS $CFLAGS $CFLAGS_ADD"
+    CXXFLAGS="$CXXDBGFLAGS $CXXFLAGS $CXXFLAGS_ADD"
 else
-    LDFLAGS="$LDOPTFLAGS $LDFLAGS"
-    SOFLAGS="$SOOPTFLAGS $SOFLAGS"
-    CFLAGS="$COPTFLAGS $CFLAGS"
-    CXXFLAGS="$CXXOPTFLAGS $CXXFLAGS"
+    LDFLAGS="$LDOPTFLAGS $LDFLAGS $LDFLAGS_ADD"
+    SOFLAGS="$SOOPTFLAGS $SOFLAGS $SOFLAGS_ADD"
+    CFLAGS="$COPTFLAGS $CFLAGS $CFLAGS_ADD"
+    CXXFLAGS="$CXXOPTFLAGS $CXXFLAGS $CXXFLAGS_ADD"
 fi
 
+echo LDFLAGS=$LDFLAGS
+echo SOFLAGS=$SOFLAGS
+echo CFLAGS=$CFLAGS
+echo CXXFLAGS=$CXXFLAGS
+
 CMACROS="$CMACROS -DG__HAVE_CONFIG -DG__NOMAKEINFO"
 CXXMACROS="$CXXMACROS -DG__HAVE_CONFIG -DG__NOMAKEINFO"
 

$NetBSD: patch-lib_posix_posix.h,v 1.1 2016/09/28 10:00:27 kamil Exp $

Add support for NetBSD

--- lib/posix/posix.h.orig	2006-11-28 15:08:01.000000000 +0000
+++ lib/posix/posix.h
@@ -283,7 +283,7 @@ extern int setpgrp(pid_t _pid,pid_t _pgr
 #endif
 #elif defined(G__SUN) || defined(__sun)
 extern long setpgrp(void);
-#elif defined(G__FBSD)||defined(__FreeBSD__)||defined(G__OBSD)||defined(__OpenBSD__)||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))
+#elif defined(G__FBSD)||defined(__FreeBSD__)||defined(G__NBSD)||defined(__NetBSD__)||defined(G__OBSD)||defined(__OpenBSD__)||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))||((defined(G__alpha)||defined(__alpha))&&defined(G__GNUC))
 extern int setpgrp(pid_t _pid, pid_t _pgrp);
 #elif defined(G__KCC) || defined(__KCC)
 extern pid_t setpgrp(void);

$NetBSD: patch-src_Method.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Add NetBSD support.

--- src/Method.cxx.orig	2007-03-15 17:59:30.000000000 +0000
+++ src/Method.cxx
@@ -515,6 +515,8 @@ long Cint::G__MethodInfo::FilePosition()
       return((long)ifunc->pentry[index]->pos.__pos);
 #elif defined(G__NONSCALARFPOS_QNX)      
       return((long)ifunc->pentry[index]->pos._Off);
+#elif defined(__NetBSD__)
+      return((long)ifunc->pentry[index]->pos._pos);
 #else
       return((long)ifunc->pentry[index]->pos);
 #endif

$NetBSD: patch-src_Type.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Fix syntax.

--- src/Type.cxx.orig	2006-11-29 01:59:05.000000000 +0000
+++ src/Type.cxx
@@ -125,7 +125,7 @@ const char* Cint::G__TypeInfo::TrueName(
   strcpy(G__buf,
 	 G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
   return(G__buf);
-#elif  !defind(G__OLDIMPLEMENTATION401)
+#elif  !defined(G__OLDIMPLEMENTATION401)
   return(G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst));
 #else
   return(G__type2string((int)type,(int)tagnum,-1,(int)reftype));
@@ -138,7 +138,7 @@ const char* Cint::G__TypeInfo::Name() 
   strcpy(G__buf,G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
 			       ,(int)isconst));
   return(G__buf);
-#elif  !defind(G__OLDIMPLEMENTATION401)
+#elif  !defined(G__OLDIMPLEMENTATION401)
   return(G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype
 	,(int)isconst));
 #else
@@ -238,4 +238,3 @@ int Cint::G__TypeInfo::Next()
 {
    return 0;
 }
-

$NetBSD: patch-src_bc__reader.h,v 1.1 2016/09/28 10:00:27 kamil Exp $

Add NetBSD support.

--- src/bc_reader.h.orig	2007-03-15 17:59:30.000000000 +0000
+++ src/bc_reader.h
@@ -66,6 +66,8 @@ class G__fstream {
   #else
      m_pos.__pos = pos; // this is for rest linux distribution
   #endif
+#elif defined(__NetBSD__)
+  m_pos._pos = pos;
 #else
   m_pos = pos;
 #endif

$NetBSD: patch-src_gcc3strm.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Fix build with recent (>3.3) GCC.

--- src/gcc3strm.cxx.orig	2006-09-28 09:01:54.000000000 +0000
+++ src/gcc3strm.cxx
@@ -308,13 +308,13 @@ static int G__G__stream_7_6_0(G__value* 
 
 static int G__G__stream_7_7_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
 {
-      G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) libp->para[0].ref));
+   G__letint(result7, 103, (long) (*(fpos<mbstate_t>*) G__getstructoffset())==(*(fpos<mbstate_t>*) libp->para[0].ref));
    return(1 || funcname || hash || result7 || libp) ;
 }
 
 static int G__G__stream_7_8_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
 {
-      G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
+   G__letint(result7, 103, (long) (*(fpos<mbstate_t>*) G__getstructoffset())!=(*(fpos<mbstate_t>*) libp->para[0].ref));
    return(1 || funcname || hash || result7 || libp) ;
 }
 

$NetBSD: patch-src_v6__loadfile.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Handle BSDs.

--- src/v6_loadfile.cxx.orig	2007-03-15 17:59:30.000000000 +0000
+++ src/v6_loadfile.cxx
@@ -2494,7 +2494,7 @@ char* G__tmpnam(char *name)
   G__tmpfiles.Add(name);
   return(name);
 
-#elif /*defined(G__NEVER) && */ ((__GNUC__>=3)||((__GNUC__>=2)&&(__GNUC_MINOR__>=96)))&&(defined(__linux)||defined(__linux__))
+#elif /*defined(G__NEVER) && */ ((__GNUC__>=3)||((__GNUC__>=2)&&(__GNUC_MINOR__>=96)))&&(defined(__linux)||defined(__linux__)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(__OpenBSD__)||defined(__DragonFly__))
   /* After all, mkstemp creates more problem than a solution. */
   static char tempname[G__MAXFILENAME];
   const char *appendix="_cint";

$NetBSD: patch-src_v6__macro.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Add NetBSD support.

--- src/v6_macro.cxx.orig	2006-11-23 13:34:01.000000000 +0000
+++ src/v6_macro.cxx
@@ -465,6 +465,9 @@ G__value G__execfuncmacro(char *item,int
 #elif defined(G__NONSCALARFPOS_QNX)
     if(call_pos._Off == callfuncmacro->call_pos._Off &&
        G__ifile.filenum == callfuncmacro->call_filenum) {
+#elif defined(__NetBSD__)
+    if(call_pos._pos == callfuncmacro->call_pos._pos &&
+       G__ifile.filenum == callfuncmacro->call_filenum) {
 #else
     if(call_pos == callfuncmacro->call_pos &&
        G__ifile.filenum == callfuncmacro->call_filenum) {
@@ -782,6 +785,9 @@ int G__execfuncmacro_noexec (char* macro
 #elif defined(G__NONSCALARFPOS_QNX)
     if(call_pos._Off == callfuncmacro->call_pos._Off &&
        G__ifile.filenum == callfuncmacro->call_filenum)       
+#elif defined(__NetBSD__)
+    if(call_pos._pos == callfuncmacro->call_pos._pos &&
+       G__ifile.filenum == callfuncmacro->call_filenum)
 #else
     if(call_pos == callfuncmacro->call_pos &&
        G__ifile.filenum == callfuncmacro->call_filenum)

$NetBSD: patch-src_v6__newlink.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Fix C++ syntax: strlen(3), atoi(3), strcpy(3) aren't in the std:: namespace.

--- src/v6_newlink.cxx.orig	2007-03-15 17:59:30.000000000 +0000
+++ src/v6_newlink.cxx
@@ -7014,7 +7014,7 @@ int G__parse_parameter_link(char* paras)
     }
     else {
       if (type_name[0] == '\'') {
-        type_name[std::strlen(type_name)-1] = '\0';
+        type_name[strlen(type_name)-1] = '\0';
         typenum = G__defined_typename(type_name + 1);
       }
       else {
@@ -7022,7 +7022,7 @@ int G__parse_parameter_link(char* paras)
       }
     }
     ch = G__separate_parameter(paras, &os, c_reftype_const);
-    reftype_const = std::atoi(c_reftype_const);
+    reftype_const = atoi(c_reftype_const);
 #ifndef G__OLDIMPLEMENTATION1861
     if (typenum != -1) {
       reftype_const += G__newtype.isconst[typenum] * 10;
@@ -7037,14 +7037,14 @@ int G__parse_parameter_link(char* paras)
       para_default = (G__value*) -1;
       // The parameter default text will be quoted if it
       // contains spaces, we must remove the quotes.
-      int len = std::strlen(c_default);
+      int len = strlen(c_default);
       //assert(len > 2);
       if (len > 1 && (c_default[0] == '\'' || c_default[0] == '\"')) {
         c_default[len-1] = '\0';
         // The source and destination overlap, do it carefully.
         char buf[G__MAXNAME*2];
-        std::strcpy(buf, ((char*) c_default) + 1);
-        std::strcpy(c_default, buf);
+        strcpy(buf, ((char*) c_default) + 1);
+        strcpy(c_default, buf);
       }
     }
     ch = G__separate_parameter(paras, &os, c_paraname);

$NetBSD: patch-src_v6__parse.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Add NetBSD support.

--- src/v6_parse.cxx.orig	2007-03-15 17:59:30.000000000 +0000
+++ src/v6_parse.cxx
@@ -297,6 +297,8 @@ int G__ignore_catch()
     G__asm_inst[G__asm_cp+3]=(long)fpos1.__pos;
 #elif defined(G__NONSCALARFPOS_QNX)
     G__asm_inst[G__asm_cp+3]=(long)fpos1._Off;
+#elif defined(__NetBSD__)
+    G__asm_inst[G__asm_cp+3]=(long)fpos1._pos;
 #else
     G__asm_inst[G__asm_cp+3]=(long)fpos1;
 #endif

$NetBSD: patch-src_v6__pcode.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Add NetBSD support.

--- src/v6_pcode.cxx.orig	2007-02-16 23:46:45.000000000 +0000
+++ src/v6_pcode.cxx
@@ -9204,6 +9204,9 @@ int G__dasm(FILE *fout,int isthrow)
 #elif defined(G__NONSCALARFPOS_QNX)
         fpos_t pos;
         pos._Off = (off_t)G__asm_inst[pc+3];
+#elif defined(__NetBSD__)
+        fpos_t pos;
+        pos._pos = (off_t)G__asm_inst[pc+3];
 #else
         fpos_t pos = (fpos_t)G__asm_inst[pc+3];
 #endif

$NetBSD: patch-tool_INSTALLBIN,v 1.1 2016/09/28 10:00:27 kamil Exp $

Fix shell portability.

--- tool/INSTALLBIN.orig	2006-06-17 08:10:02.000000000 +0000
+++ tool/INSTALLBIN
@@ -69,12 +69,12 @@ fi
 echo "Where do the files go to?  Summary:"
 echo "Installing binary files to:              $BINDIR"
 echo "           Cint system files to:         $LIBDIR"
-if ! test "${MANDIR}x" == "x"; then
+if ! test "${MANDIR}x" = "x"; then
   echo "           manual pages to:              $MANDIR"
 else
   echo "           manual pages are not installed"
 fi
-if ! test "${DOCDIR}x" == "x"; then
+if ! test "${DOCDIR}x" = "x"; then
   echo "           additional documentation to:  $DOCDIR"
 else
   echo "           additional documentation is not installed"
@@ -127,7 +127,7 @@ echo -e "\n  ... successfully installed 
 #####################################################################
 # Optionally copy man files
 #####################################################################
-if ! test "${MANDIR}x" == "x"; then
+if ! test "${MANDIR}x" = "x"; then
   mkdir -p $MANDIR/man1
   
   # Copy manpages in section 1
@@ -143,7 +143,7 @@ fi
 #####################################################################
 # Optionally copy additional text documentation
 #####################################################################
-if ! test "${DOCDIR}x" == "x"; then
+if ! test "${DOCDIR}x" = "x"; then
   mkdir -p $DOCDIR
   
   # Copy text files in doc/

$NetBSD: patch-tool_ifdef_Makefile.base,v 1.1 2016/09/28 10:00:27 kamil Exp $

Don't fail for clean.

--- tool/ifdef/Makefile.base.orig	2005-05-04 10:25:33.000000000 +0000
+++ tool/ifdef/Makefile.base
@@ -18,4 +18,4 @@ get.o: get.c
 
 
 clean:
-	rm get.o ifdef.o ifdef
+	rm -f get.o ifdef.o ifdef

$NetBSD: patch-tool_ifdef_get.c,v 1.1 2016/09/28 10:00:27 kamil Exp $

LP64 fixes.

--- tool/ifdef/get.c.orig	2006-07-26 13:00:37.000000000 +0000
+++ tool/ifdef/get.c
@@ -2582,7 +2582,7 @@ struct G__param *libp;
 {
 	char temp[ONELINE],temp1[ONELINE];
 	FILE *fopen();
-	int fp;
+	long fp;
 
 	if(strcmp(funcname,"printf")==0) {
 		/* para[0]:description, para[1~paran-1]: */
@@ -2603,18 +2603,18 @@ struct G__param *libp;
 
 	if(strcmp(funcname,"fclose")==0) {
 		/* para[0]:filepointer */
-		sprintf(result7,"%d",fclose((FILE*)atoi(libp->para[0])));
+		sprintf(result7,"%d",fclose((FILE*)atol(libp->para[0])));
 		return(1);
 	}
 
 	if(strcmp(funcname,"fgets")==0) {
 		/* parameter[0]:varname, para[1]:nchar,para[2]:filepointer */
-		fp=atoi(libp->para[2]);
+		fp=atol(libp->para[2]);
 		sprintf(result7,"%ld"
 			,(long)fgets(temp,atoi(libp->para[1]),(FILE*)fp));
 		G__letvariable(libp->parameter[0]
 			    ,G__add_quotation(temp),&G__global,G__local);
-		sprintf(temp,"%d",fp);
+		sprintf(temp,"%ld",fp);
 		G__letvariable(libp->parameter[1],temp,&G__global,G__local);
 		return(1);
 	}
@@ -2622,7 +2622,7 @@ struct G__param *libp;
 	if(strcmp(funcname,"fprintf")==0) {
 		/* parameter[0]:pointer ,parameter[1]:description, para[2~paran-1]: */
 		G__charformatter(result7,1,libp);
-		fprintf((FILE*)atoi(libp->para[0]),"%s",result7);
+		fprintf((FILE*)atol(libp->para[0]),"%s",result7);
 		strcpy(result7,"");
 		return(1);
 	}
@@ -3553,5 +3553,3 @@ FILE *fp;
 
 	return( c ) ;
 }
-
-

$NetBSD: patch-tool_ifdef_ifdef.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Reuse getopt(3) prototype on BSDs from standard header.

--- tool/ifdef/ifdef.cxx.orig	2006-07-26 13:00:37.000000000 +0000
+++ tool/ifdef/ifdef.cxx
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <unistd.h>
 #include <string>
 #include <map>
 #ifndef __hpux
@@ -69,7 +70,7 @@ extern "C" {
 char *G__calc(char*);
 char *G__getexpr(char*);
 char *G__getandor(char*);
-#if !defined(__hpux) && !defined(__APPLE__) 
+#if !defined(__hpux) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
 char getopt(int argc,char **argv,char *optlist);
 #endif
 extern int optind;
@@ -946,4 +947,3 @@ int G__splitawk(char* string,int* argc,c
   }
   return(n_eof);
 }
-

$NetBSD: patch-tool_makecint.cxx,v 1.1 2016/09/28 10:00:27 kamil Exp $

Include missing headers.

--- tool/makecint.cxx.orig	2007-03-16 11:32:07.000000000 +0000
+++ tool/makecint.cxx
@@ -30,7 +30,9 @@
 #define EXIT_SUCCESS 0
 #endif
 
+#include <cstdlib>
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <fstream>
 #include <list>