diff options
Diffstat (limited to 'editors/openoffice-devel/files')
5 files changed, 69 insertions, 36 deletions
diff --git a/editors/openoffice-devel/files/Makefile.others b/editors/openoffice-devel/files/Makefile.others index 1dc162e388cd..a8838f2deb93 100644 --- a/editors/openoffice-devel/files/Makefile.others +++ b/editors/openoffice-devel/files/Makefile.others @@ -3,43 +3,9 @@ # $FreeBSD$ #other stuffs which are not directly related to making ports -#package-rename: rename package for uploading -#package-canonical: making official packages (WIP) -#ure: URE (Uno Runtime Environment) packages (WIP) #solver: solver #languagepack: language pack -package-rename: - @${ECHO_MSG} "===> Rename package for Apache OpenOffice mirror upload"; - @${LN} ${PKGFILE} \ - ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX} - -package-canonical: - @${ECHO_MSG} "===> Canonical packaging for Apache OpenOffice"; - @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFIX}* ${WRKDIR}/../. - -sdk: - @${ECHO_MSG} "===> Make SDK of Apache OpenOffice" - @${RM} -fr ${WRKDIR}/sdk_tmp - @${MKDIR} ${WRKDIR}/sdk_tmp - @cd ${WRKDIR}/sdk_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice-*SDK*.tar.gz - @cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ - ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk - -ure: - @${ECHO_MSG} "===> Make Uno Runtime Environment of Apache OpenOffice" - @${RM} -fr ${WRKDIR}/ure_tmp - @${MKDIR} ${WRKDIR}/ure_tmp - @cd ${WRKDIR}/ure_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*URE*.tar.gz - @cd ${WRKDIR}/ure_tmp/Apache_OpenOffice*URE* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ - ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR} - solver: @${ECHO_MSG} "===> Make Solver of Apache OpenOffice" @cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver diff --git a/editors/openoffice-devel/files/patch-configure.in b/editors/openoffice-devel/files/patch-configure.in new file mode 100644 index 000000000000..39f1a18f9655 --- /dev/null +++ b/editors/openoffice-devel/files/patch-configure.in @@ -0,0 +1,32 @@ +--- configure.in.orig 2015-10-09 07:11:14 UTC ++++ configure.in +@@ -369,11 +369,11 @@ AC_ARG_WITH(bundled-extension-blobs, + and comply with their distribution requirements by updating the + files LICENSE_aggregated and NOTICE_aggregated accordingly + ],,) +-#AC_ARG_WITH(bundled-prereg-extensions, +-#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that +-# are to be bundled as pre-registered extensions. Make sure to only bundle +-# extensions which can be installed without requiring a license dialog +-#],,) ++AC_ARG_WITH(bundled-prereg-extensions, ++[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that ++ are to be bundled as pre-registered extensions. Make sure to only bundle ++ extensions which can be installed without requiring a license dialog ++],,) + AC_ARG_ENABLE(bundled-dictionaries, + [ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus) + according to main/extensions.lst and bundle them. Make sure to +@@ -1540,9 +1540,9 @@ else + fi + AC_SUBST(BUNDLED_EXTENSION_BLOBS) + +-#dnl =================================================================== +-#dnl Check extensions that are to be bundled as pre-registerd +-#dnl =================================================================== ++dnl =================================================================== ++dnl Check extensions that are to be bundled as pre-registerd ++dnl =================================================================== + if test -n "$with_bundled_prereg_extensions"; then + BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions" + else diff --git a/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh b/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh new file mode 100644 index 000000000000..708b8a63cc2b --- /dev/null +++ b/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh @@ -0,0 +1,16 @@ +--- desktop/scripts/soffice.sh.orig 2014-02-25 08:22:34 UTC ++++ desktop/scripts/soffice.sh +@@ -90,11 +90,11 @@ if [ -x "$sd_prog/javaldx" ] ; then + case "`uname -s`" in + FreeBSD) + sd_prog1="$sd_prog" +- LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}} ++ LD_LIBRARY_PATH=$sd_prog1${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export LD_LIBRARY_PATH + ;; + esac +- my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ ++ my_path=`JAVA_HOME="%%JAVA_HOME%%" "$sd_prog/javaldx" $BOOTSTRAPVARS \ + "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` + if [ -n "$my_path" ] ; then + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} diff --git a/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm b/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm new file mode 100644 index 000000000000..b6f0329c81bd --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm @@ -0,0 +1,20 @@ +--- solenv/bin/modules/installer/scriptitems.pm.orig 2014-02-27 09:52:15 UTC ++++ solenv/bin/modules/installer/scriptitems.pm +@@ -608,7 +608,7 @@ + } + + # Find the prereg directory entry so that we can create a new sub-directory. +- my $parentdir_gid = "gid_Brand_Dir_Share_Prereg_Bundled"; ++ my $parentdir_gid = "gid_Brand_Dir_Share_Extensions"; + my $parentdir = undef; + foreach my $dir (@{$dirsref}) + { +@@ -645,7 +645,7 @@ + 'UnixRights' => '444', + 'sourcepath' => File::Spec->catfile($ENV{'OUTDIR'}, "bin", $filename), + 'specificlanguage' => "", +- 'modules' => "gid_Module_Dictionaries", ++ 'modules' => "gid_Module_Root_Brand", + 'gid' => "gid_File_Extension_".$basename + }; + push( @filelist, $onefile); diff --git a/editors/openoffice-devel/files/pkg-message.in b/editors/openoffice-devel/files/pkg-message.in index 4587a89bc49b..fd12c0fefd4a 100644 --- a/editors/openoffice-devel/files/pkg-message.in +++ b/editors/openoffice-devel/files/pkg-message.in @@ -34,8 +34,7 @@ OpenOffice does need $LANG to be set to a suitable value. 4. Wiki Publisher Extension --------------------------- -The Wiki Publisher extension can be installed from -%%PRINSTALLATION_BASEDIR%%/extensions/ +The Wiki Publisher extension is now an integrated extension. 5. If you run into problems --------------------------- |