Attachment #145365 for bug #192258




# $FreeBSD$

PORTNAME=	apache-openoffice
PORTVERSION=	4.1.0
PORTREVISION=	4
CATEGORIES=	editors java
MASTER_SITES=	${MASTER_SITE_APACHE:S@%SUBDIR%@openoffice/${PORTVERSION}/source@} \
		${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
.if defined(LANG_PKGNAME)
PKGNAMEPREFIX=		${LANG_PKGNAME}-
.endif
.if defined(LANG_SUFFIX)
PKGNAMESUFFIX=		-${LANG_SUFFIX}
.endif
DISTFILES=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}

MAINTAINER=	office@FreeBSD.org
#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

LICENSE=	APACHE20

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}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
#		mdds>=0.9.0:${PORTSDIR}/devel/mdds
LIB_DEPENDS=								\
		libapr-1.so:${PORTSDIR}/devel/apr1			\
		libcurl.so:${PORTSDIR}/ftp/curl				\
		libcairo.so:${PORTSDIR}/graphics/cairo			\
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
		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	\
		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
		librdf.so:${PORTSDIR}/textproc/redland			\
		libserf-1.so:${PORTSDIR}/www/serf
#		libjpeg.so:${PORTSDIR}/graphics/jpeg
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

SVNREVISION=		1589052
OOOSRC=			apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}_1${EXTRACT_SUFX}

