Update to SVN revision 1652526.

Resynchronize to openoffice-4 including:

  * portlint fixes

  * fix all but one stage-qa warning

  * add source makefile patch to unbreak --with-system-jpeg

  * add the --with-system-hyphen, --with-system-nss, --with-system-jpeg,
    and --with-system-mythes configure options

  * remove the --with-system-saxon option to allow coexistance with
    math/scilab

  * add all distfiles that were previously downloaded during build
    to the ext_sources distfile, and add --disable-fetch-external

  * make the graphics/png dependency explicit

  * change from USE_GCC=yes to USE_GCC=4.8 because of a compile error with
    gcc 4.9

  * remove SVNREVISION from the ext_sources tarball name and
    tweak how it is extracted to allow it to be shared by
    multiple AOO releases

  * remove trailing cruft from files/patch-sal (from pfg@)

  * nuke files/patch-sal-inline (from pfg@)

  * modernize MASTER_SITES syntax and update MASTER_SITE for unowinreg.dll

  * unbreak sdk, package-canonical, and languagepack targets (from pfg@)

  * don't truncate generated plist (from mat@)

  * don't add @dirrm to generated plist, but add @dir for empty directories

  * don't add license files to generated plist because the framework
    does this (from mat@)

  * don't add a blank line to generated plist

  * merge post-install target into do-install (from mat@)

  * misc Makefile cleanup

PR:		192557
Differential Revision:	https://reviews.freebsd.org/D1571
Reviewed by:	pfg
Approved by:	mat (mentor)

6 files changed, 124 insertions, 82 deletions

diff --git a/editors/openoffice-devel/files/Makefile.others b/editors/openoffice-devel/files/Makefile.others
index 3eb9001c3118..1dc162e388cd 100644
--- a/editors/openoffice-devel/files/Makefile.others
+++ b/editors/openoffice-devel/files/Makefile.others
@@ -12,38 +12,37 @@
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for Apache OpenOffice mirror upload";
 	@${LN} ${PKGFILE} \
