Upgrade to OpenOffice 4.1.2-RC3.

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 an option to build and install the Wiki Publisher extension.  If
it is enabled, it is now handled as an integrated extension, so the
user does not have manually use the extension manager to track it down
and install it.

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.

7 files changed, 120 insertions, 79 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index d3afe8370cc6..a00c71ab554e 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	2
+#PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -101,9 +101,9 @@ AOOVERSION1=	4
 AOOVERSION2=	1
 AOOVERSION3=	2
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG=		AOO412m2\(Build:9781\)
-SVNREVISION=	1707648
-AOORC=rc2
+AOOTAG=		AOO412m3\(Build:9782\)
+SVNREVISION=	1709696
+AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -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,13 @@ 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 SDK WIKI_PUBLISHER CCACHE
+OPTIONS_DEFAULT=	CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
 GNOME_DESC=		GConf + screensaver presentation control via DBUS
 GNOMEVFS_DESC=		GNOME Virtual File System
 MMEDIA_DESC=		Multimedia backend for impress
+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 +171,11 @@ GNOMEVFS_USE=			GNOME=gnomevfs2
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 MMEDIA_USE=			GSTREAMER=yes
 
+SDK_CONFIGURE_ENABLE=		odk
+
+WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
+WIKI_PUBLISHER_VARS=	BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
+
 .include <bsd.port.pre.mk>
 
 .include <${FILESDIR}/Makefile.localized>
@@ -265,16 +273,14 @@ CONFIGURE_ARGS+=							\
 			--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
+.if defined (BUNDLED_EXTENSIONS)
+CONFIGURE_ARGS+=	--with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}"
+.endif
 
-ICONS=	${WRKSRC}/sysui/desktop/icons
+CREATE_TREE=	${WRKSRC}/sysui/desktop/share/create_tree.sh
 
 .include <${FILESDIR}/Makefile.knobs>
 
@@ -335,6 +341,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
@@ -399,19 +408,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/
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
@@ -428,30 +433,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} -c ${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}
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index aaf09f4af32c..5e9b025dd5d1 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-4.1.2-r1707648-src.tar.bz2) = 36220f4399ba94fb46a3d179a2344235bdac5da8d7add51203a6a8791da24966
-SIZE (openoffice/apache-openoffice-4.1.2-r1707648-src.tar.bz2) = 218882157
+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/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
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
 ---------------------------