2 files changed, 72 insertions, 26 deletions

diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others
index 5a5dd2495c91..0cb16885f9af 100644
--- a/editors/openoffice-3-devel/files/Makefile.others
+++ b/editors/openoffice-3-devel/files/Makefile.others
@@ -18,21 +18,22 @@ package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
+	#@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake sdkoo'
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
-		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
-		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
+	#@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake ure_en-US'
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
@@ -49,9 +50,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice-3-devel/files/patch-sdkoo b/editors/openoffice-3-devel/files/patch-sdkoo
index 6abc48956024..6dfc9a5fb029 100644
--- a/editors/openoffice-3-devel/files/patch-sdkoo
+++ b/editors/openoffice-3-devel/files/patch-sdkoo
@@ -1,19 +1,64 @@
-building sdk is broken at the moment.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.47
-diff -u -r1.47 makefile.mk
---- instsetoo_native/util/makefile.mk	11 Nov 2005 10:39:44 -0000	1.47
-+++ instsetoo_native/util/makefile.mk	17 Nov 2005 00:11:06 -0000
-@@ -96,7 +96,8 @@
- 	@echo "No EPM: do no packaging at this stage"
- .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
- .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
--ALLTAR : openoffice sdkoo ure_en-US
-+#ALLTAR : openoffice sdkoo ure_en-US
-+ALLTAR : openoffice
- .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
- ALLTAR : updatepack
- .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : <maho@openoffice.org> (JCA)
+Description  : FreeBSD porting : building sdk fails for FreeBSD
+
+1. Build error
+dmake sdkoo fails like:
+
+##############################################################################
+... starting unpatched epm ...
+... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v  2>&1 | ...
+
+**************************************************
+ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v  2>&1 |"!
+in function: call_epm
+**************************************************
+
+**************************************************
+ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log
+**************************************************
+... cleaning the output tree ...
+... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ...
+Fri Nov 18 22:49:33 2005 (08:05 min.)
+dmake:  Error code 255, while making 'sdkoo_en-US.bsd'
+'---* tg_merge.mk *---'
+##############################################################################
+
+2. Reason why it fails:
+since quoting for filename containing `$' produces an error
+
+tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory
+tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory
+
+3. Solution
+
+For FreeBSD, we don't need quoting. We use printf for files names
+instead of using qprintf, a function that treats quoting string.
+
+--- epm/epm-3.7.patch	Sat Nov 19 10:21:34 2005
++++ epm/epm-3.7.patch	Sat Nov 19 10:22:23 2005
+@@ -586,3 +586,23 @@
+   }
+   
+ --- 457,462 ----
++
++*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
++--- misc/build/epm-3.7/bsd.c	Sat Jun  4 06:18:27 2005
++***************
++*** 234,240 ****
++        case 'c' :
++        case 'f' :
++        case 'l' :
++!           qprintf(fp, "%s\n", file->dst + 1);
++            break;
++      }
++    }
++--- 243,249 ----
++        case 'c' :
++        case 'f' :
++        case 'l' :
++!           fprintf(fp, "%s\n", file->dst + 1);
++            break;
++      }
++    }