- make build stop on error

- sprinkle const
- should fix linux build

12 files changed, 234 insertions, 14 deletions

diff --git a/misc/vfu/distinfo b/misc/vfu/distinfo
index 681fa30bec9..6e96f2570e6 100644
--- a/misc/vfu/distinfo
+++ b/misc/vfu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2013/07/18 12:06:10 joerg Exp $
+$NetBSD: distinfo,v 1.12 2014/06/29 19:43:54 dholland Exp $
 
 SHA1 (vfu-3.04.src.tar.gz) = 75e87d102114dc08136420e7927e687f72a52dfd
 RMD160 (vfu-3.04.src.tar.gz) = a0d1ba84d9c66216b444226ceace190ada0e795a
@@ -6,13 +6,21 @@ Size (vfu-3.04.src.tar.gz) = 187519 bytes
 SHA1 (patch-aa) = ce204485f8c781a6ffeb25e4de4de21cdf33b473
 SHA1 (patch-ab) = bb935cd9127479517daf36480e2637cd5447b978
 SHA1 (patch-ac) = 72c05012c39bb785b4eea5d41c51bd1787e463f8
-SHA1 (patch-ad) = 1410335b46d58ad9ec973b5a6b9ebe52091c0012
+SHA1 (patch-ad) = 0777dcc38998562c9f8f70c64a6c2dce02c20c7c
 SHA1 (patch-ae) = a2076bb4754bc433898529734f7b25a5efd2ba57
 SHA1 (patch-af) = 056851af215dbf1195b9e7f00b6b654261473945
 SHA1 (patch-ag) = 3e87916630a0e9628cc28097bf2d011d15fadc42
-SHA1 (patch-ah) = 50b211c8ca93393f38ed7e279795e1df0606884c
+SHA1 (patch-ah) = 65bcc3b139f688c4407bb14cfb8d2d61962994f7
 SHA1 (patch-ai) = 4a161a1df84001bdefc81384128ea74bf9d7f61d
 SHA1 (patch-aj) = 265fbb0873ce0b910ba6a53da57a18269af34b82
 SHA1 (patch-ak) = cfcfb94f1ba6169ef471ae47fdcd9ccc81196a39
-SHA1 (patch-al) = bd947171f2027243bebe889c537426124459e2e1
+SHA1 (patch-al) = ee31aca39c8f4ba7254f9a79c8488d8592b465e5
+SHA1 (patch-vfu_vfuopt.cpp) = f504bea56db4ebe07fe313733c02a38fb65805f8
+SHA1 (patch-vfu_vfuopt.h) = d64d243deff488fad9c46fb022f20b303d80bd03
+SHA1 (patch-vfu_vfusys.cpp) = 3a4f57f381d10c6d4f66d84d8c57338a0e17b77c
+SHA1 (patch-vfu_vfuview.cpp) = 573c1df0d515d328de300ed1e418f065ac43887e
+SHA1 (patch-vslib_conmenu.h) = 8fbfc954abb7d713ef66ab565d66ecb285cd86f0
+SHA1 (patch-vslib_getopt2.cpp) = b5cb783a8660a267c5dca03ff29e37415ad6fb2b
+SHA1 (patch-vslib_regexp3.cpp) = 48017429d1f10559f37cbdc901fa247e6cd8e600
+SHA1 (patch-vslib_vstring.cpp) = 56fc269b175405821533e11c86e1c6a12cc5d7e7
 SHA1 (patch-vslib_vstring.h) = d93cb8362ad11d0a62acaf8ab56e4aace0fd4f7f
diff --git a/misc/vfu/patches/patch-ad b/misc/vfu/patches/patch-ad
index 700a08ae296..490babd810c 100644
--- a/misc/vfu/patches/patch-ad
+++ b/misc/vfu/patches/patch-ad
@@ -1,8 +1,18 @@
-$NetBSD: patch-ad,v 1.7 2003/07/14 10:07:12 jmmv Exp $
+$NetBSD: patch-ad,v 1.8 2014/06/29 19:43:54 dholland Exp $
 
---- build.netbsd.orig	2001-10-28 15:12:15.000000000 +0100
+- make build stop on error
+- honor PKG_SYSCONFDIR
+
+--- build.netbsd.orig	2001-10-28 14:12:15.000000000 +0000
 +++ build.netbsd
