- make openoffice also work with bison 1.3*

- add the external $PATH to the end of the internally set $PATH to make
  sure all binaries are found

3 files changed, 40 insertions, 11 deletions

diff --git a/misc/openoffice/patches/patch-de b/misc/openoffice/patches/patch-de
index 2fa26a01b20..41d56568ba9 100644
--- a/misc/openoffice/patches/patch-de
+++ b/misc/openoffice/patches/patch-de
@@ -1,7 +1,7 @@
-$NetBSD: patch-de,v 1.1.1.1 2002/02/13 18:09:24 mrauch Exp $
+$NetBSD: patch-de,v 1.2 2002/02/14 22:51:42 mrauch Exp $
 
---- set_soenv.1.orig	Tue Nov 20 18:26:33 2001
-+++ set_soenv.1	Mon Feb 11 23:19:01 2002
+--- set_soenv.1.orig	Tue Nov 20 17:26:33 2001
++++ set_soenv.1	Thu Feb 14 23:13:12 2002
 @@ -35,0 +36 @@
 +$| = 1;                            # Don't cache.	
 @@ -283 +284,11 @@
@@ -53,10 +53,15 @@ $NetBSD: patch-de,v 1.1.1.1 2002/02/13 18:09:24 mrauch Exp $
 @@ -819 +844 @@
 -                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
 +                        $ps.$USR_LOCAL.$LIB;
-@@ -968 +993 @@
+@@ -961,0 +987 @@
++			$ps.$ENV{PREFIX}.
+@@ -968,2 +994,3 @@
 -                        $ps.$USR.$BIN.$ds."X11".
+-                        $ps.$USR.$LIB;
 +                        $ps.$USR.$ds."X11R6".$BIN.
-@@ -1057,0 +1083,18 @@
++                        $ps.$USR.$LIB.
++			$ps.$ENV{PATH};
+@@ -1057,0 +1085,18 @@
 +if ($platform eq "${NetBSD}") 
 +{  my $libgcc=`$COMPATH/gcc -print-libgcc-file-name | xargs dirname`;
 +   chomp($libgcc);
@@ -75,27 +80,27 @@ $NetBSD: patch-de,v 1.1.1.1 2002/02/13 18:09:24 mrauch Exp $
 +			" ".$ENV{'CCFLAGS'}.'"';
 +}
 +
-@@ -1065,0 +1109,5 @@
+@@ -1065,0 +1111,5 @@
 +if ($platform eq "${NetBSD}")
 +{
 +$SOLARINC            .= " ".$ENV{'BUILDLINK_CPPFLAGS'}." ";
 +}
 +
-@@ -1068,3 +1116,2 @@
+@@ -1068,3 +1118,2 @@
 -$SOLARINC            .= $I.$USR.$INCLUDE.
 -			$STLPORT_stlport;
 -if ($platform eq "$Linux")
 +$SOLARINC            .= $STLPORT_stlport;
 +if (($platform eq "$Linux") or ($platform eq "${NetBSD}"))
-@@ -1104,0 +1152,2 @@
+@@ -1104,0 +1154,2 @@
 +   $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
 +   $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
-@@ -1418 +1467 @@
+@@ -1418 +1469 @@
 -   $answer = <STDIN>;
 +   exit(1);
-@@ -1514 +1563 @@
+@@ -1514 +1565 @@
 -   $value = <STDIN>; 
 +   exit(1);
-@@ -1555 +1604 @@
+@@ -1555 +1606 @@
 -      my $answer = <STDIN>; 
 +      exit(1);
diff --git a/misc/openoffice/patches/patch-dg b/misc/openoffice/patches/patch-dg
new file mode 100644
index 00000000000..5d5362b6cad
--- /dev/null
+++ b/misc/openoffice/patches/patch-dg
@@ -0,0 +1,12 @@
+$NetBSD: patch-dg,v 1.1 2002/02/14 22:51:42 mrauch Exp $
+
+--- ../idlc/source/makefile.mk.orig	Thu Feb 14 18:06:37 2002
++++ ../idlc/source/makefile.mk
+@@ -148,6 +148,7 @@
+ 
+ $(MISC)$/parser.cxx: parser.yy
+ 	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
++	-$(COPY) $(MISC)$/parser.hxx $(MISC)$/parser.cxx.h
+ 	+$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h
+ # with line statements (for debugging)
+ #	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
diff --git a/misc/openoffice/patches/patch-dh b/misc/openoffice/patches/patch-dh
new file mode 100644
index 00000000000..5203dccab0a
--- /dev/null
+++ b/misc/openoffice/patches/patch-dh
@@ -0,0 +1,12 @@
+$NetBSD: patch-dh,v 1.1 2002/02/14 22:51:42 mrauch Exp $
+
+--- ../connectivity/source/parse/makefile.mk.orig	Thu Feb 14 18:05:15 2002
++++ ../connectivity/source/parse/makefile.mk
+@@ -97,6 +97,7 @@
+ $(MISC)$/sqlbison.cxx: sqlbison.y
+ 	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y
+ 	-$(MKDIR) $(OUT)$/inc$/connectivity
++	-$(COPY) $(MISC)$/sqlbison.hxx $(MISC)$/sqlbison.cxx.h
+ 	+$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx
+ 
+ $(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx