diff options
| author | jdolecek <jdolecek> | 2002-12-25 16:20:18 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2002-12-25 16:20:18 +0000 |
| commit | 205b087f921479d5b9e750e8c16bb6e5d29b297e (patch) | |
| tree | c18097ca90af86244099b2baa81535355d1a76b2 /misc/openoffice | |
| parent | f70d66b9d8f85eab77bdcd6b0bdc33d89d3f804b (diff) | |
| download | pkgsrc-205b087f921479d5b9e750e8c16bb6e5d29b297e.tar.gz | |
use -f for cp; when the cp rules are invoked several times, the cp would
fail without -f if the previously copied file didn't have user write
permissions (and building as non-root)
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/distinfo | 4 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-bd | 58 |
2 files changed, 54 insertions, 8 deletions
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index 05843a635f8..e7c545a5bc4 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2002/08/02 20:33:23 jdolecek Exp $ +$NetBSD: distinfo,v 1.12 2002/12/25 16:20:18 jdolecek Exp $ SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd Size (oo_641_src.tar.bz2) = 109167758 bytes @@ -35,7 +35,7 @@ SHA1 (patch-az) = b7115ca4a98af6d83decf5e83ca848ab94ecb33a SHA1 (patch-ba) = f8e9773d4ee2a768fcbd980b414fa860976be78e SHA1 (patch-bb) = 4970f76435aefe6c9a2472af3c2fe2b8e9958102 SHA1 (patch-bc) = 023d154b8e83c0df344c632e1598236d90edc484 -SHA1 (patch-bd) = 5e64d744b2bdb60ac97daaa82ea8387fc3485ddb +SHA1 (patch-bd) = f902c298c8422cc3cfa677b2c116cb80fec9043b SHA1 (patch-be) = b6d3565264f64a40eebf320aa651e21081f1f124 SHA1 (patch-bf) = 4432fa3b141a8bd3856f74d49acccb8b1a902b41 SHA1 (patch-bg) = 6aec76367957f6eee6b9029aaeb24d8da3487927 diff --git a/misc/openoffice/patches/patch-bd b/misc/openoffice/patches/patch-bd index 9de1948337c..c76a1cfb26b 100644 --- a/misc/openoffice/patches/patch-bd +++ b/misc/openoffice/patches/patch-bd @@ -1,7 +1,7 @@ -$NetBSD: patch-bd,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ +$NetBSD: patch-bd,v 1.2 2002/12/25 16:20:18 jdolecek Exp $ ---- ../product/util/makefile.mk.orig Tue Jan 1 14:10:58 2002 -+++ ../product/util/makefile.mk +--- ../product/util/makefile.mk.orig Thu Oct 11 12:10:42 2001 ++++ ../product/util/makefile.mk Tue Dec 24 17:37:53 2002 @@ -101,6 +101,16 @@ STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=gcc2_uno @@ -19,8 +19,32 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ .ELIF "$(OS)"=="WNT" ############### # WINDOWS -@@ -360,8 +370,8 @@ - $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ +@@ -341,30 +351,30 @@ + $(MKDIRHIER) $@ + + $(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb $(DESTDIRBIN) +- $(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@ ++ $(GNUCOPY) -fp $(BINOUT)$/udkapi.rdb $@ + + $(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DIRLIST) +- $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ ++ $(GNUCOPY) -fp $(BINOUT)$/$(@:f) $@ + + + .IF "$(STLPORTDEST)" != "" + #OOo build environment + $(STLPORTDEST) : $(STLPORTOUT) $(DIRLIST) +- $(GNUCOPY) -p $(STLPORTOUT) $@ ++ $(GNUCOPY) -fp $(STLPORTOUT) $@ + .ENDIF + + $(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DIRLIST) +- $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ ++ $(GNUCOPY) -fp $(DLLOUT)$/$(@:f) $@ + + $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) +- $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ ++ $(GNUCOPY) -fp $(DLLOUT)$/$(@:f) $@ $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) - +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ @@ -29,4 +53,26 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $ + +ln -sf $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) - $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ +- $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ ++ $(GNUCOPY) -fp $(BINOUT)$/$(@:f) $@ + + $(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DIRLIST) + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ +@@ -373,7 +383,7 @@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ + + $(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST) +- $(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@ ++ $(GNUCOPY) -fp $(LIBOUT)$/$(@:f) $@ + + $(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST) + +-rm -f $@ >& $(NULLDEV) +@@ -385,7 +395,7 @@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ + + $(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README +- $(GNUCOPY) -p $(PRJ)$/examples$/README $@ ++ $(GNUCOPY) -fp $(PRJ)$/examples$/README $@ + + $(DESTDIRIDL)$/% : $(IDLOUT)$/% + +-rm -f $@ |