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)

9 files changed, 347 insertions, 293 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index f95585108545..5f141dfbe73d 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -2,31 +2,105 @@
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
-PORTVERSION=	4.1.${SVNREVISION}
-PORTREVISION=	5
+PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
 PORTEPOCH=	2
 CATEGORIES=	editors java
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	maho/openoffice
-DISTFILES+=	${OOOSRC} ${EXTSRC} unowinreg.dll
-EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
+MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
+		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
+		LOCAL/truckman/openoffice:snap,extsrc
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX=		${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX=		-${LANG_SUFFIX}
+.endif
+DISTFILES=	${OOOSRC}${OOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc
+EXTRACT_ONLY=	${OOOSRC}
 
-#de facto maintainer is maho@FreeBSD.org
-#Frequent Patch submitters should optionally sign Apache iCLA
 MAINTAINER=	office@FreeBSD.org
-COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
+#de facto maintainer is truckman@FreeBSD.org
+#Frequent Patch submitters should optionally sign Apache iCLA
+COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
 
 LICENSE=	APACHE20
 
-PKGNAMESUFFIX=	-devel
+BUILD_DEPENDS=								\
+		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
+		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
+		zip:${PORTSDIR}/archivers/zip				\
+		ant:${PORTSDIR}/devel/apache-ant			\
+		dmake:${PORTSDIR}/devel/dmake				\
+		epm:${PORTSDIR}/devel/epm				\
+		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
+		imake:${PORTSDIR}/devel/imake				\
+		gpatch:${PORTSDIR}/devel/patch				\
+		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
+		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
+		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh		\
+		bash:${PORTSDIR}/shells/bash				\
+		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=								\
+		libapr-1.so:${PORTSDIR}/devel/apr1			\
+		libcurl.so:${PORTSDIR}/ftp/curl				\
+		libcairo.so:${PORTSDIR}/graphics/cairo			\
+		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
+		libpng.so:${PORTSDIR}/graphics/png			\
+		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
+		libCoinMP.so:${PORTSDIR}/math/coinmp			\
+		libfreetype.so:${PORTSDIR}/print/freetype2		\
+		libnss3.so:${PORTSDIR}/security/nss			\
+		libexpat.so:${PORTSDIR}/textproc/expat2			\
+		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
+		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
+		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
+		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
+		librdf.so:${PORTSDIR}/textproc/redland			\
+		libserf-1.so:${PORTSDIR}/www/serf
+#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
+RUN_DEPENDS=								\
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
+		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
+		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
+
+AOOVERSION1=	4
+AOOVERSION2=	2
+AOOVERSION3=	0
+SVNREVISION=	1652526
+#AOORC=rc3
+EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz
+
+AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
+AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
+.if defined(AOORC)
+AOOSUFFIX=	${AOOVERSION}-${AOORC}
+OOOSRC=		apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
+AOODISTTAG=	
+.else
+AOOSUFFIX=	${PORTVERSION}
+OOOSRC=		apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX}
+AOODISTTAG=	:snap
+.endif
+
+OOODIR=			openoffice${AOOVERSION1}
+INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
+EXECBASE?=		openoffice-${AOOSUFFIX}
+DIST_SUBDIR=		openoffice
+
+NO_LATEST_LINK=	yes
+
+ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GNOME=	gtk20 libxslt libidl glib20
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USE_GL=		gl glu
 USE_GSTREAMER=	yes
-USE_GCC=	yes
-USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils python
+USE_GCC=	4.8
+USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:xz
 USE_PERL5=	build
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
@@ -36,22 +110,22 @@ OPTIONS_DEFAULT=GCONF GNOMEVFS
 GNOMEVFS_DESC=	Enable GNOME Virtual File System
 CCACHE_DESC=	Mimimize compile time of C/C++ programs
 
-.include "${.CURDIR}/files/Makefile.localized"
-
-USE_JAVA=	yes
-JAVA_BUILD=	jdk
-JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
-
 GCONF_USE=	GNOME=gconf2
 GCONF_CONFIGURE_OFF=--disable-gconf
 
 GNOMEVFS_USE=	GNOME=gnomevfs2
 GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
 
+.include <bsd.port.options.mk>
+
 .include <bsd.port.pre.mk>
 
-ONLY_FOR_ARCHS=	i386 amd64
+.include <${FILESDIR}/Makefile.localized>
+
+USE_JAVA=	yes
+JAVA_BUILD=	jdk
+JAVA_VENDOR=	openjdk
+JAVA_VERSION=	1.6+
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
@@ -59,36 +133,16 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
-EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}_2${EXTRACT_SUFX}
-OOODIR=			openoffice4
-SVNREVISION=		1560773
-INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
-EXECBASE?=		openoffice-r${SVNREVISION}
-DIST_SUBDIR=		openoffice
-SIMPLEOSVER=		${OSREL:C/\.//g}
+LOCALIZED_LANG?=	en-US
 
 PACKAGE_PREFIX=		Apache_OpenOffice
+
 .if ${ARCH} == amd64
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
 .else
 PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
 .endif
 
-LOCALIZED_LANG?=	en-US
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX=		${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX=		-${LANG_SUFFIX}
-.endif
-
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
-		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
-		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
-
 .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
@@ -99,48 +153,12 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		PATH=${WRKSRC}/solenv/bin:$$PATH	\
-		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libCoinMP.so:${PORTSDIR}/math/coinmp \
-		libserf-1.so:${PORTSDIR}/www/serf \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
-		libnss3.so:${PORTSDIR}/security/nss
-
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
-		gpatch:${PORTSDIR}/devel/patch \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bash:${PORTSDIR}/shells/bash \
-		imake:${PORTSDIR}/devel/imake \
-		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		ant:${PORTSDIR}/devel/apache-ant \
-		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
-		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
-		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
-		epm:${PORTSDIR}/devel/epm \
-		dmake:${PORTSDIR}/devel/dmake \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+		PATH=${WRKSRC}/solenv/bin:$$PATH
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
-WRKSRC?=	${WRKDIR}/aoo/main
+WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
+WRKSRC?=	${WRKSUBDIR}/main
 BASH?=		${PREFIX}/bin/bash
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
@@ -149,61 +167,62 @@ SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
 MAKE_JOBS_NUMBER=	4
 .endif
 
-CONFIGURE_ARGS+=	--enable-verbose \
-			--enable-symbols=small \
-			--enable-crashdump \
-			--with-vendor="FreeBSD ports system"	\
-			--with-epm=${LOCALBASE}/bin/epm \
-			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
-			--with-gperf=${LOCALBASE}/bin/gperf	\
-			--x-includes=${LOCALBASE}/include	\
-			--x-libraries=${LOCALBASE}lib	\
-			--with-system-libxml 		\
-			--with-system-libxslt 		\
-			--with-system-cairo --enable-cairo \
-			--with-system-zlib		\
-			--with-system-python		\
-			--with-system-expat		\
-			--with-system-openssl		\
-			--with-system-curl		\
-			--with-system-poppler \
-			--with-system-redland \
-			--with-system-libtextcat \
-			--with-system-vigra \
-			--with-system-stdlibs \
-			--with-system-apr \
-			--with-system-apr-util \
-			--with-system-coinmp \
-			--with-system-apache-commons=yes \
+CONFIGURE_ARGS+=							\
+			--with-system-apache-commons=yes		\
 			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
-			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar	\
+			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
 			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
-			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar	\
-			--with-system-lucene \
-			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar	\
-			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar	\
+			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \
+			--with-system-apr				\
+			--with-system-apr-util				\
+			--with-system-beanshell				\
+			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
+			--enable-category-b				\
+			--with-system-cairo --enable-cairo		\
+			--with-system-coinmp				\
+			--with-system-curl				\
+			--enable-crashdump				\
+			--enable-dbus					\
+			--with-epm=${LOCALBASE}/bin/epm			\
+			--with-system-expat				\
+			--disable-fetch-external			\
+			--without-fonts					\
+			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
+			--with-gperf=${LOCALBASE}/bin/gperf		\
+			--enable-gstreamer				\
+			--with-system-hunspell				\
+			--with-system-hyphen				\
+			--with-system-jpeg				\
 			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
-			--with-package-format="archive" \
-			--enable-gstreamer \
-			--enable-wiki-publisher \
-			--enable-dbus \
-			--enable-opengl \
-			--enable-category-b \
-			--enable-lockdown \
-			--with-system-hunspell \
-			--with-system-saxon     \
-			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
-			--with-system-beanshell	\
-			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
-			--without-fonts \
-			--with-system-serf \
-			--with-system-nss \
-			--without-stlport
-
-#			--with-system-jpeg
-#			--enable-pdfimport
-#			--without-stlport --disable-mozilla \
-#			--with-system-graphite \
+			--with-system-libtextcat			\
+			--with-system-libxml				\
+			--with-system-libxslt				\
+			--enable-lockdown				\
+			--with-system-lucene				\
+			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
+			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
+			--with-system-mythes				\
+			--with-system-nss				\
+			--enable-opengl					\
+			--with-system-openssl				\
+			--with-package-format="archive"			\
+			--with-system-poppler				\
+			--with-system-python				\
+			--with-system-redland				\
+			--with-system-serf				\
+			--with-system-stdlibs				\
+			--enable-symbols=small				\
+			--without-stlport				\
+			--with-vendor="FreeBSD ports system"		\
+			--enable-verbose				\
+			--with-system-vigra				\
+			--enable-wiki-publisher				\
+			--x-includes={LOCALBASE}/include		\
+			--x-libraries=${LOCALBASE}lib			\
+			--with-system-zlib
+# system-graphite causes breakage when compiled with clang and linked
+# with libc++ because aoo is compiled with gcc and linked with libstdc++.
+#			--with-system-graphite
 
 #OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 #OOOEXTENSIONS+=		presenter/presenter-screen.oxt
@@ -218,108 +237,101 @@ pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
-	@${RM} -f ${WRKDIR}/.PLIST*
-	@${RM} -f ${WRKDIR}/.install_done.*
-	@${RM} -f ${WRKDIR}/.package_done.*
-	@${RM} -f ${WRKDIR}/.extract_done.*
-	@${RM} -f ${WRKDIR}/.patch_done.*
-	@${RM} -f ${WRKDIR}/.configure_done.*
-	@${RM} -f ${WRKDIR}/.build_done.*
-	@${MKDIR} ${WRKDIR}
-	@${TOUCH} ${EXTRACT_COOKIE}
-	@${TOUCH} ${PATCH_COOKIE}
-	@${TOUCH} ${CONFIGURE_COOKIE}
-	@${TOUCH} ${BUILD_COOKIE}
+	${RM} -f ${WRKDIR}/.PLIST*
+	${RM} -f ${WRKDIR}/.install_done.*
+	${RM} -f ${WRKDIR}/.package_done.*
+	${RM} -f ${WRKDIR}/.extract_done.*
+	${RM} -f ${WRKDIR}/.patch_done.*
+	${RM} -f ${WRKDIR}/.configure_done.*
+	${RM} -f ${WRKDIR}/.build_done.*
+	${MKDIR} ${WRKDIR}
+	${TOUCH} ${EXTRACT_COOKIE}
+	${TOUCH} ${PATCH_COOKIE}
+	${TOUCH} ${CONFIGURE_COOKIE}
+	${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-#	@${MKDIR} ${WRKSRC}/../ext_sources
-#	@${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
-#	@${RM} -rf ${WRKSRC}/l10n
-	@${MKDIR} ${WRKSRC}/../ext_sources
-	@${RM} -rf ${WRKSRC}/l10n
+	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+	${RM} -rf ${WRKSRC}/l10n
 
 post-patch:
 .if defined (USE_GCC)
-	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
-	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
+	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .else
-	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
-	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
+	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .endif
 
 pre-configure:
-	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
+	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 
 do-build:
-	@cd ${WRKDIR}/aoo ; ${PRINTF} "[repositories]\n" > source_config
-	@cd ${WRKDIR}/aoo ; ${PRINTF} "main=active\n" >> source_config
-	@cd ${WRKDIR}/aoo ; ${PRINTF} "extras=active\n" >> source_config
-	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
+	cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
+	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
+	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
+	cd ${WRKSRC} ; ./bootstrap
+	cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
-	@${RM} -Rf ${WRKDIR}/tmp
-	@${MKDIR} ${WRKDIR}/tmp
+	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
+	${RM} -Rf ${WRKDIR}/tmp
+	${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
 	done
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
-	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
-	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-
-post-install:
-	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
+	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
+	cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
+	${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
+	${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
+	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
+	for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
+	done
+	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	@${ECHO_MSG} "===>  Add wrapper scripts";
-	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+	${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
+	${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
 			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
+	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
-	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
-	@${ECHO_CMD} "" > ${TMPPLIST}
-	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
-	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
-	@${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20"   >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}"     >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm share/licenses"                >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
-		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
-	@for app in base calc draw impress math writer; do \
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
+	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
+	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
+	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
+	cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
+		${XARGS} -n 1 ${ECHO_CMD} @dir >> ${TMPPLIST}
+	for app in base calc draw impress math writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
 		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
-	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
+	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
 		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
 		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
-	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
+	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
 		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
-	@${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
-	@${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
-	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
+	${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
+	${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
+	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
-	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
-	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
+	${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
+	for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
 				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
@@ -335,9 +347,10 @@ post-install:
 			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
 		done ; \
 	done
-	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
+	${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 
 .include <${FILESDIR}/Makefile.others>
+
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 1bdc5c50482f..61c42cfad6d2 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 5a6247121703b10c44161594c23f439d5488bf011750ed7e0632b3f033e67aea
-SIZE (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 245790501
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = ae9ab2fc1eeead0700ce95b8af01fab4f4b45f3f008d43b214f7ddec7f8c8e41
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = 147382699
+SHA256 (openoffice/apache-openoffice-r1652526-src.tar.xz) = 0db1401923df096dd9497813ef5849f3fbe91f9c49f32e252a389649315ec906
+SIZE (openoffice/apache-openoffice-r1652526-src.tar.xz) = 215154504
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = b01b8894469a80667b0551ea6c0abffd3fb9e79c8a304d48091ff57ab53f10b7
+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = 102513542
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
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"
diff --git a/editors/openoffice-devel/pkg-plist b/editors/openoffice-devel/pkg-plist
deleted file mode 100644
index 28bd78453b52..000000000000
--- a/editors/openoffice-devel/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, do not delete. Package list is generated automatically.