svn commit: r401019 - in branches/2015Q4/editors/openoffice-devel: . files
Don Lewis
truckman at FreeBSD.org
Sat Nov 7 19:12:08 UTC 2015
Author: truckman
Date: Sat Nov 7 19:12:06 2015
New Revision: 401019
URL: https://svnweb.freebsd.org/changeset/ports/401019
Log:
MFH: r398790, r398959, r399282, r399537, r399606, r400085, r400938
Synchronize with r400938 in head.
* Upgrade to upstream SVN revision r1712473 to fix:
CVE-2015-5214
CVE-2015-5213
CVE-2015-5212
CVE-2015-4551
* Removing --enable-symbols=small from CONFIGURE_ARGS allows us to avoid
the need to use ${STRIP_CMD}.
* Explicity set $JAVA_HOME in startup wrapper to the OpenJDK version
used for the build to avoid any potential issues with relying on
javavmwrapper parsing bsd.java.mk to determine this at runtime.
* Fix an botch in the FreeBSD-specific $LD_LIBRARY_PATH code in the
startup wrapper.
* Java is needed at runtime, so flag it as a runtime dependency.
* Add an option to build and install the SDK and disable it by default.
The port has been building it all along, but not installing it. We
save only a small amount of time by not building it, but we save
about 70 MB of space when the port is installed.
* Add options to build and install the Wiki Publisher and PDF import
extensions. If they are enabled, they are now handled as integrated
extensions, so the user does not have manually use the extension
manager to track them down and install them.
* Tweak an existing script to install the icons instead of using a bunch
of complicated code in the Makefile.
* Nuke some unused targets in Makefiles.others. The SDK is now
explicitly handled, and the Uno Runtime Environment hasn't had the
capability for separate installation in quite some time.
* Nuke an extraneous "-" from the tar command when unpacking the
installation archive during staging.
Approved by: ports-secteam (feld)
Security: 18b3c61b-83de-11e5-905b-ac9e174be3af
Added:
branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh
- copied unchanged from r400085, head/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh
branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst
- copied unchanged from r400938, head/editors/openoffice-devel/files/patch-extensions.lst
branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm
- copied unchanged from r400938, head/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm
branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm
- copied unchanged from r400085, head/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm
Modified:
branches/2015Q4/editors/openoffice-devel/Makefile
branches/2015Q4/editors/openoffice-devel/distinfo
branches/2015Q4/editors/openoffice-devel/files/Makefile.others
branches/2015Q4/editors/openoffice-devel/files/pkg-message.in
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/editors/openoffice-devel/Makefile
==============================================================================
--- branches/2015Q4/editors/openoffice-devel/Makefile Sat Nov 7 18:55:37 2015 (r401018)
+++ branches/2015Q4/editors/openoffice-devel/Makefile Sat Nov 7 19:12:06 2015 (r401019)
@@ -3,10 +3,10 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION= 1
-PORTEPOCH= 3
+#PORTREVISION= 1
+PORTEPOCH= 4
CATEGORIES= editors java
-MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
+MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
LOCAL/truckman/openoffice:snap,extsrc
.if defined(LANG_PKGNAME)
@@ -102,7 +102,7 @@ AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO420m1\(Build:9800\)
-SVNREVISION= 1704217
+SVNREVISION= 1712473
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -133,6 +133,7 @@ USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
JAVA_BUILD= jdk
+JAVA_RUN= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
USE_PERL5= build
@@ -146,11 +147,14 @@ WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
-OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA CCACHE
-OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA
+OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT SDK WIKI_PUBLISHER CCACHE
+OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= GNOME Virtual File System
MMEDIA_DESC= Multimedia backend for impress
+PDFIMPORT_DESC= Build and install PDF import extension
+SDK_DESC= Build and install software development kit
+WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
CCACHE_DESC= Mimimize compile time of C/C++ programs
CUPS_CONFIGURE_ENABLE= cups
@@ -168,6 +172,12 @@ GNOMEVFS_USE= GNOME=gnomevfs2
MMEDIA_CONFIGURE_ENABLE= gstreamer
MMEDIA_USE= GSTREAMER=yes
+SDK_CONFIGURE_ENABLE= odk
+
+PDFIMPORT_CONFIGURE_ENABLE= pdfimport
+
+WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher
+
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
@@ -261,21 +271,14 @@ CONFIGURE_ARGS+= \
--with-system-sane \
--with-system-serf \
--with-system-stdlibs \
- --enable-symbols=small \
--without-stlport \
--with-vendor="FreeBSD ports system" \
--enable-verbose \
--with-system-vigra \
- --enable-wiki-publisher \
--with-system-xrender \
--with-system-zlib
-#AOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
-#AOOEXTENSIONS+= presenter/presenter-screen.oxt
-#AOOEXTENSIONS+= pdfimport/pdfimport.oxt
-AOOEXTENSIONS+= swext/wiki-publisher.oxt
-
-ICONS= ${WRKSRC}/sysui/desktop/icons
+CREATE_TREE= ${WRKSRC}/sysui/desktop/share/create_tree.sh
.include <${FILESDIR}/Makefile.knobs>
@@ -336,6 +339,9 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '-${AOOSUFFIX}'/" \
${WRKSRC}/sysui/desktop/productversion.mk
+ ${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
+ ${WRKSRC}/desktop/scripts/soffice.sh
+ ${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
.if ${COMPILER_TYPE} == gcc
# g++49 -Os sometimes leaves inline class methods undefined,
# affects fmgridif.cxx and ColumnControl.cxx
@@ -400,23 +406,15 @@ do-build:
LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc}
do-install:
- @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \
- ${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \
- ${STAGEDIR}${DESKTOPDIR}
+ @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
+ ${STAGEDIR}${DESKTOPDIR} \
+ ${STAGEDIR}${PREFIX}/share/mime/packages
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
for i in *.tar.?z ; do \
${ECHO_CMD} "extracting $$i" ; \
- ${TAR} -s '|./[^/]*/||' -xz -f $$i - \
+ ${TAR} -s '|./[^/]*/||' -xz -f $$i \
-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
done
- @${ECHO_CMD} "installing extensions" ; \
- cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; \
- ${INSTALL_DATA} ${AOOEXTENSIONS} \
- ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/
- @cd ${STAGEDIR}${OOPATH}/program ; \
- ${ECHO_CMD} "stripping executables and shared libraries" ; \
- ${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
- regview *.so* *.bin
${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
${REINPLACE_CMD} \
-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
@@ -433,30 +431,33 @@ do-install:
simpress smath spadmin swriter ; do \
${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
done
- ${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
- @${ECHO_CMD} "installing application icons"
- @cd ${ICONS} ; for dir in hicolor/*/apps ; do \
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \
- for app in base calc draw impress math printeradmin startcenter writer; do \
- icon_src=$${dir}/$${app}.png; \
- icon_dst=share/icons/$${dir}/${EXECBASE}-$${app}.png; \
- if [ -r $${icon_src} ]; then \
- ${INSTALL_DATA} $${icon_src} \
- ${STAGEDIR}${PREFIX}/$${icon_dst} ; \
- fi \
- done ; \
- done
- @${ECHO_CMD} "installing mimetype icons"
- @cd ${ICONS} ; for dir in hicolor/*/mimetypes ; do \
- dstdir=${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \
- ${MKDIR} $${dstdir} ; \
- ${INSTALL_DATA} $${dir}/*.png $${dstdir}/ ; \
- done
+ @${ECHO_CMD} "adding desktop support"
+ @${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
+ @cd ${WRKSRC}/sysui/unxfbsd?.pro/misc/openoffice ; \
+ DESTDIR=${STAGEDIR} \
+ GNOMEDIR=${PREFIX} \
+ ICON_PREFIX=openoffice${AOOVERSION1} \
+ ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons \
+ ICON_THEMES="hicolor/??x??" \
+ KDEMAINDIR=${PREFIX} \
+ PREFIX=openoffice${AOOVERSION1} \
+ ${SH} ${CREATE_TREE} ; \
+ ${INSTALL_DATA} apacheopenoffice.xml \
+ ${STAGEDIR}/${PREFIX}/share/mime/packages
+
+do-install-SDK-on:
+ ${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
+ -f ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
+ @f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
+ ${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
+
+post-install:
@${ECHO_CMD} "generating plist";
@cd ${STAGEDIR}${PREFIX} ; (\
- ${ECHO_CMD} "share/applications/${EXECBASE}" ; \
${FIND} -s bin -name "${EXECBASE}*" ; \
- ${FIND} -s ${INSTALLATION_BASEDIR} share/icons \! -type d ; \
+ ${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
+ share/application-registry share/icons \
+ share/mime-info share/mime share/mimelnk \! -type d ; \
${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
${SED} -e 's/^/@dir /' ; \
) >> ${TMPPLIST}
Modified: branches/2015Q4/editors/openoffice-devel/distinfo
==============================================================================
--- branches/2015Q4/editors/openoffice-devel/distinfo Sat Nov 7 18:55:37 2015 (r401018)
+++ branches/2015Q4/editors/openoffice-devel/distinfo Sat Nov 7 19:12:06 2015 (r401019)
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-r1704217-src.tar.xz) = 52b0c1c54cfd0aa9ec1bd27a99c2c6240fd4279171bcf6025383fe7e0d55f24b
-SIZE (openoffice/apache-openoffice-r1704217-src.tar.xz) = 215145548
+SHA256 (openoffice/apache-openoffice-r1712473-src.tar.xz) = 510ea8731ef43c93dfc88dba07d42b3580a38430e2822fd639aefa42a776c71f
+SIZE (openoffice/apache-openoffice-r1712473-src.tar.xz) = 215169356
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
Modified: branches/2015Q4/editors/openoffice-devel/files/Makefile.others
==============================================================================
--- branches/2015Q4/editors/openoffice-devel/files/Makefile.others Sat Nov 7 18:55:37 2015 (r401018)
+++ branches/2015Q4/editors/openoffice-devel/files/Makefile.others Sat Nov 7 19:12:06 2015 (r401019)
@@ -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
Copied: branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh (from r400085, head/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh Sat Nov 7 19:12:06 2015 (r401019, copy of r400085, head/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}
Copied: branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst (from r400938, head/editors/openoffice-devel/files/patch-extensions.lst)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst Sat Nov 7 19:12:06 2015 (r401019, copy of r400938, head/editors/openoffice-devel/files/patch-extensions.lst)
@@ -0,0 +1,17 @@
+--- extensions.lst.orig 2015-10-24 06:26:40 UTC
++++ extensions.lst
+@@ -37,6 +37,14 @@
+ # [ language=all && ENABLE_XXX ]
+ # file://XXX.oxt
+
++# PDF Import extension
++[ language=all && ENABLE_PDFIMPORT=YES ]
++ file://pdfimport/pdfimport.oxt
++
++# Wiki Publisher extension
++[ language=all && ENABLE_MEDIAWIKI=YES ]
++ file://swext/wiki-publisher.oxt
++
+ # English dictionary
+ [ language=en.* || language=de || language=it ]
+ f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt"
Copied: branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm (from r400938, head/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm Sat Nov 7 19:12:06 2015 (r401019, copy of r400938, head/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm)
@@ -0,0 +1,13 @@
+--- solenv/bin/modules/ExtensionsLst.pm.orig 2014-02-25 08:33:31 UTC
++++ solenv/bin/modules/ExtensionsLst.pm
+@@ -592,8 +592,9 @@ sub GetExtensionList ($@)
+ my $protocol_selector = shift;
+ my @language_list = @_;
+
+- if (defined $ENV{'ENABLE_BUNDLED_DICTIONARIES'}
++ if ((defined $ENV{'ENABLE_BUNDLED_DICTIONARIES'}
+ && $ENV{'ENABLE_BUNDLED_DICTIONARIES'} eq "YES")
++ || $protocol_selector eq "file")
+ {
+ my $full_file_name = Prepare();
+ my @urls = ParseExtensionsLst($full_file_name, \@language_list);
Copied: branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm (from r400085, head/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm Sat Nov 7 19:12:06 2015 (r401019, copy of r400085, head/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);
Modified: branches/2015Q4/editors/openoffice-devel/files/pkg-message.in
==============================================================================
--- branches/2015Q4/editors/openoffice-devel/files/pkg-message.in Sat Nov 7 18:55:37 2015 (r401018)
+++ branches/2015Q4/editors/openoffice-devel/files/pkg-message.in Sat Nov 7 19:12:06 2015 (r401019)
@@ -32,12 +32,7 @@ to your PATH and you will be able to use
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/
-
-5. If you run into problems
+4. If you run into problems
---------------------------
If you somehow run into problems, please remove the already installed
"%%AOOUDIR%%" directory in your home directory, then redo the
More information about the svn-ports-all
mailing list