Remove majority of the javadoc magic from configure.ac. Disable linting

of JavaDoc comments for "valid" HTML. Merge patches for building against
newer boost.

10 files changed, 192 insertions, 3 deletions

diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo
index ee52d204683..303671943d1 100644
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2015/08/12 00:49:24 ryoon Exp $
+$NetBSD: distinfo,v 1.43 2015/09/23 20:45:50 joerg Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -146,14 +146,22 @@ RMD160 (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = 5b7ee3094d78013ea
 Size (libreoffice/libreoffice-translations-4.4.5.2.tar.xz) = 127872924 bytes
 SHA1 (patch-Makefile.in) = e34092a731f4da0d8c048945c75287327b6b9cb2
 SHA1 (patch-bin_distro-install-desktop-integration) = 78921a0fb6db8b87f5d64c09579dc6f9211949b5
-SHA1 (patch-configure.ac) = 271be73ef8ed5e507660098a92b98eeca85bb62f
+SHA1 (patch-configure.ac) = ff940ab10b913d24bc6b7a8e7c2f8f3c16673ab7
 SHA1 (patch-desktop_Library__sofficeapp.mk) = e445b1a265fadf4f83f1c40bc541c11c26860352
+SHA1 (patch-external_jfreereport_java_sac_build.xml) = 675a37dcf3a813f890ec2c28cb7c6b0948610445
+SHA1 (patch-external_libebook_ExternalProject__libebook.mk) = a9c2f7d30cf8efc7acea4d4a0523bad801c9b930
+SHA1 (patch-external_libmspub_ExternalProject__libmspub.mk) = 4c3555003d53c896935b74251847711b67eaa18d
+SHA1 (patch-external_liborcus_ExternalProject__liborcus.mk) = 637058d2c5e930db086238773ccb926997a1de46
+SHA1 (patch-external_librevenge_ExternalProject__librevenge.mk) = 334e4295af4a59459c304ff2d20176d16c07477c
 SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
+SHA1 (patch-odk_CustomTarget__javadoc.mk) = e4ba79d7109b51d44338353790b7587d8d0a4dda
 SHA1 (patch-solenv_bin_ooinstall) = 3c9be63acc0af31ca0509f6546ae02ac53aff878
 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
 SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb
 SHA1 (patch-solenv_gbuild_ExternalProject.mk) = dd55f3e5fd17f6060898c68a7e1d97e647d4b5b1
 SHA1 (patch-solenv_gbuild_Module.mk) = 729f051341b21325537a7f9902e7283caa66a456
+SHA1 (patch-solenv_gbuild_platform_com__GCC__defs.mk) = 72e53e2f554714878853b4998fcac4ac20560e18
+SHA1 (patch-solenv_gbuild_platform_com__MSC__defs.mk) = 4d91f1ba84cee9cf1503736c41548e96507d6a1a
 SHA1 (patch-svx_Executable__gengal.mk) = 45de03599790cabea05539b4bb9fd01098c25eb8
 SHA1 (patch-sw_Executable__tiledrendering.mk) = a1a4c520582772526d821a78e42a23e182cdfba1
 SHA1 (patch-sysui_desktop_share_create_tree.sh) = 338cb0f157ea9b49965aa7b31350173b8b7557a6
diff --git a/misc/libreoffice4/patches/patch-configure.ac b/misc/libreoffice4/patches/patch-configure.ac
index 391c3527a62..24d25ba9e65 100644
--- a/misc/libreoffice4/patches/patch-configure.ac
+++ b/misc/libreoffice4/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.8 2015/02/04 18:19:34 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.9 2015/09/23 20:45:50 joerg Exp $
 
 * Use gstreamer under OpenBSD
 * Add FreeBSD support (GNU patch is not needed)
@@ -34,6 +34,38 @@ $NetBSD: patch-configure.ac,v 1.8 2015/02/04 18:19:34 ryoon Exp $
          _java_target_ver="1.6"
      else
          _java_target_ver="1.5"
+@@ -6755,30 +6757,7 @@ dnl ====================================
+ dnl Checks for javadoc
+ dnl ===================================================================
+ if test "$ENABLE_JAVA" != ""; then
+-    if test -z "$with_jdk_home"; then
+-        AC_PATH_PROG(JAVADOC, javadoc)
+-    else
+-        _javadoc_path="$with_jdk_home/bin/javadoc"
+-        dnl Check if there is a javadoc at all.
+-        if test -x "$_javadoc_path"; then
+-            JAVADOC=$_javadoc_path
+-        else
+-            AC_PATH_PROG(JAVADOC, javadoc)
+-        fi
+-    fi
+-    if test -z "$JAVADOC"; then
+-        AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home])
+-    fi
+-    if test "$build_os" = "cygwin"; then
+-        if test x`echo "$JAVADOC" | $GREP -i '\.exe$'` = x; then
+-            JAVADOC="${JAVADOC}.exe"
+-        fi
+-        JAVADOC=`win_short_path_for_make "$JAVADOC"`
+-    fi
+-
+-    if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
+-    JAVADOCISGJDOC="yes"
+-    fi
++    AC_PATH_PROG(JAVADOC, javadoc)
+ fi
+ AC_SUBST(JAVADOCISGJDOC)
+ 
 @@ -7780,7 +7782,7 @@ no|disable)
      else
          # Unset variables set by the above AM_PATH_PYTHON so that