OOODIR=			openoffice4
INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
EXECBASE?=		openoffice-${PORTVERSION}
DIST_SUBDIR=		openoffice
SIMPLEOSVER=		${OSREL:C/\.//g}

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
USE_PYTHON=	yes
USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
USE_PERL5=	build

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>

.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
.else

FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
.endif

LOCALIZED_LANG?=	en-US
EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
OOODIR=			openoffice4
SVNREVISION=		1524958
INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
EXECBASE?=		openoffice-${PORTVERSION}
DIST_SUBDIR=		openoffice
SIMPLEOSVER=		${OSREL:C/\.//g}

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

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

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

USE_AUTOTOOLS=	autoconf
GNU_CONFIGURE=	yes
WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main

MAKE_JOBS_NUMBER=	4
.endif

CONFIGURE_ARGS+=	--with-system-apache-commons=yes \
			--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-boost 		\
			--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 \
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.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-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-graphite				\
			--with-system-hunspell				\
			--with-system-hyphen				\
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
			--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-nss				\
			--enable-opengl					\
			--with-system-openssl				\
			--with-package-format="archive"			\
			--with-system-poppler				\
			--with-system-python				\
			--with-system-redland				\
			--with-system-saxon				\
			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar	\
			--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

#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt


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

post-patch:

	@${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}/openoffice4/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}/openoffice4/program/$${prog}; \
	done
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
	@${ECHO_MSG} "===>  Add wrapper scripts";
	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/

	@${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 | \

	@${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>

Lines 1-6 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (openoffice/apache-openoffice-4.0.1-r1524958-src.tar.bz2) = 577862db1934754e56475b4c124a303a8825cbaefef5ede570c2aee7c99b0667	1	SHA256 (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = f73d01082fe52cc04dc91c4a53d9c8c27b551c0561b8e51ed14b1bfee8fa783e
2	SIZE (openoffice/apache-openoffice-4.0.1-r1524958-src.tar.bz2) = 214506399	2	SIZE (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = 217686497
		3	SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052_1.tar.bz2) = ce261cc499f54a61f3b0f06e0f86eedc6fa477deb2ada25f6ca3f0e7f05400b5
		4	SIZE (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052_1.tar.bz2) = 128368053
3	SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c	5	SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
4	SIZE (openoffice/unowinreg.dll) = 6144	6	SIZE (openoffice/unowinreg.dll) = 6144
5	SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.1.r1524958.tar.bz2) = 0c77c1edd0641336d839f27424f89808c61cf9cfeefba4f5e015c4cf2685a63c
6	SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.1.r1524958.tar.bz2) = 137466799




$FreeBSD$

--- lingucomponent/source/languageguessing/simpleguesser.cxx.orig	2012-01-10 19:42:30.000000000 +0900
+++ lingucomponent/source/languageguessing/simpleguesser.cxx	2012-08-07 11:14:45.000000000 +0900
@@ -114,7 +114,7 @@
         if(!h){return guesses;}
 
         //calculate le number of unicode charcters (symbols)
-        int len = utfstrlen(text);
+        int len = strlen(text);
 
 	if( len > MAX_STRING_LENGTH_TO_ANALYSE ){len = MAX_STRING_LENGTH_TO_ANALYSE ;}
 




--- configmgr/source/partial.hxx
+++ configmgr/source/partial.hxx
@@ -26,6 +26,7 @@
 
 #include "sal/config.h"
 
+#include <boost/functional/hash.hpp>
 #include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
 #include <set>
 
@@ -50,7 +51,7 @@ public:
 
 private:
     struct Node {
-        typedef boost::unordered_map< rtl::OUString, Node > Children;
+        typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
 
         Node(): startInclude(false) {}
         void clear() { startInclude=false; children.clear(); }

Lines 1-11 Link Here

(-)files/patch-i123018 (-11 lines)
1	--- offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl 2013/08/12 08:53:46 1513085
2	+++ offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl 2013/08/12 09:41:11 1513086
3	@@ -122,7 +122,7 @@
4	<p>The change in the data model will be notified to registered listeners via
5	<member">XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
6	<member>GridDataEvent::LastColumn</member> will denote the smallest respectively largest column
7	- index from <argColumnIndexes</arg>.</p>
8	+ index from <arg>ColumnIndexes</arg>.</p>
9
10	@param ColumnIndexes
11	contains the column indexes of the cells, which should be updated




--- moz/makefile.mk.orig	2013-08-13 11:49:32.000000000 +0000
+++ moz/makefile.mk	2014-01-01 20:09:17.000000000 +0000
@@ -99,7 +99,8 @@
     patches/respect_disable_pango.patch \
     patches/arm_build_fix.patch \
     patches/link_fontconfig.patch \
-    patches/brokenmakefile.patch
+    patches/brokenmakefile.patch \
+    patches/freetype_header_relocation.patch
 
 .IF "$(OS)"=="LINUX"
 PATCH_FILES+=patches/nss_linux.patch
--- moz/patches/freetype_header_relocation.patch.orig	1970-01-01 00:00:00.000000000 +0000
+++ moz/patches/freetype_header_relocation.patch	2014-01-01 20:50:11.000000000 +0000
@@ -0,0 +1,58 @@
+--- misc/build/mozilla/config/system-headers.orig	2007-11-19 21:36:18.000000000 +0100
++++ misc/build/mozilla/config/system-headers	2014-01-01 20:47:56.000000000 +0100
+@@ -193,12 +193,12 @@
+ fpieee.h
+ frame/log.h
+ frame/req.h
+-freetype/freetype.h
+-freetype/ftcache.h
+-freetype/ftglyph.h
+-freetype/ftoutln.h
+-freetype/ttnameid.h
+-freetype/tttables.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftoutln.h
++ttnameid.h
++tttables.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream.h
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2008-01-29 19:31:08.000000000 +0000
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2014-01-01 20:43:42.000000000 +0000
+@@ -67,8 +67,8 @@
+ #include "nsFontConfigUtils.h"
+ 
+ #include <gdk/gdkx.h>
+-#include <freetype/tttables.h>
+-#include <freetype/freetype.h>
++#include <tttables.h>
++#include <freetype.h>
+ 
+ #define FORCE_PR_LOG
+ #include "prlog.h"
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2008-01-29 19:31:08.000000000 +0000
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2014-01-01 20:44:06.000000000 +0000
+@@ -58,7 +58,7 @@
+ #include <fontconfig/fontconfig.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+-#include <freetype/tttables.h>
++#include <tttables.h>
+ 
+ #include "mozilla-decoder.h"
+ 
+--- misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp.orig	2008-01-29 19:31:08.000000000 +0000
++++ misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp	2014-01-01 20:44:34.000000000 +0000
+@@ -67,8 +67,8 @@
+ #include "nsFontConfigUtils.h"
+ 
+ #include <gdk/gdkx.h>
+-#include <freetype/tttables.h>
+-#include <freetype/freetype.h>
++#include <tttables.h>
++#include <freetype.h>
+ 
+ #define FORCE_PR_LOG
+ #include "prlog.h"




--- set_soenv.in~	2014-01-22 15:21:04.000000000 +0900
+++ set_soenv.in	2014-02-03 12:12:03.000000000 +0900
@@ -1864,6 +1864,8 @@
 ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
 ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
 ToFile( "SYSTEM_NSS",        "@SYSTEM_NSS@",       "e" );
+ToFile( "NSS_CFLAGS",        "@NSS_CFLAGS@",       "e" );
+ToFile( "NSS_LIBS",          "@NSS_LIBS@",         "e" );
 ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
 ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
 ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );

--- xmlsecurity/util/makefile.mk	2014-02-03 15:50:50.000000000 +0900
+++ xmlsecurity/util/makefile.mk	2014-02-03 16:03:11.000000000 +0900
@@ -98,12 +98,12 @@
 SHL2STDLIBS +=-ldl
 .ENDIF
 
-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES"
 .IF "$(NSPR_LIB)" != ""
 SHL2STDLIBS += $(NSPR_LIB)
 .ENDIF
-.IF "$(NSS_LIB)" != ""
-SHL2STDLIBS += $(NSS_LIB)
+.IF "$(NSS_LIBS)" != ""
+SHL2STDLIBS += $(NSS_LIBS)
 .ENDIF
 .ENDIF
 
--- xmlsecurity/source/xmlsec/nss/makefile.mk	2014-01-22 15:07:16.000000000 +0900
+++ xmlsecurity/source/xmlsec/nss/makefile.mk	2014-02-03 16:13:30.000000000 +0900
@@ -48,8 +48,8 @@
 NSPR_INC = $(MOZ_INC)$/nspr
 .ELSE
 # TODO: better use pkgconfig to find the proper system include path
-NSS_INC = /usr/include/nss3
-NSPR_INC = /usr/include/nspr4
+NSS_INC = $(NSS_CFLAGS)
+NSPR_INC = $(NSS_CFLAGS)
 .ENDIF
 
 .IF "$(GUI)" == "WNT"

Lines 1-27 Link Here

(-)files/patch-nss-gcc46 (-27 lines)
1	--- nss/makefile.mk.orig 2013-08-13 11:46:06.000000000 +0000
2	+++ nss/makefile.mk 2014-01-01 18:13:26.000000000 +0000
3	@@ -44,6 +44,10 @@
4	TARFILE_ROOTDIR=nss-3.12.6
5	PATCH_FILES=nss.patch
6
7	+.IF "$(OS)"=="FREEBSD"
8	+PATCH_FILES+=nss_freebsd.patch
9	+.ENDIF # "$(OS)"=="FREEBSD"
10	+
11	.IF "$(OS)"=="MACOSX"
12	MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
13	.EXPORT : MACOS_SDK_DIR
14	--- nss/nss_freebsd.patch.orig 1970-01-01 00:00:00.000000000 +0000
15	+++ nss/nss_freebsd.patch 2014-01-01 18:08:20.000000000 +0000
16	@@ -0,0 +1,11 @@
17	+--- misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk.orig 2009-08-22 05:33:09.000000000 +0000
18	++++ misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk 2014-01-01 13:47:48.000000000 +0000
19	+@@ -38,7 +38,7 @@
20	+ include $(CORE_DEPTH)/coreconf/UNIX.mk
21	+
22	+ DEFAULT_COMPILER = gcc
23	+-CC = gcc
24	++#CC = gcc
25	+ CCC = g++
26	+ RANLIB = ranlib
27	+




--- sal/inc/rtl/string.hxx	2014-01-24 03:32:49.000000000 +0900
+++ sal/inc/rtl/string.hxx	2014-02-04 14:57:30.000000000 +0900
@@ -234,8 +234,9 @@
       @return a pointer to a (not necessarily null-terminated) byte string
       representing the characters of this string object.
     */
-    operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
+
 public:
+    operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
     /** 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


Lines 1-11 Link Here

(-)files/patch-vcl_source_glyphs_graphite_adaptors.cxx (-11 lines)
1	--- vcl/source/glyphs/graphite_adaptors.cxx.orig 2013-08-13 11:45:43.000000000 +0000
2	+++ vcl/source/glyphs/graphite_adaptors.cxx 2013-12-31 16:39:41.000000000 +0000
3	@@ -45,7 +45,7 @@
4
5	#include <salgdi.hxx>
6
7	-#include <freetype/ftsynth.h>
8	+#include <ftsynth.h>
9
10	// Module
11	#include "gcach_ftyp.hxx"




--- ucb/source/ucp/webdav/SerfUri.hxx_	2014-02-04 14:39:02.000000000 +0900
+++ ucb/source/ucp/webdav/SerfUri.hxx	2014-02-04 14:39:18.000000000 +0900
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_SERFURI_HXX
 #define INCLUDED_SERFURI_HXX
 
-#include <apr-util/apr_uri.h>
+#include <apr_uri.h>
 #include <rtl/ustring.hxx>
 #include "DAVException.hxx"
 
--- ucb/source/ucp/webdav/SerfSession.cxx_	2014-02-04 14:40:19.000000000 +0900
+++ ucb/source/ucp/webdav/SerfSession.cxx	2014-02-04 14:40:26.000000000 +0900
@@ -30,7 +30,7 @@
 #include "ucbhelper/simplecertificatevalidationrequest.hxx"
 
 #include "AprEnv.hxx"
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
 
 #include "DAVAuthListener.hxx"
 #include "SerfTypes.hxx"

--- ucb/source/ucp/webdav/SerfTypes.hxx	2014-01-24 03:33:21.000000000 +0900
+++ ucb/source/ucp/webdav/SerfTypes.hxx	2014-02-04 14:38:44.000000000 +0900
@@ -24,7 +24,7 @@
 #ifndef INCLUDED_SERFTYPES_HXX
 #define INCLUDED_SERFTYPES_HXX
 
-#include <serf/serf.h>
+#include <serf.h>
 
 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"

Line 1 Link Here

(-)pkg-plist (-1 lines)
1	# Dummy file, do not delete. Package list is generated automatically.

Return to bug 192258

Lines 2-31 Link Here

(-)Makefile (-132 / +133 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= apache-openoffice	4	PORTNAME= apache-openoffice
5	PORTVERSION= 4.0.1	5	PORTVERSION= 4.1.0
6	PORTREVISION= 4
7	CATEGORIES= editors java	6	CATEGORIES= editors java
8	MASTER_SITES= http://www.apache.org/dist/openoffice/${PORTVERSION}/source/ \	7	MASTER_SITES= ${MASTER_SITE_APACHE:S@%SUBDIR%@openoffice/${PORTVERSION}/source@} \
9	ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \	8	${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
10	${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc	9	.if defined(LANG_PKGNAME)
11	DISTFILES+= ${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc	10	PKGNAMEPREFIX= ${LANG_PKGNAME}-
		11	.endif
		12	.if defined(LANG_SUFFIX)
		13	PKGNAMESUFFIX= -${LANG_SUFFIX}
		14	.endif
		15	DISTFILES= ${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
12	EXTRACT_ONLY= ${OOOSRC} ${EXTSRC}	16	EXTRACT_ONLY= ${OOOSRC} ${EXTSRC}
13		17
		18	MAINTAINER= office@FreeBSD.org
14	#de facto maintainer is maho@FreeBSD.org	19	#de facto maintainer is maho@FreeBSD.org
15	#Frequent Patch submitters should optionally sign Apache iCLA	20	#Frequent Patch submitters should optionally sign Apache iCLA
16	MAINTAINER= office@FreeBSD.org
17	COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser	21	COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
18		22
19	LICENSE= APACHE20	23	LICENSE= APACHE20
20		24
		25	BUILD_DEPENDS= \
		26	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
		27	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
		28	zip:${PORTSDIR}/archivers/zip \
		29	ant:${PORTSDIR}/devel/apache-ant \
		30	dmake:${PORTSDIR}/devel/dmake \
		31	epm:${PORTSDIR}/devel/epm \
		32	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
		33	imake:${PORTSDIR}/devel/imake \
		34	gpatch:${PORTSDIR}/devel/patch \
		35	${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
		36	${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
		37	${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
		38	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
		39	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
		40	bash:${PORTSDIR}/shells/bash \
		41	${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
		42	${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
		43	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
		44	# mdds>=0.9.0:${PORTSDIR}/devel/mdds
		45	LIB_DEPENDS= \
		46	libapr-1.so:${PORTSDIR}/devel/apr1 \
		47	libcurl.so:${PORTSDIR}/ftp/curl \
		48	libcairo.so:${PORTSDIR}/graphics/cairo \
		49	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
		50	libgraphite.so:${PORTSDIR}/graphics/silgraphite \
		51	libCoinMP.so:${PORTSDIR}/math/coinmp \
		52	libfreetype.so:${PORTSDIR}/print/freetype2 \
		53	libnss3.so:${PORTSDIR}/security/nss \
		54	libexpat.so:${PORTSDIR}/textproc/expat2 \
		55	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
		56	libtextcat.so:${PORTSDIR}/textproc/libtextcat \
		57	libhyphen.so:${PORTSDIR}/textproc/hyphen \
		58	librdf.so:${PORTSDIR}/textproc/redland \
		59	libserf-1.so:${PORTSDIR}/www/serf
		60	# libjpeg.so:${PORTSDIR}/graphics/jpeg
		61	RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
		62	${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
		63	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
		64	${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
		65	${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
		66
		67	SVNREVISION= 1589052
		68	OOOSRC= apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
		69	EXTSRC= ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}_1${EXTRACT_SUFX}
		70
		71	OOODIR= openoffice4
		72	INSTALLATION_BASEDIR?= openoffice-${PORTVERSION}
		73	EXECBASE?= openoffice-${PORTVERSION}
		74	DIST_SUBDIR= openoffice
		75	SIMPLEOSVER= ${OSREL:C/\.//g}
		76
21	NO_LATEST_LINK= yes	77	NO_LATEST_LINK= yes
22		78
		79	ONLY_FOR_ARCHS= i386 amd64
		80
23	USE_GNOME= gtk20 libxslt libidl glib20	81	USE_GNOME= gtk20 libxslt libidl glib20
24	USE_XORG= x11 ice xaw xau xext xrender xrandr \	82	USE_XORG= x11 ice xaw xau xext xrender xrandr \
25	xi xt xcursor xdamage xcomposite xfixes	83	xi xt xcursor xdamage xcomposite xfixes
26	USE_GL= gl glu	84	USE_GL= gl glu
27	USE_GSTREAMER= yes	85	USE_GSTREAMER= yes
28	USE_GCC= any	86	USE_GCC= yes
29	USE_PYTHON= yes	87	USE_PYTHON= yes
30	USES+= bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils	88	USES+= bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
31	USE_PERL5= build	89	USE_PERL5= build
Lines 37-49 Link Here
37	GNOMEVFS_DESC= Enable GNOME Virtual File System	95	GNOMEVFS_DESC= Enable GNOME Virtual File System
38	CCACHE_DESC= Mimimize compile time of C/C++ programs	96	CCACHE_DESC= Mimimize compile time of C/C++ programs
39		97
40	.include "${.CURDIR}/files/Makefile.localized"
41
42	USE_JAVA= yes
43	JAVA_BUILD= jdk
44	JAVA_VENDOR= openjdk
45	JAVA_VERSION= 1.6+
46
47	GCONF_USE= GNOME=gconf2	98	GCONF_USE= GNOME=gconf2
48	GCONF_CONFIGURE_OFF=--disable-gconf	99	GCONF_CONFIGURE_OFF=--disable-gconf
49		100
Lines 50-59 Link Here
50	GNOMEVFS_USE= GNOME=gnomevfs2	101	GNOMEVFS_USE= GNOME=gnomevfs2
51	GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs	102	GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
52		103
		104	.include <bsd.port.options.mk>
		105
53	.include <bsd.port.pre.mk>	106	.include <bsd.port.pre.mk>
54		107
55	ONLY_FOR_ARCHS= i386 amd64	108	.include <${FILESDIR}/Makefile.localized>
56		109
		110	USE_JAVA= yes
		111	JAVA_BUILD= jdk
		112	JAVA_VENDOR= openjdk
		113	JAVA_VERSION= 1.6+
		114
57	.if ${ARCH} == amd64	115	.if ${ARCH} == amd64
58	FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh	116	FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh
59	.else	117	.else
Lines 60-75 Link Here
60	FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh	118	FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
61	.endif	119	.endif
62		120
63	OOOSRC= apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}	121	LOCALIZED_LANG?= en-US
64	EXTSRC= ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
65	OOODIR= openoffice4
66	SVNREVISION= 1524958
67	INSTALLATION_BASEDIR?= openoffice-${PORTVERSION}
68	EXECBASE?= openoffice-${PORTVERSION}
69	DIST_SUBDIR= openoffice
70	SIMPLEOSVER= ${OSREL:C/\.//g}
71		122
72	PACKAGE_PREFIX= Apache_OpenOffice	123	PACKAGE_PREFIX= Apache_OpenOffice
		124
73	.if ${ARCH} == amd64	125	.if ${ARCH} == amd64
74	PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64	126	PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64
75	.else	127	.else
Lines 76-95 Link Here
76	PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86	128	PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86
77	.endif	129	.endif
78		130
79	LOCALIZED_LANG?= en-US
80	.if defined(LANG_PKGNAME)
81	PKGNAMEPREFIX= ${LANG_PKGNAME}-
82	.endif
83	.if defined(LANG_SUFFIX)
84	PKGNAMESUFFIX= -${LANG_SUFFIX}
85	.endif
86
87	RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
88	${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
89	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
90	${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
91	${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
92
93	.if ${PORT_OPTIONS:MCCACHE} \|\| defined(WITH_CCACHE)	131	.if ${PORT_OPTIONS:MCCACHE} \|\| defined(WITH_CCACHE)
94	BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache	132	BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
95	CCACHE_PREFIX= ccache	133	CCACHE_PREFIX= ccache
Lines 100-143 Link Here
100	OOOCXX= ${CXX}	138	OOOCXX= ${CXX}
101	.endif	139	.endif
102	CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \	140	CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
103	PATH=${WRKSRC}/solenv/bin:$$PATH \	141	PATH=${WRKSRC}/solenv/bin:$$PATH
104	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
105		142
106	LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
107	libexpat.so:${PORTSDIR}/textproc/expat2 \
108	libjpeg.so:${PORTSDIR}/graphics/jpeg \
109	libcurl.so:${PORTSDIR}/ftp/curl \
110	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
111	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
112	librdf.so:${PORTSDIR}/textproc/redland \
113	libtextcat.so:${PORTSDIR}/textproc/libtextcat \
114	libfreetype.so:${PORTSDIR}/print/freetype2 \
115	libapr-1.so:${PORTSDIR}/devel/apr1 \
116	libCoinMP.so:${PORTSDIR}/math/coinmp \
117	libserf-1.so:${PORTSDIR}/www/serf \
118	libfreetype.so:${PORTSDIR}/print/freetype2 \
119	libtextcat.so:${PORTSDIR}/textproc/libtextcat
120
121	BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
122	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
123	gpatch:${PORTSDIR}/devel/patch \
124	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
125	bash:${PORTSDIR}/shells/bash \
126	imake:${PORTSDIR}/devel/imake \
127	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
128	ant:${PORTSDIR}/devel/apache-ant \
129	${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
130	${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
131	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
132	${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
133	${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
134	${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
135	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
136	${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
137	epm:${PORTSDIR}/devel/epm \
138	dmake:${PORTSDIR}/devel/dmake \
139	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
140
141	USE_AUTOTOOLS= autoconf	143	USE_AUTOTOOLS= autoconf
142	GNU_CONFIGURE= yes	144	GNU_CONFIGURE= yes
143	WRKSRC?= ${WRKDIR}/aoo-${PORTVERSION}/main	145	WRKSRC?= ${WRKDIR}/aoo-${PORTVERSION}/main
Lines 149-207 Link Here
149	MAKE_JOBS_NUMBER= 4	151	MAKE_JOBS_NUMBER= 4
150	.endif	152	.endif
151		153
152	CONFIGURE_ARGS+= --enable-verbose \	154	CONFIGURE_ARGS+= --with-system-apache-commons=yes \
153	--enable-symbols=small \
154	--enable-crashdump \
155	--with-vendor="FreeBSD ports system" \
156	--with-epm=${LOCALBASE}/bin/epm \
157	--with-gnu-patch=${LOCALBASE}/bin/gpatch \
158	--with-gperf=${LOCALBASE}/bin/gperf \
159	--x-includes=${LOCALBASE}/include \
160	--x-libraries=${LOCALBASE}lib \
161	--with-system-libxml \
162	--with-system-libxslt \
163	--with-system-cairo --enable-cairo \
164	--with-system-boost \
165	--with-system-zlib \
166	--with-system-python \
167	--with-system-expat \
168	--with-system-openssl \
169	--with-system-curl \
170	--with-system-poppler \
171	--with-system-redland \
172	--with-system-libtextcat \
173	--with-system-vigra \
174	--with-system-stdlibs \
175	--with-system-apr \
176	--with-system-apr-util \
177	--with-system-coinmp \
178	--with-system-apache-commons=yes \
179	--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \	155	--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
180	--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \	156	--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
181	--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \	157	--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
182	--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \	158	--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \
183	--with-system-lucene \	159	--with-system-apr \
184	--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \	160	--with-system-apr-util \
185	--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \	161	--with-system-beanshell \
		162	--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
		163	--enable-category-b \
		164	--with-system-cairo --enable-cairo \
		165	--with-system-coinmp \
		166	--with-system-curl \
		167	--enable-crashdump \
		168	--enable-dbus \
		169	--with-epm=${LOCALBASE}/bin/epm \
		170	--with-system-expat \
		171	--disable-fetch-external \
		172	--without-fonts \
		173	--with-gnu-patch=${LOCALBASE}/bin/gpatch \
		174	--with-gperf=${LOCALBASE}/bin/gperf \
		175	--enable-gstreamer \
		176	--with-system-graphite \
		177	--with-system-hunspell \
		178	--with-system-hyphen \
186	--with-junit=${LOCALBASE}/share/java/classes/junit.jar \	179	--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
187	--with-package-format="archive" \	180	--with-system-libtextcat \
188	--enable-gstreamer \	181	--with-system-libxml \
189	--enable-wiki-publisher \	182	--with-system-libxslt \
190	--enable-dbus \	183	--enable-lockdown \
191	--enable-opengl \	184	--with-system-lucene \
192	--enable-category-b \	185	--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
193	--enable-lockdown \	186	--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
194	--with-system-hunspell \	187	--with-system-nss \
195	--with-system-saxon \	188	--enable-opengl \
196	--with-saxon-jar=${JAVALIBDIR}/saxon9.jar \	189	--with-system-openssl \
197	--with-system-beanshell \	190	--with-package-format="archive" \
198	--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \	191	--with-system-poppler \
199	--without-fonts \	192	--with-system-python \
200	--with-system-serf	193	--with-system-redland \
201	# --with-system-jpeg	194	--with-system-saxon \
202	# --enable-pdfimport	195	--with-saxon-jar=${JAVALIBDIR}/saxon9.jar \
203	# --without-stlport --disable-mozilla \	196	--with-system-serf \
204	# --with-system-graphite \	197	--with-system-stdlibs \
		198	--enable-symbols=small \
		199	--without-stlport \
		200	--with-vendor="FreeBSD ports system" \
		201	--enable-verbose \
		202	--with-system-vigra \
		203	--enable-wiki-publisher \
		204	--x-includes={LOCALBASE}/include \
		205	--x-libraries=${LOCALBASE}lib \
		206	--with-system-zlib
205		207
206	#OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt	208	#OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
207	#OOOEXTENSIONS+= presenter/presenter-screen.oxt	209	#OOOEXTENSIONS+= presenter/presenter-screen.oxt
Lines 232-241 Link Here
232		234
233	post-extract:	235	post-extract:
234	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/	236	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
235	# @${MKDIR} ${WRKSRC}/../ext_sources
236	# @${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
237	# @${RM} -rf ${WRKSRC}/l10n
238	@${MKDIR} ${WRKSRC}/../ext_sources
239	@${RM} -rf ${WRKSRC}/l10n	237	@${RM} -rf ${WRKSRC}/l10n
240		238
241	post-patch:	239	post-patch:
Lines 270-278 Link Here
270	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc	268	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
271	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc	269	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
272	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/	270	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
273	@cd ${WRKSRC}/solver/4??/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/	271	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
274		272
275	post-install:	273	post-install:
		274	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program -type f \( -name '.so' -or -name '*.bin' \) -print0 \| ${XARGS} -0 -n1 ${STRIP_CMD}
		275	@for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
		276	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/$${prog}; \
		277	done
276	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;	278	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
277	@${ECHO_MSG} "===> Add wrapper scripts";	279	@${ECHO_MSG} "===> Add wrapper scripts";
278	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/	280	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
Lines 295-302 Link Here
295	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}	297	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
296	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST}	298	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST}
297	@${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST}	299	@${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST}
298	@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST}
299	@${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST}
300	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}	300	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
301	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}	301	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
302	@cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d \| ${SORT} -r \| \	302	@cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d \| ${SORT} -r \| \
Lines 338-341 Link Here
338	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null \|\| ${TRUE}" >> ${TMPPLIST}	338	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null \|\| ${TRUE}" >> ${TMPPLIST}
339		339
340	.include <${FILESDIR}/Makefile.others>	340	.include <${FILESDIR}/Makefile.others>
		341
341	.include <bsd.port.post.mk>	342	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)files/extra-patch-libexttextcat-lingucomponent (-13 lines)
1	$FreeBSD$
2
3	--- lingucomponent/source/languageguessing/simpleguesser.cxx.orig 2012-01-10 19:42:30.000000000 +0900
4	+++ lingucomponent/source/languageguessing/simpleguesser.cxx 2012-08-07 11:14:45.000000000 +0900
5	@@ -114,7 +114,7 @@
6	if(!h){return guesses;}
7
8	//calculate le number of unicode charcters (symbols)
9	- int len = utfstrlen(text);
10	+ int len = strlen(text);
11
12	if( len > MAX_STRING_LENGTH_TO_ANALYSE ){len = MAX_STRING_LENGTH_TO_ANALYSE ;}
13

Lines 1-19 Link Here

(-)files/patch-configmgr (-19 lines)
1	--- configmgr/source/partial.hxx
2	+++ configmgr/source/partial.hxx
3	@@ -26,6 +26,7 @@
4
5	#include "sal/config.h"
6
7	+#include <boost/functional/hash.hpp>
8	#include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
9	#include <set>
10
11	@@ -50,7 +51,7 @@ public:
12
13	private:
14	struct Node {
15	- typedef boost::unordered_map< rtl::OUString, Node > Children;
16	+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
17
18	Node(): startInclude(false) {}
19	void clear() { startInclude=false; children.clear(); }

Lines 1-73 Link Here

(-)files/patch-moz-freetype_header_relocation (-73 lines)
1	--- moz/makefile.mk.orig 2013-08-13 11:49:32.000000000 +0000
2	+++ moz/makefile.mk 2014-01-01 20:09:17.000000000 +0000
3	@@ -99,7 +99,8 @@
4	patches/respect_disable_pango.patch \
5	patches/arm_build_fix.patch \
6	patches/link_fontconfig.patch \
7	- patches/brokenmakefile.patch
8	+ patches/brokenmakefile.patch \
9	+ patches/freetype_header_relocation.patch
10
11	.IF "$(OS)"=="LINUX"
12	PATCH_FILES+=patches/nss_linux.patch
13	--- moz/patches/freetype_header_relocation.patch.orig 1970-01-01 00:00:00.000000000 +0000
14	+++ moz/patches/freetype_header_relocation.patch 2014-01-01 20:50:11.000000000 +0000
15	@@ -0,0 +1,58 @@
16	+--- misc/build/mozilla/config/system-headers.orig 2007-11-19 21:36:18.000000000 +0100
17	++++ misc/build/mozilla/config/system-headers 2014-01-01 20:47:56.000000000 +0100
18	+@@ -193,12 +193,12 @@
19	+ fpieee.h
20	+ frame/log.h
21	+ frame/req.h
22	+-freetype/freetype.h
23	+-freetype/ftcache.h
24	+-freetype/ftglyph.h
25	+-freetype/ftoutln.h
26	+-freetype/ttnameid.h
27	+-freetype/tttables.h
28	++freetype.h
29	++ftcache.h
30	++ftglyph.h
31	++ftoutln.h
32	++ttnameid.h
33	++tttables.h
34	+ fribidi/fribidi.h
35	+ FSp_fopen.h
36	+ fstream.h
37	+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig 2008-01-29 19:31:08.000000000 +0000
38	++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2014-01-01 20:43:42.000000000 +0000
39	+@@ -67,8 +67,8 @@
40	+ #include "nsFontConfigUtils.h"
41	+
42	+ #include <gdk/gdkx.h>
43	+-#include <freetype/tttables.h>
44	+-#include <freetype/freetype.h>
45	++#include <tttables.h>
46	++#include <freetype.h>
47	+
48	+ #define FORCE_PR_LOG
49	+ #include "prlog.h"
50	+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig 2008-01-29 19:31:08.000000000 +0000
51	++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2014-01-01 20:44:06.000000000 +0000
52	+@@ -58,7 +58,7 @@
53	+ #include <fontconfig/fontconfig.h>
54	+ #include <gdk/gdk.h>
55	+ #include <gdk/gdkx.h>
56	+-#include <freetype/tttables.h>
57	++#include <tttables.h>
58	+
59	+ #include "mozilla-decoder.h"
60	+
61	+--- misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp.orig 2008-01-29 19:31:08.000000000 +0000
62	++++ misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp 2014-01-01 20:44:34.000000000 +0000
63	+@@ -67,8 +67,8 @@
64	+ #include "nsFontConfigUtils.h"
65	+
66	+ #include <gdk/gdkx.h>
67	+-#include <freetype/tttables.h>
68	+-#include <freetype/freetype.h>
69	++#include <tttables.h>
70	++#include <freetype.h>
71	+
72	+ #define FORCE_PR_LOG
73	+ #include "prlog.h"

Line 0 Link Here

(-)files/patch-nss (+43 lines)
	1	--- set_soenv.in~ 2014-01-22 15:21:04.000000000 +0900
	2	+++ set_soenv.in 2014-02-03 12:12:03.000000000 +0900
	3	@@ -1864,6 +1864,8 @@
	4	ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" );
	5	ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
	6	ToFile( "SYSTEM_NSS", "@SYSTEM_NSS@", "e" );
	7	+ToFile( "NSS_CFLAGS", "@NSS_CFLAGS@", "e" );
	8	+ToFile( "NSS_LIBS", "@NSS_LIBS@", "e" );
	9	ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" );
	10	ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
	11	ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
	12
	13	--- xmlsecurity/util/makefile.mk 2014-02-03 15:50:50.000000000 +0900
	14	+++ xmlsecurity/util/makefile.mk 2014-02-03 16:03:11.000000000 +0900
	15	@@ -98,12 +98,12 @@
	16	SHL2STDLIBS +=-ldl
	17	.ENDIF
	18
	19	-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
	20	+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES"
	21	.IF "$(NSPR_LIB)" != ""
	22	SHL2STDLIBS += $(NSPR_LIB)
	23	.ENDIF
	24	-.IF "$(NSS_LIB)" != ""
	25	-SHL2STDLIBS += $(NSS_LIB)
	26	+.IF "$(NSS_LIBS)" != ""
	27	+SHL2STDLIBS += $(NSS_LIBS)
	28	.ENDIF
	29	.ENDIF
	30
	31	--- xmlsecurity/source/xmlsec/nss/makefile.mk 2014-01-22 15:07:16.000000000 +0900
	32	+++ xmlsecurity/source/xmlsec/nss/makefile.mk 2014-02-03 16:13:30.000000000 +0900
	33	@@ -48,8 +48,8 @@
	34	NSPR_INC = $(MOZ_INC)$/nspr
	35	.ELSE
	36	# TODO: better use pkgconfig to find the proper system include path
	37	-NSS_INC = /usr/include/nss3
	38	-NSPR_INC = /usr/include/nspr4
	39	+NSS_INC = $(NSS_CFLAGS)
	40	+NSPR_INC = $(NSS_CFLAGS)
	41	.ENDIF
	42
	43	.IF "$(GUI)" == "WNT"

Line 0 Link Here

(-)files/patch-sal (+53 lines)
	1	--- sal/inc/rtl/string.hxx 2014-01-24 03:32:49.000000000 +0900
	2	+++ sal/inc/rtl/string.hxx 2014-02-04 14:57:30.000000000 +0900
	3	@@ -234,8 +234,9 @@
	4	@return a pointer to a (not necessarily null-terminated) byte string
	5	representing the characters of this string object.
	6	*/
	7	- operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
	8	+
	9	public:
	10	+ operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
	11	/** Returns a reference to a character of this string. */
	12	sal_Char& operator[]( int n ) { return pData->buffer[n]; }
	13	/** Returns a const reference to a character of this string. */
	14	build -- version: 275224
	15
	16
	17	=============
	18	Building module canvas
	19	=============
	20
	21	Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/inc
	22
	23
	24	Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/factory
	25
	26
	27	Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/tools
	28
	29
	30	Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/null
	31
	32
	33	Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/vcl
	34
	35
	36	Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
	37
	38	Compiling: canvas/source/cairo/cairo_textlayout.cxx
	39	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
	40	/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*)':
	41	/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
	42	/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error: within this context
	43	/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*)':
	44	/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
	45	/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error: within this context
	46	/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':
	47	/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]
	48	/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]
	49	/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]
	50	/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]
	51	dmake: Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayout.obj'
	52	ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
	53

