--- instsetoo_native/util/makefile.mk.orig.port	Thu Oct 21 13:45:54 2010
+++ instsetoo_native/util/makefile.mk	Sat Oct 23 18:40:06 2010
@@ -43,12 +43,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDI
 .ENDIF			# "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
 
+.IF "$(OS)"!="OPENBSD"
 .IF "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
 ENABLE_DOWNLOADSETS*=TRUE
 .ENDIF			# "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
 .IF "$(FORCE_DOWNLOADSETS)"!=""
 ENABLE_DOWNLOADSETS=TRUE
 .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
+.ENDIF
 
 .EXPORT: ENABLE_DOWNLOADSETS
 .EXPORT: LAST_MINOR
@@ -85,9 +87,9 @@ ALLTAR  : $(LOCALPYFILES)
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-ALLTAR : openoffice
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
 .ELSE
-ALLTAR : openoffice sdkoo_en-US ure_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
 .ENDIF
 .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
@@ -314,14 +316,14 @@ hack_msitemplates .PHONY:
 	-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
 	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-	$(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-	$(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
-	$(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-	$(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
+	$(GNUCOPY) -R $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
+	$(GNUCOPY) -R $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
+	$(GNUCOPY) -R $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+	$(GNUCOPY) -R $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
+	$(GNUCOPY) -R $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
+	$(GNUCOPY) -R $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
+	$(GNUCOPY) -R $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+	$(GNUCOPY) -R $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
 	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
