Date: Fri, 6 Nov 2015 15:50:39 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400938 - in head/editors/openoffice-devel: . files Message-ID: <201511061550.tA6FodVZ057885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Fri Nov 6 15:50:39 2015 New Revision: 400938 URL: https://svnweb.freebsd.org/changeset/ports/400938 Log: Switch back to tracking the upstream trunk instead of OpenOffice 4.1.2 release candidates. Upgrade to SVN revision r1712473. Add an option to build and install the PDF Import extension and enable it by default. Patch the extensions.lst file so that it points to the locations of the extension files rather than passing that information as a configure option. Add a patch to enable enable the use of file:// in extensions.lst for local integrated extensions as is documented in the comments in this file. Nuke the patches that have been committed upstream. Don't try to run the create_tree.sh script with "sh -c" since this script is not marked executable. MFH: 2015Q4 Added: head/editors/openoffice-devel/files/patch-extensions.lst (contents, props changed) head/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm (contents, props changed) Deleted: head/editors/openoffice-devel/files/patch-configure.in head/editors/openoffice-devel/files/patch-i114430-41x head/editors/openoffice-devel/files/patch-openjdk8 head/editors/openoffice-devel/files/patch-sdext_prj_build.lst Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo head/editors/openoffice-devel/files/pkg-message.in Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Fri Nov 6 15:48:51 2015 (r400937) +++ head/editors/openoffice-devel/Makefile Fri Nov 6 15:50:39 2015 (r400938) @@ -98,12 +98,12 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf AOOVERSION1= 4 -AOOVERSION2= 1 -AOOVERSION3= 2 +AOOVERSION2= 2 +AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO412m3\(Build:9782\) -SVNREVISION= 1709696 -AOORC=rc3 +AOOTAG= AOO420m1\(Build:9800\) +SVNREVISION= 1712473 +#AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} @@ -147,11 +147,12 @@ WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache -OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA SDK WIKI_PUBLISHER CCACHE -OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER +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 @@ -173,8 +174,9 @@ MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk +PDFIMPORT_CONFIGURE_ENABLE= pdfimport + WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher -WIKI_PUBLISHER_VARS= BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt .include <bsd.port.pre.mk> @@ -276,10 +278,6 @@ CONFIGURE_ARGS+= \ --with-system-xrender \ --with-system-zlib -.if defined (BUNDLED_EXTENSIONS) -CONFIGURE_ARGS+= --with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}" -.endif - CREATE_TREE= ${WRKSRC}/sysui/desktop/share/create_tree.sh .include <${FILESDIR}/Makefile.knobs> @@ -443,7 +441,7 @@ do-install: ICON_THEMES="hicolor/??x??" \ KDEMAINDIR=${PREFIX} \ PREFIX=openoffice${AOOVERSION1} \ - ${SH} -c ${CREATE_TREE} ; \ + ${SH} ${CREATE_TREE} ; \ ${INSTALL_DATA} apacheopenoffice.xml \ ${STAGEDIR}/${PREFIX}/share/mime/packages Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Fri Nov 6 15:48:51 2015 (r400937) +++ head/editors/openoffice-devel/distinfo Fri Nov 6 15:50:39 2015 (r400938) @@ -1,5 +1,5 @@ -SHA256 (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 2e06774424eb564559f9e6d63ff79aa00522b210067717c5a8cfb54b3b7f1812 -SIZE (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 219041975 +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 Added: head/editors/openoffice-devel/files/patch-extensions.lst ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-extensions.lst Fri Nov 6 15:50:39 2015 (r400938) @@ -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" Added: head/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm Fri Nov 6 15:50:39 2015 (r400938) @@ -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); Modified: head/editors/openoffice-devel/files/pkg-message.in ============================================================================== --- head/editors/openoffice-devel/files/pkg-message.in Fri Nov 6 15:48:51 2015 (r400937) +++ head/editors/openoffice-devel/files/pkg-message.in Fri Nov 6 15:50:39 2015 (r400938) @@ -32,11 +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 is now an integrated extension. - -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511061550.tA6FodVZ057885>