summaryrefslogtreecommitdiff
path: root/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk')
-rw-r--r--editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk22
1 files changed, 16 insertions, 6 deletions
diff --git a/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
index 039af7d70871..cb652ec9d1f0 100644
--- a/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
+++ b/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
@@ -1,6 +1,6 @@
---- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
-+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
-@@ -107,7 +107,7 @@
+--- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002
++++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002
+@@ -108,7 +108,7 @@
$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
@+-$(RM) $@
@@ -9,14 +9,24 @@
@+$(COPY) $(mktmp $(UNPACKCMD)) $@
$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
-@@ -148,7 +148,11 @@
+@@ -147,17 +147,17 @@
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE # "$(GUI)"=="WNT"
.IF "$(BSCLIENT)"=="TRUE"
+-.IF "$(OS)"=="NETBSD"
++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF # "$(OS)"=="NETBSD"
++.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ELSE # "$(BSCLIENT)"!=""
+-.IF "$(OS)"=="NETBSD"
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-+.ELSE
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF # "$(OS)"=="NETBSD"
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"