-@@ -15,7 +15,7 @@ cd ..
+@@ -9,17 +9,19 @@ if [ -e libvslib.a ]; then
+   echo "VSLIB compiled ok."
+ else
+   echo "VSLIB compilation failed..."
++  exit 1
+ fi
+ 
+ cd ..
  
  echo "Compiling VFU..."
  cd vfu
@@ -11,3 +21,15 @@ $NetBSD: patch-ad,v 1.7 2003/07/14 10:07:12 jmmv Exp $
  if [ -e vfu ]; then
    echo "VFU compiled ok."
  else
+   echo "VFU compilation failed..."
++  exit 1
+ fi
+ 
+ cd ..
+@@ -31,5 +33,6 @@ if [ -e ftparc ]; then
+   echo "ftparc compiled ok."
+ else
+   echo "ftparc compilation failed..."
++  exit 1
+ fi
+  
diff --git a/misc/vfu/patches/patch-ah b/misc/vfu/patches/patch-ah
index b7255bed2e0..2ed9bd550dd 100644
--- a/misc/vfu/patches/patch-ah
+++ b/misc/vfu/patches/patch-ah
@@ -1,7 +1,19 @@
-$NetBSD: patch-ah,v 1.3 2004/05/24 09:10:06 adam Exp $
+$NetBSD: patch-ah,v 1.4 2014/06/29 19:43:54 dholland Exp $
 
---- vfu/vfucopy.cpp.orig	2004-05-24 10:52:29.000000000 +0000
+- support struct statvfs
+- sprinkle const to make newer C++ compilers happier
+
+--- vfu/vfucopy.cpp.orig	2002-04-26 07:24:21.000000000 +0000
 +++ vfu/vfucopy.cpp
+@@ -17,7 +17,7 @@
+ #include "vfusys.h"
+ #include "vfucopy.h"
+ 
+-char *CM_DESC[] = { "COPY", "MOVE", "LINK" };
++const char *CM_DESC[] = { "COPY", "MOVE", "LINK" };
+ char *copy_buff = NULL;
+ 
+ int ignore_copy_errors = 0; /* actually it is used for copy/move/erase */
 @@ -30,9 +30,15 @@ int ignore_copy_errors = 0; /* actually 
  fsize_t device_free_space( const char *target ) /* user free space, NOT real! */
  {
diff --git a/misc/vfu/patches/patch-al b/misc/vfu/patches/patch-al
index 45611f242d1..515ab1270da 100644
--- a/misc/vfu/patches/patch-al
+++ b/misc/vfu/patches/patch-al
@@ -1,6 +1,9 @@
-$NetBSD: patch-al,v 1.1 2008/10/02 14:33:58 joerg Exp $
+$NetBSD: patch-al,v 1.2 2014/06/29 19:43:54 dholland Exp $
 
---- vslib/getopt2.h.orig	2008-10-02 16:00:52.000000000 +0200
+- use extern "C" around the stuff here (why?)
+- sprinkle const to make more modern C++ compilers happier
+
+--- vslib/getopt2.h.orig	2001-10-28 13:53:02.000000000 +0000
 +++ vslib/getopt2.h
 @@ -15,7 +15,7 @@
  /* next line added by <cade@biscom.net> see getopt2.cpp for changes */
@@ -11,10 +14,13 @@ $NetBSD: patch-al,v 1.1 2008/10/02 14:33:58 joerg Exp $
  extern char *optarg;
  extern int optind;
  extern int opterr;
-@@ -32,4 +32,6 @@ extern int opterr_report;
+@@ -30,6 +30,8 @@ extern int opterr_report;
  
- int getopt2(int argc, char *argv[], char *optstring);
+ /* name changed to getopt2 to avoid library function mismatch */
  
-+}
+-int getopt2(int argc, char *argv[], char *optstring);
++int getopt2(int argc, char *argv[], const char *optstring);
 +
++}
+ 
  #endif
