freebsd-ports/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk

--- ../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 @@
 	
 $(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
@@ -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)"=="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" || "$(OS)"=="FREEBSD"
 .ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
Upgrade to 641c source, add gcc2_freebsd_intel and gcc3_freebsd_intel cpp_uno source 2002-03-04 22:46:59 +01:00			`--- ../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`
Fix tar.gz extraction. Our tar seems not to like the included tar files and exits with error value 141. But only if the gunzip stream is redirected from STDIN. If our tar is used with -z, everything works. Looks like a BSD tar bug. 2002-03-05 16:52:12 +01:00			`@@ -107,7 +107,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`
Our patch(1) does treat -b differently than Linux. This should fix the build. 2002-03-03 19:57:07 +01:00			`@@ -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)"!=""`
Upgrade to 641c source, add gcc2_freebsd_intel and gcc3_freebsd_intel cpp_uno source 2002-03-04 22:46:59 +01:00			`+.IF "$(OS)"=="NETBSD" \|\| "$(OS)"=="FREEBSD"`
Our patch(1) does treat -b differently than Linux. This should fix the build. 2002-03-03 19:57:07 +01:00			`+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) \| patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)`
Upgrade to 641c source, add gcc2_freebsd_intel and gcc3_freebsd_intel cpp_uno source 2002-03-04 22:46:59 +01:00			`+.ELSE`
			`+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) \| patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)`
			`+.ENDIF # "$(OS)"=="NETBSD" \|\| "$(OS)"=="FREEBSD"`
Our patch(1) does treat -b differently than Linux. This should fix the build. 2002-03-03 19:57:07 +01:00			`.ENDIF # "$(BSCLIENT)"!=""`
			`.ENDIF # "$(GUI)"=="WNT"`
			`.ENDIF # "$(PATCH_FILE_NAME)"=="none" \|\| "$(PATCH_FILE_NAME)"==""`