diff options
| -rw-r--r-- | misc/openoffice/Makefile | 5 | ||||
| -rw-r--r-- | misc/openoffice/distinfo | 6 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-de | 27 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-dg | 12 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-dh | 12 |
5 files changed, 46 insertions, 16 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index eb21653adc5..b36cd311203 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/02/14 14:07:08 mrauch Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/14 22:51:41 mrauch Exp $ DISTNAME= openoffice-0.0.0.641 WRKSRC= ${WRKDIR}/oo_641_src/config_office @@ -20,8 +20,7 @@ GCC_VERSION!= ${CC} --version .if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" .include "../../lang/gcc/Makefile.gcc" .endif -# bison 1.3* won't work: there was an incompatible change in it -BUILD_DEPENDS+= bison-1.2*:../../devel/bison +BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison BUILD_DEPENDS+= gmake-[0-9]*:../../devel/gmake BUILD_DEPENDS+= tcsh-[0-9]*:../../shells/tcsh BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index 00d625a1db6..9c40d48c2a3 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/02/13 21:11:11 mrauch Exp $ +$NetBSD: distinfo,v 1.3 2002/02/14 22:51:41 mrauch Exp $ SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd Size (oo_641_src.tar.bz2) = 109167758 bytes @@ -88,5 +88,7 @@ SHA1 (patch-da) = be034320d910f04f2eb9d2c7c35236e24decf7a4 SHA1 (patch-db) = 6cd1f6923aa9e9c93a0d5dfcb74229a007905b7d SHA1 (patch-dc) = 0dfbab80794ce167c2a946af0c48fd3b91a12523 SHA1 (patch-dd) = 7c798e377cb7fc07bb120f4c71908336280671a0 -SHA1 (patch-de) = 6b3cfb2e0e8d3363d19dea863bb22e06b2a2ba47 +SHA1 (patch-de) = 6d3f2dc02daa3db1304759d1cda917adda52d943 SHA1 (patch-df) = 8da1d41c6049f3229e3fadf5724ca2c009ea447a +SHA1 (patch-dg) = 2b7a85ddcdcffc21df6254476d6e1331f04017c8 +SHA1 (patch-dh) = 0ac90ec074019827630011b0b2da1ad4cd0f1b0d 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 |