diff --git a/misc/vfu/patches/patch-vfu_vfuopt.cpp b/misc/vfu/patches/patch-vfu_vfuopt.cpp
new file mode 100644
index 00000000000..5d791080567
--- /dev/null
+++ b/misc/vfu/patches/patch-vfu_vfuopt.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-vfu_vfuopt.cpp,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vfu/vfuopt.cpp.orig	2002-05-17 08:48:41.000000000 +0000
++++ vfu/vfuopt.cpp
+@@ -18,13 +18,13 @@
+ 
+ Options opt;
+ 
+-char *NOYES[] = { " - ", "YES", NULL };
+-char *NOYESPRECOPY[] = { " - ", "YES", "PRELIM", NULL };
+-char *FTIMETYPE[] = { "CHANGE", "MODIFY", "ACCESS", NULL };
++const char *const NOYES[] = { " - ", "YES", NULL };
++const char *const NOYESPRECOPY[] = { " - ", "YES", "PRELIM", NULL };
++const char *const FTIMETYPE[] = { "CHANGE", "MODIFY", "ACCESS", NULL };
+ #ifdef _TARGET_GO32_
+-char *TAGMARKS[] = { ">>", "=>", "->", "Í", "Ä", " ¯", "¯¯", NULL };
++const char *const TAGMARKS[] = { ">>", "=>", "->", "Í", "Ä", " ¯", "¯¯", NULL };
+ #else
+-char *TAGMARKS[] = { ">>", "=>", "->", NULL };
++const char *const TAGMARKS[] = { ">>", "=>", "->", NULL };
+ #endif
+ 
+ ToggleEntry Toggles[] =
diff --git a/misc/vfu/patches/patch-vfu_vfuopt.h b/misc/vfu/patches/patch-vfu_vfuopt.h
new file mode 100644
index 00000000000..2a57ddff45a
--- /dev/null
+++ b/misc/vfu/patches/patch-vfu_vfuopt.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-vfu_vfuopt.h,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vfu/vfuopt.h~	2002-04-26 07:24:21.000000000 +0000
++++ vfu/vfuopt.h
+@@ -15,9 +15,9 @@
+ #include "see.h"
+ #include "vfuuti.h"
+ 
+-  extern char *NOYES[];
+-  extern char *FTIMETYPE[];
+-  extern char *TAGMARKS[];
++  extern const char *const NOYES[];
++  extern const char *const FTIMETYPE[];
++  extern const char *const TAGMARKS[];
+ 
+   struct Options {
+     int sort_order; 
diff --git a/misc/vfu/patches/patch-vfu_vfusys.cpp b/misc/vfu/patches/patch-vfu_vfusys.cpp
new file mode 100644
index 00000000000..00babb37b2e
--- /dev/null
+++ b/misc/vfu/patches/patch-vfu_vfusys.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-vfu_vfusys.cpp,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vfu/vfusys.cpp~	2002-04-26 07:24:21.000000000 +0000
++++ vfu/vfusys.cpp
+@@ -138,8 +138,8 @@ int  vfu_edit_attr( mode_str_t mod_str, 
+     for ( int z = 0; z < 16; z++ ) mode_i[z] = 2;
+     }
+ 
+-  char* AONOFF1[] = { "YES", " - ", " ? ", NULL };
+-  char* AONOFF2[] = { "YES", " - ", NULL };
++  const char* AONOFF1[] = { "YES", " - ", " ? ", NULL };
++  const char* AONOFF2[] = { "YES", " - ", NULL };
+   #define AONOFF  ( allow_masking ? AONOFF1 : AONOFF2 )
+   ToggleEntry mode_toggles[] =
+   {
diff --git a/misc/vfu/patches/patch-vfu_vfuview.cpp b/misc/vfu/patches/patch-vfu_vfuview.cpp
new file mode 100644
index 00000000000..9f2faaf8a0e
--- /dev/null
+++ b/misc/vfu/patches/patch-vfu_vfuview.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-vfu_vfuview.cpp,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vfu/vfuview.cpp~	2002-04-26 07:24:21.000000000 +0000
++++ vfu/vfuview.cpp
+@@ -119,7 +119,7 @@ void vfu_draw( int n )
+ 
+ /*#######################################################################*/
+ 
+-extern char *FTIMETYPE[]; /* in vfuopt.cpp */
++extern const char *const FTIMETYPE[]; /* in vfuopt.cpp */
+ void vfu_redraw() /* redraw file list and header */
+ {
+   char t[MAX_PATH];
diff --git a/misc/vfu/patches/patch-vslib_conmenu.h b/misc/vfu/patches/patch-vslib_conmenu.h
new file mode 100644
index 00000000000..eeebb74a3cd
--- /dev/null
+++ b/misc/vfu/patches/patch-vslib_conmenu.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-vslib_conmenu.h,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vslib/conmenu.h~	2002-04-26 07:24:06.000000000 +0000
++++ vslib/conmenu.h
+@@ -18,7 +18,7 @@ struct  ToggleEntry
+   int  key;
+   char name[64];
+   int  *data;
+-  char **states;
++  const char *const *states;
+ };
+ 
+ struct ConMenuInfo
diff --git a/misc/vfu/patches/patch-vslib_getopt2.cpp b/misc/vfu/patches/patch-vslib_getopt2.cpp
new file mode 100644
index 00000000000..471b3c80430
--- /dev/null
+++ b/misc/vfu/patches/patch-vslib_getopt2.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-vslib_getopt2.cpp,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vslib/getopt2.cpp~	2001-10-28 13:53:02.000000000 +0000
++++ vslib/getopt2.cpp
+@@ -40,7 +40,7 @@ static char *nextarg = NULL;
+ 
+ /* Funktion */
+ 
+-int getopt2(int argc, char *argv[], char *optstring)
++int getopt2(int argc, char *argv[], const char *optstring)
+ 
+ /*
+  *  AU: Auswertung der Kommandozeile
diff --git a/misc/vfu/patches/patch-vslib_regexp3.cpp b/misc/vfu/patches/patch-vslib_regexp3.cpp
new file mode 100644
index 00000000000..031c48eeb72
--- /dev/null
+++ b/misc/vfu/patches/patch-vslib_regexp3.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-vslib_regexp3.cpp,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vslib/regexp3.cpp~	2002-04-26 06:40:08.000000000 +0000
++++ vslib/regexp3.cpp
+@@ -183,7 +183,7 @@ int regmatch( char *prog); /* 0 failure,
+ int regrepeat( char *p);
+ char * regnext( char *p);
+ char * regprop( char *op);
+-void regerror( char *s );
++void regerror( const char *s );
+  
+ 
+ char regerror_str[REGERROR_STR_SIZE];
+@@ -226,7 +226,7 @@ int regmatchpos( const char* pattern, co
+   return res;
+ }
+ 
+-void regerror( char *s )
++void regerror( const char *s )
+ {
+   strcpy( regerror_str, s );
+ };
diff --git a/misc/vfu/patches/patch-vslib_vstring.cpp b/misc/vfu/patches/patch-vslib_vstring.cpp
new file mode 100644
index 00000000000..3db3d784b52
--- /dev/null
+++ b/misc/vfu/patches/patch-vslib_vstring.cpp
@@ -0,0 +1,42 @@
+$NetBSD: patch-vslib_vstring.cpp,v 1.1 2014/06/29 19:43:54 dholland Exp $
+
+Sprinkle const to make more modern C++ compilers happier.
+
+--- vslib/vstring.cpp~	2002-05-24 16:55:36.000000000 +0000
++++ vslib/vstring.cpp
+@@ -412,7 +412,7 @@
+   {
+     int sl = strlen( target );
+     if (startpos >= sl) return -1;
+-    char* pc = strchr( target + startpos, s );
++    const char* pc = strchr( target + startpos, s );
+     if( ! pc )
+       return -1;
+     return  pc - target;
+@@ -420,7 +420,7 @@
+ 
+   int str_rfind( const char* target, const char c ) // returns last zero-based position of char, or -1 if not found
+   {
+-    char* pc = strrchr( target, c );
++    const char* pc = strrchr( target, c );
+     if( ! pc )
+       return -1;
+     return  pc - target;
+@@ -430,7 +430,7 @@
+   {
+     int sl = strlen( target );
+     if (startpos >= sl) return -1;
+-    char* pc = strstr( target + startpos, s );
++    const char* pc = strstr( target + startpos, s );
+     if( ! pc )
+       return -1;
+     return  pc - target;
+@@ -707,7 +707,7 @@
+     int sl = strlen( target );
+     for( z = 0; z < sl; z++ )
+       {
+-      char *pc = strchr( from, target[z] );
++      const char *pc = strchr( from, target[z] );
+       if (pc) target[z] = to[ pc - from ];
+       }
+     return target;