diff --git a/misc/libreoffice4/patches/patch-external_jfreereport_java_sac_build.xml b/misc/libreoffice4/patches/patch-external_jfreereport_java_sac_build.xml
new file mode 100644
index 00000000000..800aef7a934
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-external_jfreereport_java_sac_build.xml
@@ -0,0 +1,12 @@
+$NetBSD: patch-external_jfreereport_java_sac_build.xml,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+--- external/jfreereport/java/sac/build.xml.orig	2015-08-28 12:15:16.000000000 +0000
++++ external/jfreereport/java/sac/build.xml
+@@ -49,6 +49,7 @@
+   <target name="javadoc" depends="prepare">
+     <javadoc sourcepath="${src}"
+             destdir="${build.doc}"
++            additionalparam="-Xdoclint:none"
+             doctitle="${name} JavaDoc"
+             windowtitle="${name} JavaDoc"
+             package="true"
diff --git a/misc/libreoffice4/patches/patch-external_libebook_ExternalProject__libebook.mk b/misc/libreoffice4/patches/patch-external_libebook_ExternalProject__libebook.mk
new file mode 100644
index 00000000000..5b4e84679ab
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-external_libebook_ExternalProject__libebook.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-external_libebook_ExternalProject__libebook.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/libebook/ExternalProject_libebook.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/libebook/ExternalProject_libebook.mk
+@@ -38,7 +38,10 @@ $(call gb_ExternalProject_get_state_targ
+ 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+ 			--disable-werror \
+ 			--disable-weffc \
+-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
++			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
++			-DBOOST_ERROR_CODE_HEADER_ONLY \
++			-DBOOST_SYSTEM_NO_DEPRECATED \
++			-I$(BUILDDIR)/config_$(gb_Side))" \
+ 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
+ 			XML_LIBS="$(LIBXML_LIBS)" \
+ 			REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
diff --git a/misc/libreoffice4/patches/patch-external_libmspub_ExternalProject__libmspub.mk b/misc/libreoffice4/patches/patch-external_libmspub_ExternalProject__libmspub.mk
new file mode 100644
index 00000000000..d980b2a45b0
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-external_libmspub_ExternalProject__libmspub.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-external_libmspub_ExternalProject__libmspub.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/libmspub/ExternalProject_libmspub.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/libmspub/ExternalProject_libmspub.mk
+@@ -35,7 +35,10 @@ $(call gb_ExternalProject_get_state_targ
+ 			--disable-werror \
+ 			--disable-weffc \
+ 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
++			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
++			-DBOOST_ERROR_CODE_HEADER_ONLY \
++			-DBOOST_SYSTEM_NO_DEPRECATED \
++			-I$(BUILDDIR)/config_$(gb_Side))" \
+ 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ 		&& $(MAKE) \
+ 	)
diff --git a/misc/libreoffice4/patches/patch-external_liborcus_ExternalProject__liborcus.mk b/misc/libreoffice4/patches/patch-external_liborcus_ExternalProject__liborcus.mk
new file mode 100644
index 00000000000..05fd476e2d7
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-external_liborcus_ExternalProject__liborcus.mk
@@ -0,0 +1,19 @@
+$NetBSD: patch-external_liborcus_ExternalProject__liborcus.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/liborcus/ExternalProject_liborcus.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/liborcus/ExternalProject_liborcus.mk
+@@ -70,7 +70,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
+ endif
+ endif
+ 
+-liborcus_CXXFLAGS=$(CXXFLAGS)
++liborcus_CXXFLAGS=$(CXXFLAGS) -DBOOST_SYSTEM_NO_DEPRECATED
+ liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
+ ifeq ($(COM),MSC)
+ liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/misc/libreoffice4/patches/patch-external_librevenge_ExternalProject__librevenge.mk b/misc/libreoffice4/patches/patch-external_librevenge_ExternalProject__librevenge.mk
new file mode 100644
index 00000000000..7411dc041aa
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-external_librevenge_ExternalProject__librevenge.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-external_librevenge_ExternalProject__librevenge.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/librevenge/ExternalProject_librevenge.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/librevenge/ExternalProject_librevenge.mk
+@@ -35,7 +35,10 @@ $(call gb_ExternalProject_get_state_targ
+ 			--disable-generators \
+ 			--without-docs \
+ 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
++			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
++			-DBOOST_ERROR_CODE_HEADER_ONLY \
++			-DBOOST_SYSTEM_NO_DEPRECATED \
++			-I$(BUILDDIR)/config_$(gb_Side))" \
+ 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ 		&& $(MAKE) \
diff --git a/misc/libreoffice4/patches/patch-odk_CustomTarget__javadoc.mk b/misc/libreoffice4/patches/patch-odk_CustomTarget__javadoc.mk
new file mode 100644
index 00000000000..ba793a0bd30
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-odk_CustomTarget__javadoc.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-odk_CustomTarget__javadoc.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+--- odk/CustomTarget_javadoc.mk.orig	2015-07-22 21:09:04.000000000 +0000
++++ odk/CustomTarget_javadoc.mk
+@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d
+ 		$(call gb_Jar_get_target,ridl)
+ 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
+ 	$(call gb_Helper_abbreviate_dirs,\
+-		$(JAVADOC) -J-Xmx120m -use -splitindex \
++		$(JAVADOC) -J-Xmx120m -use -splitindex -Xdoclint:none \
+ 		-windowtitle "Java UNO Runtime Reference" \
+ 		-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
+ 		-tag attention:a:"Attention:" \
diff --git a/misc/libreoffice4/patches/patch-solenv_gbuild_platform_com__GCC__defs.mk b/misc/libreoffice4/patches/patch-solenv_gbuild_platform_com__GCC__defs.mk
new file mode 100644
index 00000000000..be2e4359037
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-solenv_gbuild_platform_com__GCC__defs.mk
@@ -0,0 +1,19 @@
+$NetBSD: patch-solenv_gbuild_platform_com__GCC__defs.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- solenv/gbuild/platform/com_GCC_defs.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ solenv/gbuild/platform/com_GCC_defs.mk
+@@ -47,6 +47,8 @@ gb_CPPU_ENV := gcc3
+ gb_AFLAGS := $(AFLAGS)
+ 
+ gb_COMPILERDEFS := \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_SYSTEM_NO_DEPRECATED \
+ 	-DCPPU_ENV=$(gb_CPPU_ENV) \
+ 
+ gb_CFLAGS_COMMON := \
diff --git a/misc/libreoffice4/patches/patch-solenv_gbuild_platform_com__MSC__defs.mk b/misc/libreoffice4/patches/patch-solenv_gbuild_platform_com__MSC__defs.mk
new file mode 100644
index 00000000000..8e58d487ef6
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-solenv_gbuild_platform_com__MSC__defs.mk
@@ -0,0 +1,20 @@
+$NetBSD: patch-solenv_gbuild_platform_com__MSC__defs.mk,v 1.1 2015/09/23 20:45:50 joerg Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- solenv/gbuild/platform/com_MSC_defs.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ solenv/gbuild/platform/com_MSC_defs.mk
+@@ -41,6 +41,9 @@ gb_CXX := $(CXX)
+ endif
+ 
+ gb_COMPILERDEFS := \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
++	-DBOOST_SYSTEM_NO_DEPRECATED \
+ 	-D_CRT_NON_CONFORMING_SWPRINTFS \
+ 	-D_CRT_NONSTDC_NO_DEPRECATE \
+ 	-D_CRT_SECURE_NO_DEPRECATE \