Fix build for -current with egcs compiler.

9 files changed, 101 insertions, 7 deletions

diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index d8ca404bdd44..9518b49f4a0d 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23.sept.1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.18 1998/12/18 09:40:52 asami Exp $
+# $Id: Makefile,v 1.19 1999/01/26 02:40:21 steve Exp $
 #
 
 DISTNAME=	3.1
@@ -65,6 +65,12 @@ IV_LIB_VER=     3
 IV_LIB_VER=     3.1
 .endif
 
+.if ${OSVERSION} >= 400002
+post-patch:
+	@(cd ${WRKSRC}/src/config/InterViews; ${MV} -f iv-freebsd.cf \
+	iv-freebsd.cf~; ${SED} -e 's/\-lg\+\+//' iv-freebsd.cf~ > iv-freebsd.cf)
+.endif
+
 post-install:
 # need these in ${PREFIX}/lib so that ldconfig can find them
 	${LN} -fs ../interviews/lib/FREEBSD/libIV.so.${IV_LIB_VER} ${PREFIX}/lib
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa
index 853c75c5b62a..29230e54b2f2 100644
--- a/x11-toolkits/iv/files/patch-aa
+++ b/x11-toolkits/iv/files/patch-aa
@@ -1,6 +1,16 @@
---- src/bin/ibuild/ibcmds.c.orig	Sat Dec 12 13:33:25 1992
-+++ src/bin/ibuild/ibcmds.c	Sun Jan 17 17:48:19 1999
-@@ -2407,9 +2407,9 @@
+--- src/bin/ibuild/ibcmds.c.orig	Fri Dec 11 22:33:25 1992
++++ src/bin/ibuild/ibcmds.c	Thu May 27 21:36:47 1999
+@@ -86,7 +86,9 @@
+ #undef FileChooser
+ #define FileChooser _lib_iv(FileChooser)
+ 
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stream.h>
+@@ -2407,9 +2409,9 @@
  	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
          EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
  
diff --git a/x11-toolkits/iv/files/patch-ab b/x11-toolkits/iv/files/patch-ab
index 08f3f2d6e246..18ce2e39ad90 100644
--- a/x11-toolkits/iv/files/patch-ab
+++ b/x11-toolkits/iv/files/patch-ab
@@ -1,6 +1,13 @@
---- src/bin/iclass/dialogs.c.orig	Thu Sep 24 01:45:09 1992
-+++ src/bin/iclass/dialogs.c	Sun Jan 17 17:48:18 1999
-@@ -45,7 +45,7 @@
+--- src/bin/iclass/dialogs.c.orig	Wed Sep 23 11:45:09 1992
++++ src/bin/iclass/dialogs.c	Thu May 27 21:45:37 1999
+@@ -40,12 +40,14 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ 
  #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5)
  /* sigh, not all systems have this prototype */
  extern "C" {
diff --git a/x11-toolkits/iv/files/patch-bd b/x11-toolkits/iv/files/patch-bd
new file mode 100644
index 000000000000..526b30db6b8d
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bd
@@ -0,0 +1,12 @@
+--- src/lib/Unidraw/catalog.c.orig	Thu May 27 20:04:40 1999
++++ src/lib/Unidraw/catalog.c	Thu May 27 20:06:39 1999
+@@ -57,7 +57,9 @@
+ #include <IV-2_6/_enter.h>
+ 
+ #include <ctype.h>
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/x11-toolkits/iv/files/patch-be b/x11-toolkits/iv/files/patch-be
new file mode 100644
index 000000000000..7bec291bfe9c
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-be
@@ -0,0 +1,12 @@
+--- src/lib/Unidraw/catcmds.c.orig	Thu May 27 20:08:11 1999
++++ src/lib/Unidraw/catcmds.c	Thu May 27 20:08:33 1999
+@@ -42,7 +42,9 @@
+ #include <InterViews/window.h>
+ #include <OS/string.h>
+ 
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stream.h>
diff --git a/x11-toolkits/iv/files/patch-bf b/x11-toolkits/iv/files/patch-bf
new file mode 100644
index 000000000000..27821508cb62
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bf
@@ -0,0 +1,11 @@
+--- src/bin/dclock/clocktime.c.orig	Thu May 27 21:32:07 1999
++++ src/bin/dclock/clocktime.c	Thu May 27 21:33:07 1999
+@@ -55,7 +55,7 @@
+ #if defined(hpux) || defined(AIXV3)
+     local = * localtime((time_t*) &gmt.tv_sec);
+ #else
+-#ifdef __DECCXX
++#if defined(__DECCXX) || defined(__FreeBSD__)
+     local = * localtime((time_t*)&gmt.tv_sec);
+ #else
+     local = * localtime(&gmt.tv_sec);
diff --git a/x11-toolkits/iv/files/patch-bg b/x11-toolkits/iv/files/patch-bg
new file mode 100644
index 000000000000..b3cb80357b51
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bg
@@ -0,0 +1,12 @@
+--- src/bin/ibuild/ibcode.c.orig	Thu May 27 21:37:28 1999
++++ src/bin/ibuild/ibcode.c	Thu May 27 21:38:01 1999
+@@ -41,7 +41,9 @@
+ #include <Unidraw/Graphic/pspaint.h>
+ #include <InterViews/shape.h>
+ #include <InterViews/transformer.h>
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <stdlib.h>
+ #include <stream.h>
+ #include <string.h>
diff --git a/x11-toolkits/iv/files/patch-bh b/x11-toolkits/iv/files/patch-bh
new file mode 100644
index 000000000000..e6ea7c2f83c6
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bh
@@ -0,0 +1,12 @@
+--- src/bin/ibuild/ibdialogs.c.orig	Thu May 27 21:41:29 1999
++++ src/bin/ibuild/ibdialogs.c	Thu May 27 21:41:59 1999
+@@ -60,7 +60,9 @@
+ #include <InterViews/tray.h>
+ #include <OS/types.h>
+ 
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/x11-toolkits/iv/files/patch-bi b/x11-toolkits/iv/files/patch-bi
new file mode 100644
index 000000000000..1d957ffda908
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bi
@@ -0,0 +1,12 @@
+--- src/bin/iclass/direct.c.orig	Thu May 27 21:46:51 1999
++++ src/bin/iclass/direct.c	Thu May 27 21:47:19 1999
+@@ -30,7 +30,9 @@
+ #include <OS/string.h>
+ #include <OS/types.h>
+ #include <stddef.h>
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <pwd.h>
+ #include <string.h>
+ #include <stdlib.h>