Line 0 Link Here

(-)files/patch-webdav (+133 lines)
		1	--- ucb/source/ucp/webdav/SerfUri.hxx_ 2014-02-04 14:39:02.000000000 +0900
		2	+++ ucb/source/ucp/webdav/SerfUri.hxx 2014-02-04 14:39:18.000000000 +0900
		3	@@ -23,7 +23,7 @@
		4	#ifndef INCLUDED_SERFURI_HXX
		5	#define INCLUDED_SERFURI_HXX
		6
		7	-#include <apr-util/apr_uri.h>
		8	+#include <apr_uri.h>
		9	#include <rtl/ustring.hxx>
		10	#include "DAVException.hxx"
		11
		12	--- ucb/source/ucp/webdav/SerfSession.cxx_ 2014-02-04 14:40:19.000000000 +0900
		13	+++ ucb/source/ucp/webdav/SerfSession.cxx 2014-02-04 14:40:26.000000000 +0900
		14	@@ -30,7 +30,7 @@
		15	#include "ucbhelper/simplecertificatevalidationrequest.hxx"
		16
		17	#include "AprEnv.hxx"
		18	-#include <apr/apr_strings.h>
		19	+#include <apr_strings.h>
		20
		21	#include "DAVAuthListener.hxx"
		22	#include "SerfTypes.hxx"
		23
		24	--- ucb/source/ucp/webdav/SerfTypes.hxx 2014-01-24 03:33:21.000000000 +0900
		25	+++ ucb/source/ucp/webdav/SerfTypes.hxx 2014-02-04 14:38:44.000000000 +0900
		26	@@ -24,7 +24,7 @@
		27	#ifndef INCLUDED_SERFTYPES_HXX
		28	#define INCLUDED_SERFTYPES_HXX
		29
		30	-#include <serf/serf.h>
		31	+#include <serf.h>
		32
		33	typedef serf_connection_t SerfConnection;
		34
		35	--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig 2014-02-25 00:24:42.000000000 -0800
		36	+++ ucb/source/ucp/webdav/SerfCallbacks.hxx 2014-07-28 01:11:38.000000000 -0700
		37	@@ -23,7 +23,7 @@
		38	#ifndef INCLUDED_CALLBACKS_HXX
		39	#define INCLUDED_CALLBACKS_HXX
		40
		41	-#include <serf/serf.h>
		42	+#include <serf.h>
		43
		44	extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
		45	serf_bucket_t **read_bkt,
		46	--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
		47	+++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx 2014-07-28 01:11:43.000000000 -0700
		48	@@ -24,7 +24,7 @@
		49
		50	#include "SerfCopyReqProcImpl.hxx"
		51
		52	-#include <serf/serf.h>
		53	+#include <serf.h>
		54
		55	namespace http_dav_ucp
		56	{
		57	--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig 2014-02-25 00:24:42.000000000 -0800
		58	+++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx 2014-07-28 01:11:47.000000000 -0700
		59	@@ -24,7 +24,7 @@
		60
		61	#include "SerfDeleteReqProcImpl.hxx"
		62
		63	-#include <serf/serf.h>
		64	+#include <serf.h>
65
66	namespace http_dav_ucp
67	{
68	--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
69	+++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx 2014-07-28 01:11:51.000000000 -0700
70	@@ -24,7 +24,7 @@
71
72	#include "SerfMkColReqProcImpl.hxx"
73
74	-#include <serf/serf.h>
75	+#include <serf.h>
76
77	namespace http_dav_ucp
78	{
79	--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
80	+++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx 2014-07-28 01:11:57.000000000 -0700
81	@@ -24,7 +24,7 @@
82
83	#include "SerfMoveReqProcImpl.hxx"
84
85	-#include <serf/serf.h>
86	+#include <serf.h>
87
88	namespace http_dav_ucp
89	{
90	--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
91	+++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx 2014-07-28 01:12:00.000000000 -0700
92	@@ -24,7 +24,7 @@
93
94	#include "SerfPostReqProcImpl.hxx"
95
96	-#include <serf/serf.h>
97	+#include <serf.h>
98
99	using namespace com::sun::star;
100
101	--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
102	+++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 2014-07-28 01:12:05.000000000 -0700
103	@@ -26,7 +26,7 @@
104
105	#include "SerfPutReqProcImpl.hxx"
106
107	-#include <serf/serf.h>
108	+#include <serf.h>
109
110	namespace http_dav_ucp
111	{
112	--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig 2014-02-25 00:24:43.000000000 -0800
113	+++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx 2014-07-28 01:12:10.000000000 -0700
114	@@ -26,7 +26,7 @@
115	#include <apr_errno.h>
116	#include <apr_pools.h>
117
118	-#include <serf/serf.h>
119	+#include <serf.h>
120
121	#include "DAVTypes.hxx"
122	#include "DAVResource.hxx"
123	--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig 2014-02-25 00:24:42.000000000 -0800
124	+++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx 2014-07-28 01:12:14.000000000 -0700
125	@@ -22,7 +22,7 @@
126	#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
127	#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
128
129	-#include <serf/serf.h>
130	+#include <serf.h>
131
132	#include <sal/types.h>
133	#include "DAVRequestEnvironment.hxx"