diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-03 18:57:07 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-03 18:57:07 +0000 |
| commit | 7399d7d73d1d8661fa0b947282347ec9f12a1a67 (patch) | |
| tree | 6d733a4adfb5180aa4ebeae787fd0ca541fa8c15 /editors/openoffice/files | |
| parent | Add fonts aliases. (diff) | |
Our patch(1) does treat -b differently than Linux. This should fix the build.
Notes
Notes:
svn path=/head/; revision=55489
Diffstat (limited to 'editors/openoffice/files')
| -rw-r--r-- | editors/openoffice/files/patch-solenv+inc+tg_ext.mk | 14 | ||||
| -rw-r--r-- | editors/openoffice/files/patch-solenv::inc::tg_ext.mk | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/editors/openoffice/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice/files/patch-solenv+inc+tg_ext.mk new file mode 100644 index 000000000000..194668e86748 --- /dev/null +++ b/editors/openoffice/files/patch-solenv+inc+tg_ext.mk @@ -0,0 +1,14 @@ +--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002 ++++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002 +@@ -148,7 +148,11 @@ + .IF "$(BSCLIENT)"=="TRUE" + +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + .ELSE # "$(BSCLIENT)"!="" ++.IF "$(OS)"=="FREEBSD" + +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) ++.ELSE ++ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) ++.ENDIF + .ENDIF # "$(BSCLIENT)"!="" + .ENDIF # "$(GUI)"=="WNT" + .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" diff --git a/editors/openoffice/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice/files/patch-solenv::inc::tg_ext.mk new file mode 100644 index 000000000000..194668e86748 --- /dev/null +++ b/editors/openoffice/files/patch-solenv::inc::tg_ext.mk @@ -0,0 +1,14 @@ +--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002 ++++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002 +@@ -148,7 +148,11 @@ + .IF "$(BSCLIENT)"=="TRUE" + +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + .ELSE # "$(BSCLIENT)"!="" ++.IF "$(OS)"=="FREEBSD" + +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) ++.ELSE ++ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) ++.ENDIF + .ENDIF # "$(BSCLIENT)"!="" + .ENDIF # "$(GUI)"=="WNT" + .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" |