diff options
| author | mbr <mbr@FreeBSD.org> | 2002-03-03 18:57:07 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-03-03 18:57:07 +0000 |
| commit | a0695f88d393ee773b1ed17856eb608db3ae8c2f (patch) | |
| tree | b072add8467afc42cde99b9f8fde4b249d384c5b /editors/openoffice.org-2-devel | |
| parent | 62f191ec4d67821aef4393efc83428a4ab3354a2 (diff) | |
| download | FreeBSD-ports-a0695f88d393ee773b1ed17856eb608db3ae8c2f.zip FreeBSD-ports-a0695f88d393ee773b1ed17856eb608db3ae8c2f.tar.gz | |
Our patch(1) does treat -b differently than Linux. This should fix the build.
Diffstat (limited to 'editors/openoffice.org-2-devel')
| -rw-r--r-- | editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk | 14 | ||||
| -rw-r--r-- | editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk new file mode 100644 index 0000000..194668e --- /dev/null +++ b/editors/openoffice.org-2-devel/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.org-2-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk new file mode 100644 index 0000000..194668e --- /dev/null +++ b/editors/openoffice.org-2-devel/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)"=="" |
