freebsd-ports/editors/openoffice/files/patch-solenv::inc::tg_ext.mk
Martin Blapp a31c45a0b4 Upgrade to build 641d. More work is necessary to make the build compile.
There are still at least two different gcc bugs in our compiler, one
issue has already been found by Alexander Kabaev <ak03@gte.com>. He's
working on fixing the other.
2002-04-02 23:48:28 +00:00

34 lines
1.7 KiB
Makefile

--- ../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) $@
- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV)
+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV)
@+$(COPY) $(mktmp $(UNPACKCMD)) $@
$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
@@ -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 -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ENDIF # "$(OS)"=="NETBSD"
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""