From 05a904b6236a495fd88e21f9a709cb522f5596bf Mon Sep 17 00:00:00 2001 From: mrauch Date: Tue, 26 Feb 2002 21:25:27 +0000 Subject: - bugfixes that showed up only under special circumstances: * restore compatibility with old bison * disable versioned symbols - the -current ld has a problem with them * fix an instance of improper shell quoting * the SIGPIPE hack inside tar needs a sh not csh (fixes PR#15706) - pth>=1.4.0nb1 is a runtime dependency - our csh is sufficient for compilation --- misc/openoffice/Makefile | 16 +-- misc/openoffice/distinfo | 9 +- misc/openoffice/patches/patch-by | 13 ++- misc/openoffice/patches/patch-di | 8 +- misc/openoffice/patches/patch-dj | 26 +++++ misc/openoffice/patches/patch-dk | 242 +++++++++++++++++++++++++++++++++++++++ misc/openoffice/patches/patch-dl | 13 +++ 7 files changed, 306 insertions(+), 21 deletions(-) create mode 100644 misc/openoffice/patches/patch-dj create mode 100644 misc/openoffice/patches/patch-dk create mode 100644 misc/openoffice/patches/patch-dl (limited to 'misc') diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index b36cd311203..c792af4d3d7 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2002/02/14 22:51:41 mrauch Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/26 21:25:27 mrauch Exp $ DISTNAME= openoffice-0.0.0.641 +PKGREVISION= 1 WRKSRC= ${WRKDIR}/oo_641_src/config_office CATEGORIES= misc MASTER_SITES= http://sf1.mirror.openoffice.org/641b/ @@ -22,13 +23,12 @@ GCC_VERSION!= ${CC} --version .endif 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 BUILD_DEPENDS+= stlport>=4.0nb1:../../devel/stlport BUILD_DEPENDS+= sun-jdk>=1.3.0:../../lang/sun-jdk13 .include "../../lang/perl5/buildlink.mk" .include "../../devel/pth/buildlink.mk" -BUILD_DEPENDS+= pth>=1.4.0nb1:../../devel/pth +DEPENDS+= pth>=1.4.0nb1:../../devel/pth .include "../../mk/x11.buildlink.mk" CONFLICTS= staroffice-[0-9]* @@ -51,14 +51,6 @@ post-extract: # convert \r\n-lineends in sablot-patch into unix-style \n first ${PERL5} -p -i.save -e 's/\r\n/\n/' \ ${WRKSRC}/../sablot/Sablot-0.52.patch -# The tar process on nas exits with an error code, extraction however is -# complete. Extract and repackage to make the build happy. - ${MV} ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz \ - ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz.orig - tar -xzf ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz.orig \ - -C ${WRKDIR} - tar -czf ${WRKSRC}/../nas/download/nas-1.4.1.tar.gz \ - -C ${WRKDIR} nas-1.4.1 DISPLAY?= #empty, if unset checkforx: @@ -76,7 +68,7 @@ DISPLAY= ':2' pre-build: checkforx do-build: - tcsh -c "setenv DISPLAY ${DISPLAY}; cd ${WRKSRC}/..&& \ + csh -c "setenv DISPLAY ${DISPLAY}; cd ${WRKSRC}/..&& \ ./bootstrap&& source *.Set&& dmake" pre-install: checkforx diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index 776c1644acc..f80446c2882 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/15 21:28:15 mrauch Exp $ +$NetBSD: distinfo,v 1.5 2002/02/26 21:25:27 mrauch Exp $ SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd Size (oo_641_src.tar.bz2) = 109167758 bytes @@ -56,7 +56,7 @@ SHA1 (patch-bu) = 82e3a6c4d188fbace9ec6173c3f3a7da1dd78045 SHA1 (patch-bv) = 1c3d6f413a750816203c285ab1d2217fce5101be SHA1 (patch-bw) = a4dd43d112a44be46934b2dc9f760c660b956be2 SHA1 (patch-bx) = 52de4d2caa3dce8642e22154f9765e7aafc0f313 -SHA1 (patch-by) = 6ceb37bfe0e8077bf8a4df834de36eb19a0826f2 +SHA1 (patch-by) = f681eea30a6d28338c513118f6d361225bc8083a SHA1 (patch-bz) = 8670c4da21b0f4a0ec4bebce31e28bf831adb8dd SHA1 (patch-ca) = 0c515b79dd92a5bf22c79f32a124defd80cd544d SHA1 (patch-cb) = c4ce25d5a9b0173a456c42493b28e4b15ccc0244 @@ -92,4 +92,7 @@ SHA1 (patch-de) = 6d3f2dc02daa3db1304759d1cda917adda52d943 SHA1 (patch-df) = 8da1d41c6049f3229e3fadf5724ca2c009ea447a SHA1 (patch-dg) = 2b7a85ddcdcffc21df6254476d6e1331f04017c8 SHA1 (patch-dh) = 0ac90ec074019827630011b0b2da1ad4cd0f1b0d -SHA1 (patch-di) = 7e4733e0652936ee00868f241e747b51765bc2bd +SHA1 (patch-di) = 11d55d8dc30e0d1ed1428aadc87a2b5c9c4e3a50 +SHA1 (patch-dj) = 90dbbcd6eb4ac5678e89187a93b68854dea33337 +SHA1 (patch-dk) = 167a6387f30c42fbd96c4846070c1f82bff2457c +SHA1 (patch-dl) = 37c7f04c87b79c3dc3cec9a18e1130caf3b37f5b diff --git a/misc/openoffice/patches/patch-by b/misc/openoffice/patches/patch-by index 0f3210e23da..503cd5016c0 100644 --- a/misc/openoffice/patches/patch-by +++ b/misc/openoffice/patches/patch-by @@ -1,7 +1,16 @@ -$NetBSD: patch-by,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ +$NetBSD: patch-by,v 1.2 2002/02/26 21:25:28 mrauch Exp $ ---- ../solenv/inc/tg_ext.mk.orig Tue Jan 1 14:11:58 2002 +--- ../solenv/inc/tg_ext.mk.orig Sun Feb 24 14:08:59 2002 +++ ../solenv/inc/tg_ext.mk +@@ -107,7 +107,7 @@ + + $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz + @+-$(RM) $@ +- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) ++ @+echo $(assign UNPACKCMD := sh -c "gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf -" ) > $(NULLDEV) + @+$(COPY) $(mktmp $(UNPACKCMD)) $@ + + $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar @@ -145,7 +145,11 @@ .IF "$(GUI)"=="WNT" +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) diff --git a/misc/openoffice/patches/patch-di b/misc/openoffice/patches/patch-di index aa02d73284d..a097c114239 100755 --- a/misc/openoffice/patches/patch-di +++ b/misc/openoffice/patches/patch-di @@ -1,13 +1,13 @@ -$NetBSD: patch-di,v 1.1 2002/02/15 21:28:15 mrauch Exp $ +$NetBSD: patch-di,v 1.2 2002/02/26 21:25:28 mrauch Exp $ ---- ../solenv/inc/tg_yxx.mk.save Fri Feb 15 13:36:38 2002 +--- ../solenv/inc/tg_yxx.mk.orig Wed Sep 20 14:43:18 2000 +++ ../solenv/inc/tg_yxx.mk -@@ -4,7 +4,8 @@ +@@ -4,7 +4,9 @@ @echo ------------------------------ @echo Making: $@ #.IF "$(GUI)"!="UNX" -- $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) + $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET).h $(YACCFILES) + $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) + $(BISON) -o $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) #.ELSE # $(BISON) $(YACCFLAGS) $(YACCFILES) diff --git a/misc/openoffice/patches/patch-dj b/misc/openoffice/patches/patch-dj new file mode 100644 index 00000000000..82bf42b83e4 --- /dev/null +++ b/misc/openoffice/patches/patch-dj @@ -0,0 +1,26 @@ +$NetBSD: patch-dj,v 1.1 2002/02/26 21:25:28 mrauch Exp $ + +--- ../solenv/inc/tg_shl.mk.orig Fri Sep 28 17:11:33 2001 ++++ ../solenv/inc/tg_shl.mk +@@ -188,9 +188,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL$(TNR)VERSIONMAP): \ + $(SHL$(TNR)OBJS)\ +@@ -223,7 +225,9 @@ + USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) ++.ENDIF + .ENDIF + .ENDIF + diff --git a/misc/openoffice/patches/patch-dk b/misc/openoffice/patches/patch-dk new file mode 100644 index 00000000000..5e505f80f6b --- /dev/null +++ b/misc/openoffice/patches/patch-dk @@ -0,0 +1,242 @@ +$NetBSD: patch-dk,v 1.1 2002/02/26 21:25:28 mrauch Exp $ + +--- ../solenv/inc/_tg_shl.mk.orig Fri Sep 28 17:11:33 2001 ++++ ../solenv/inc/_tg_shl.mk +@@ -88,9 +88,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL1VERSIONMAP): \ + $(SHL1OBJS)\ +@@ -123,9 +125,11 @@ + USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -519,9 +523,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL2VERSIONMAP): \ + $(SHL2OBJS)\ +@@ -554,9 +560,11 @@ + USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -950,9 +958,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL3VERSIONMAP): \ + $(SHL3OBJS)\ +@@ -985,9 +995,11 @@ + USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -1381,9 +1393,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL4VERSIONMAP): \ + $(SHL4OBJS)\ +@@ -1416,9 +1430,11 @@ + USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -1812,9 +1828,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL5VERSIONMAP): \ + $(SHL5OBJS)\ +@@ -1847,9 +1865,11 @@ + USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -2243,9 +2263,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL6VERSIONMAP): \ + $(SHL6OBJS)\ +@@ -2278,9 +2300,11 @@ + USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -2674,9 +2698,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL7VERSIONMAP): \ + $(SHL7OBJS)\ +@@ -2709,9 +2735,11 @@ + USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -3105,9 +3133,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL8VERSIONMAP): \ + $(SHL8OBJS)\ +@@ -3140,9 +3170,11 @@ + USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -3536,9 +3568,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL9VERSIONMAP): \ + $(SHL9OBJS)\ +@@ -3571,9 +3605,11 @@ + USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) + @+-$(RM) -f $@ >& $(NULLDEV) +@@ -3967,9 +4003,11 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) + .ENDIF + .ENDIF ++.ENDIF + + $(USE_SHL10VERSIONMAP): \ + $(SHL10OBJS)\ +@@ -4002,7 +4040,9 @@ + USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10VERSIONMAP:f) + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" ++.IF "$(OS)"!="NETBSD" + SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) ++.ENDIF + .ENDIF + .ENDIF + diff --git a/misc/openoffice/patches/patch-dl b/misc/openoffice/patches/patch-dl new file mode 100644 index 00000000000..44b95458f5f --- /dev/null +++ b/misc/openoffice/patches/patch-dl @@ -0,0 +1,13 @@ +$NetBSD: patch-dl,v 1.1 2002/02/26 21:25:28 mrauch Exp $ + +--- ../xmloff/source/meta/makefile.mk.orig Tue Jul 24 17:06:08 2001 ++++ ../xmloff/source/meta/makefile.mk +@@ -92,7 +92,7 @@ + + $(INCCOM)$/rscrev.hxx: makefile.mk + .IF "$(GUI)"=="UNX" +- echo #define RSCUPDVER \""$(RSCREVISION)"\" > $@ ++ echo '#define RSCUPDVER "$(RSCREVISION)"' > $@ + .ELSE + echo #define RSCUPDVER "$(RSCREVISION)" > $@ + .ENDIF -- cgit v1.2.3