-		${WRKDIR}/../OOo-Dev_${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
+		${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX}
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for Apache OpenOffice";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ;\
-	${TAR} cfj ${WRKDIR}/../OOo-Dev_${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
+	@${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/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd/ooobasis*.t?z
-	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${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}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${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/bsd/install/${LOCALIZED_LANG}/freebsd/openoffice*.t?z
-	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
+		${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}/../OOo-Dev-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
+		${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_BASENAME}_solver.tar.bz2 solver
+	@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver
 
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of Apache OpenOffice"
@@ -52,20 +51,19 @@ languagepack:
 .else
 	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
-
 .if !defined (ALL_LOCALIZED_LANGS)
 	@${RM} -fr ${WRKDIR}/langpack_tmp
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ls openoffice*.t?z ooobasis*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
 	@cd ${WRKDIR}/langpack_tmp ; \
 	for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
                 ${ECHO_CMD} "extracting $$i" ; \
-                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
+                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \
         done
-	@cd ${WRKDIR}/langpack_tmp/opt/ ; \
+	@cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-Dev_${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR}
 .endif
 .endif
diff --git a/editors/openoffice-devel/files/patch-jpeg b/editors/openoffice-devel/files/patch-jpeg
new file mode 100644
index 000000000000..84a659c0e34c
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-jpeg
@@ -0,0 +1,12 @@
+--- svtools/Library_svt.mk.orig	2014-02-25 00:28:36.000000000 -0800
++++ svtools/Library_svt.mk	2014-08-04 21:40:00.000000000 -0700
+@@ -76,6 +76,9 @@
+ $(eval $(call gb_Library_set_ldflags,svt,\
+ 	$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
+ ))
++$(eval $(call gb_Library_set_ldflags,svt,\
++	$$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \
++))
+ ifeq ($(GUIBASE),os2)
+ # YD FIXME above is not working... needs ldflags hack...
+ $(eval $(call gb_Library_set_ldflags,svt,\
diff --git a/editors/openoffice-devel/files/patch-sal b/editors/openoffice-devel/files/patch-sal
index ca4899eb8b02..25577d2b2b3f 100644
--- a/editors/openoffice-devel/files/patch-sal
+++ b/editors/openoffice-devel/files/patch-sal
@@ -11,43 +11,3 @@
      /** Returns a reference to a character of this string. */
      sal_Char& operator[]( int n ) { return pData->buffer[n]; }
      /** Returns a const reference to a character of this string. */
-build -- version: 275224
-
-
-=============
-Building module canvas
-=============
-
-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/inc
-
-
-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/factory
-
-
-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/tools
-
-
-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/null
-
-
-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/vcl
-
-
-Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
-
-Compiling: canvas/source/cairo/cairo_textlayout.cxx
-g++46  -fmessage-length=0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0   -I/usr/local/include/cairo -I/usr/local/include/glib-2.0 -I/usr/local/include/pixman-1  -I/usr/local/include/freetype2 -I/usr/local/include/libpng15 -D_THREAD_SAFE -I/usr/local/include   -I/usr/local/include/freetype2   -I. -I../../unxfbsdx.pro/inc/cairocanvas -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/inc -I. -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/stl -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/external -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/unxfbsdx/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/res -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc/Xp31 -I/usr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/local/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/openjdk6/include/native_threads/include -I/usr/local/include  -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/offuh -I. -I../../res -I. -pipe  -Wl,-rpath=/usr/local/lib/gcc46 -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc46/include/c++ -DSUPD=410 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGUI -DSOLAR_JAVA   -DVERBOSE -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../unxfbsdx.pro/slo/cairo_textlayout.o /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx 
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'void cairocanvas::TextLayout::useFont(cairo::Cairo*)':
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error: within this context
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::Cairo*)':
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error: within this context
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::SurfaceSharedPtr&, OutputDevice&, const Point&, const com::sun::star::rendering::ViewState&, const com::sun::star::rendering::RenderState&) const':
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:475:51: warning: declaration of 'aIter' shadows a previous local [-Wshadow]
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:415:47: warning: shadowed declaration is here [-Wshadow]
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:476:57: warning: declaration of 'aEnd' shadows a previous local [-Wshadow]
-/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:416:53: warning: shadowed declaration is here [-Wshadow]
-dmake:  Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayout.obj'
-ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
-
diff --git a/editors/openoffice-devel/files/patch-sal-inline b/editors/openoffice-devel/files/patch-sal-inline
deleted file mode 100644
index 8da6e53482aa..000000000000
--- a/editors/openoffice-devel/files/patch-sal-inline
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sal/util/makefile.mk
-===================================================================
---- sal/util/makefile.mk	(revision 1509387)
-+++ sal/util/makefile.mk	(working copy)
-@@ -45,6 +45,11 @@
- CFLAGS+= $(LFS_CFLAGS)
- CXXFLAGS+= $(LFS_CFLAGS)
- 
-+# gcc can have some broken inlining optimizations
-+.IF "$(OS)"=="FREEBSD" && "$(COM)" == "GCC"
-+CFLAGS += -fkeep-inline-functions
-+.ENDIF
-+
- .IF "$(depend)" == ""
- 
- # --- Files --------------------------------------------------------
diff --git a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx
deleted file mode 100644
index 28d522376d42..000000000000
--- a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- vcl/source/glyphs/graphite_adaptors.cxx.orig	2013-08-13 11:45:43.000000000 +0000
-+++ vcl/source/glyphs/graphite_adaptors.cxx	2013-12-31 16:39:41.000000000 +0000
-@@ -45,7 +45,7 @@
- 
- #include <salgdi.hxx>
- 
--#include <freetype/ftsynth.h>
-+#include <ftsynth.h>
- 
- // Module
- #include "gcach_ftyp.hxx"
diff --git a/editors/openoffice-devel/files/patch-webdav b/editors/openoffice-devel/files/patch-webdav
index dedd045d07f5..aebe1baa6d2c 100644
--- a/editors/openoffice-devel/files/patch-webdav
+++ b/editors/openoffice-devel/files/patch-webdav
@@ -32,3 +32,102 @@
  
  typedef serf_connection_t SerfConnection;
  
+--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig	2014-02-25 00:24:42.000000000 -0800
++++ ucb/source/ucp/webdav/SerfCallbacks.hxx	2014-07-28 01:11:38.000000000 -0700
+@@ -23,7 +23,7 @@
+ #ifndef INCLUDED_CALLBACKS_HXX
+ #define INCLUDED_CALLBACKS_HXX
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
+                                            serf_bucket_t **read_bkt,
+--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
++++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx	2014-07-28 01:11:43.000000000 -0700
+@@ -24,7 +24,7 @@
+ 
+ #include "SerfCopyReqProcImpl.hxx"
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ namespace http_dav_ucp
+ {
+--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig	2014-02-25 00:24:42.000000000 -0800
++++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx	2014-07-28 01:11:47.000000000 -0700
+@@ -24,7 +24,7 @@
+ 
+ #include "SerfDeleteReqProcImpl.hxx"
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ namespace http_dav_ucp
+ {
+--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
++++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx	2014-07-28 01:11:51.000000000 -0700
+@@ -24,7 +24,7 @@
+ 
+ #include "SerfMkColReqProcImpl.hxx"
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ namespace http_dav_ucp
+ {
+--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
++++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx	2014-07-28 01:11:57.000000000 -0700
+@@ -24,7 +24,7 @@
+ 
+ #include "SerfMoveReqProcImpl.hxx"
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ namespace http_dav_ucp
+ {
+--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
++++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx	2014-07-28 01:12:00.000000000 -0700
+@@ -24,7 +24,7 @@
+ 
+ #include "SerfPostReqProcImpl.hxx"
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ using namespace com::sun::star;
+ 
+--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
++++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx	2014-07-28 01:12:05.000000000 -0700
+@@ -26,7 +26,7 @@
+ 
+ #include "SerfPutReqProcImpl.hxx"
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ namespace http_dav_ucp
+ {
+--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig	2014-02-25 00:24:43.000000000 -0800
++++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx	2014-07-28 01:12:10.000000000 -0700
+@@ -26,7 +26,7 @@
+ #include <apr_errno.h>
+ #include <apr_pools.h>
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ #include "DAVTypes.hxx"
+ #include "DAVResource.hxx"
+--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig	2014-02-25 00:24:42.000000000 -0800
++++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx	2014-07-28 01:12:14.000000000 -0700
+@@ -22,7 +22,7 @@
+ #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
+ #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
+ 
+-#include <serf/serf.h>
++#include <serf.h>
+ 
+ #include <sal/types.h>
+ #include "DAVRequestEnvironment.hxx"