update to 3.4.1

8 files changed, 45 insertions, 1574 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index bbfc4d4863a1..29daa94614ef 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	apache-openoffice
-PORTVERSION=	3.4.0
-PORTREVISION=	3
+PORTVERSION=	3.4.1
 CATEGORIES=	editors java
-MASTER_SITES=	http://people.apache.org/~jsc/aoo34-rc/rc1/src/ ${MASTER_SITE_LOCAL}:extsrc
-MASTER_SITE_SUBDIR=	maho/openoffice:extsrc
-DISTFILES+=	${OOOSRC} unowinreg.dll ${EXTSRC}
+MASTER_SITES=	ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
+		${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
+DISTFILES+=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
 EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
 
 #de facto maintainer is maho@FreeBSD.org
@@ -70,9 +69,9 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
 OOOSRC=			aoo-${PORTVERSION}-incubating-src${EXTRACT_SUFX}
-EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
+EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SVNREVISION=		1327774
+SVNREVISION=		1372282
 INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
 EXECBASE?=		openoffice-${PORTVERSION}
 DIST_SUBDIR=		openoffice
@@ -95,9 +94,9 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
-		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel
+		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
+		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
 
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
@@ -119,7 +118,11 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
 		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		rdf.0:${PORTSDIR}/textproc/redland \
-		freetype.9:${PORTSDIR}/print/freetype2
+		textcat.0:${PORTSDIR}/textproc/libtextcat \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		apr-1.4:${PORTSDIR}/devel/apr1 \
+		CoinMP.7:${PORTSDIR}/math/coinmp \
+		serf-1.0:${PORTSDIR}/www/serf
 
 .if exists(${LOCALBASE}/include/libexttextcat/textcat.h)
 .if exists(${LOCALBASE}/include/textcat.h)
@@ -187,6 +190,9 @@ CONFIGURE_ARGS+=	--enable-verbose \
 			--with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \
 			--with-system-vigra \
 			--with-system-stdlibs \
+			--with-system-apr \
+			--with-system-apr-util \
+			--with-system-coinmp \
 			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
 			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar	\
 			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
@@ -204,7 +210,10 @@ CONFIGURE_ARGS+=	--enable-verbose \
 			--with-system-saxon     \
 			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
 			--with-system-beanshell	\
-			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar
+			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
+			--without-fonts
+#			--with-system-jpeg
+#			--with-system-serf \
 
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
@@ -236,7 +245,6 @@ pre-everything::
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 	@${MKDIR} ${WRKSRC}/../ext_sources
-	@${MV} ${WRKDIR}/ooo/ext_sources/* ${WRKSRC}/../ext_sources/
 	@${RM} -rf ${WRKSRC}/l10n
 
 post-patch:
@@ -271,7 +279,7 @@ do-install:
 	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
 	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org\/3/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/3??/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
 
 post-install:
 	@${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 7b33d35534e3..f13ef4a0f361 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/aoo-3.4.0-incubating-src.tar.bz2) = e32ca8efd401f152fc40b53c8f39c0b20ef8b8c1d8eaf3af578a34f622763bad
-SIZE (openoffice/aoo-3.4.0-incubating-src.tar.bz2) = 251417094
+SHA256 (openoffice/aoo-3.4.1-incubating-src.tar.bz2) = 56ac24cb4c59e013e623b386d5dfc3c0c61d3352f15e5dce6cb3d3105209835a
+SIZE (openoffice/aoo-3.4.1-incubating-src.tar.bz2) = 252312783
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1327774.tar.bz2) = 17bb70c9e16cb1d7452206a7450e3d2649e1865750e3b3776b5d55878b98d785
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1327774.tar.bz2) = 215141516
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.3.4.1.r1372282.tar.bz2) = 1334f853e66a74ef13919898658063750deb3ccfcb23d4888112b33e38874fc3
+SIZE (openoffice/ApacheOpenOffice.ext_sources.3.4.1.r1372282.tar.bz2) = 216072913
diff --git a/editors/openoffice-3/files/patch-apr b/editors/openoffice-3/files/patch-apr
deleted file mode 100644
index abc1e7061c9c..000000000000
--- a/editors/openoffice-3/files/patch-apr
+++ /dev/null
@@ -1,187 +0,0 @@
---- ../ext_libraries/apr/makefile.mk.orig	2012-03-05 00:28:09.000000000 -0800
-+++ ../ext_libraries/apr/makefile.mk	2012-05-18 00:06:26.000000000 -0700
-@@ -37,6 +37,8 @@
- TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
- TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1
- 
-+PATCH_FILES=apr-1.4.5.patch
-+
- .IF "$(OS)"=="WNT"
- 
- CONFIGURE_ACTION=cp include/apr.hw include/apr.h
---- /dev/null	2012-05-21 23:57:08.000000000 -0700
-+++ ../ext_libraries/apr/apr-1.4.5.patch	2012-05-21 23:53:48.000000000 -0700
-@@ -0,0 +1,173 @@
-+--- misc/build/apr-1.4.5/configure.orig	2011-05-19 17:09:22.000000000 -0700
-++++ misc/build/apr-1.4.5/configure	2012-05-21 23:51:51.000000000 -0700
-+@@ -13468,7 +13468,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -13484,7 +13484,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -14117,7 +14117,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -14128,7 +14128,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -14146,7 +14146,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -16199,7 +16199,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -17739,7 +17739,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -17750,7 +17750,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -17768,7 +17768,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -19717,7 +19717,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -19733,7 +19733,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -20314,7 +20314,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -20325,7 +20325,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -20343,7 +20343,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -22288,7 +22288,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -22304,7 +22304,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -22885,7 +22885,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -22896,7 +22896,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -22914,7 +22914,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
diff --git a/editors/openoffice-3/files/patch-coinmp b/editors/openoffice-3/files/patch-coinmp
deleted file mode 100644
index 4dca94dd7f74..000000000000
--- a/editors/openoffice-3/files/patch-coinmp
+++ /dev/null
@@ -1,1044 +0,0 @@
---- ../ext_libraries/coinmp/coinmp-1.6.0.patch.orig	2012-02-17 00:47:03.000000000 -0800
-+++ ../ext_libraries/coinmp/coinmp-1.6.0.patch	2012-05-21 23:38:53.000000000 -0700
-@@ -190,3 +190,1041 @@
-  	  ;;
-  
-  	irix | nonstopux)
-+--- misc/build/CoinMP-1.6.0/Cbc/configure.orig	2011-11-03 20:55:10.000000000 -0700
-++++ misc/build/CoinMP-1.6.0/Cbc/configure	2012-05-21 23:29:18.000000000 -0700
-+@@ -9224,7 +9224,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -9240,7 +9240,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -9836,7 +9836,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -9859,7 +9859,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -9877,7 +9877,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -12311,7 +12311,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -13796,7 +13796,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -13819,7 +13819,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -13837,7 +13837,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -15771,7 +15771,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -15787,7 +15787,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -16383,7 +16383,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -16406,7 +16406,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -16424,7 +16424,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -18370,7 +18370,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -18386,7 +18386,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -18982,7 +18982,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -19005,7 +19005,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -19023,7 +19023,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+--- misc/build/CoinMP-1.6.0/Cgl/configure.orig	2011-10-15 07:48:24.000000000 -0700
-++++ misc/build/CoinMP-1.6.0/Cgl/configure	2012-05-21 23:30:19.000000000 -0700
-+@@ -9202,7 +9202,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -9218,7 +9218,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -9814,7 +9814,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -9837,7 +9837,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -9855,7 +9855,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -12289,7 +12289,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -13774,7 +13774,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -13797,7 +13797,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -13815,7 +13815,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -15749,7 +15749,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -15765,7 +15765,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -16361,7 +16361,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -16384,7 +16384,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -16402,7 +16402,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -18348,7 +18348,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -18364,7 +18364,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -18960,7 +18960,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -18983,7 +18983,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -19001,7 +19001,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+--- misc/build/CoinMP-1.6.0/Clp/configure.orig	2011-11-05 12:32:33.000000000 -0700
-++++ misc/build/CoinMP-1.6.0/Clp/configure	2012-05-21 23:35:23.000000000 -0700
-+@@ -9225,7 +9225,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -9241,7 +9241,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -9837,7 +9837,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -9860,7 +9860,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -9878,7 +9878,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -12312,7 +12312,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -13797,7 +13797,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -13820,7 +13820,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -13838,7 +13838,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -15772,7 +15772,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -15788,7 +15788,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -16384,7 +16384,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -16407,7 +16407,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -16425,7 +16425,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -18371,7 +18371,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -18387,7 +18387,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -18983,7 +18983,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -19006,7 +19006,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -19024,7 +19024,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+--- misc/build/CoinMP-1.6.0/CoinMP/configure.orig	2011-11-07 19:35:10.000000000 -0800
-++++ misc/build/CoinMP-1.6.0/CoinMP/configure	2012-05-21 23:32:22.000000000 -0700
-+@@ -9168,7 +9168,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -9184,7 +9184,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -9780,7 +9780,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -9803,7 +9803,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -9821,7 +9821,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -12255,7 +12255,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -13740,7 +13740,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -13763,7 +13763,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -13781,7 +13781,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -15715,7 +15715,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -15731,7 +15731,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -16327,7 +16327,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -16350,7 +16350,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -16368,7 +16368,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -18314,7 +18314,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -18330,7 +18330,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -18926,7 +18926,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -18949,7 +18949,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -18967,7 +18967,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+--- misc/build/CoinMP-1.6.0/CoinUtils/configure.orig	2011-11-03 20:11:07.000000000 -0700
-++++ misc/build/CoinMP-1.6.0/CoinUtils/configure	2012-05-21 23:33:08.000000000 -0700
-+@@ -10658,7 +10658,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -10674,7 +10674,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -11270,7 +11270,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -11293,7 +11293,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -11311,7 +11311,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -13817,7 +13817,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -15302,7 +15302,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -15325,7 +15325,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -15343,7 +15343,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -17277,7 +17277,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -17293,7 +17293,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -17889,7 +17889,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -17912,7 +17912,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -17930,7 +17930,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -19892,7 +19892,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -19908,7 +19908,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -20504,7 +20504,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -20527,7 +20527,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -20545,7 +20545,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+--- misc/build/CoinMP-1.6.0/Osi/configure.orig	2011-10-15 07:26:34.000000000 -0700
-++++ misc/build/CoinMP-1.6.0/Osi/configure	2012-05-21 23:34:02.000000000 -0700
-+@@ -9197,7 +9197,7 @@
-+       hardcode_shlibpath_var=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs=no
-+       ;;
-+ 
-+@@ -9213,7 +9213,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct=yes
-+       hardcode_minus_L=yes
-+@@ -9809,7 +9809,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -9832,7 +9832,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -9850,7 +9850,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -12284,7 +12284,7 @@
-+ 	;;
-+     esac
-+     ;;
-+-  freebsd[12]*)
-++  freebsd[12].*)
-+     # C++ shared libraries reported to be fairly broken before switch to ELF
-+     ld_shlibs_CXX=no
-+     ;;
-+@@ -13769,7 +13769,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -13792,7 +13792,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -13810,7 +13810,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -15744,7 +15744,7 @@
-+       hardcode_shlibpath_var_F77=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_F77=no
-+       ;;
-+ 
-+@@ -15760,7 +15760,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_F77=yes
-+       hardcode_minus_L_F77=yes
-+@@ -16356,7 +16356,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -16379,7 +16379,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -16397,7 +16397,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
-+@@ -18343,7 +18343,7 @@
-+       hardcode_shlibpath_var_GCJ=no
-+       ;;
-+ 
-+-    freebsd1*)
-++    freebsd1.*)
-+       ld_shlibs_GCJ=no
-+       ;;
-+ 
-+@@ -18359,7 +18359,7 @@
-+       ;;
-+ 
-+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+-    freebsd2*)
-++    freebsd2.*)
-+       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+       hardcode_direct_GCJ=yes
-+       hardcode_minus_L_GCJ=yes
-+@@ -18955,7 +18955,7 @@
-+   shlibpath_var=LD_LIBRARY_PATH
-+   ;;
-+ 
-+-freebsd1*)
-++freebsd1.*)
-+   dynamic_linker=no
-+   ;;
-+ 
-+@@ -18978,7 +18978,7 @@
-+     objformat=`/usr/bin/objformat`
-+   else
-+     case $host_os in
-+-    freebsd[123]*) objformat=aout ;;
-++    freebsd[123].*) objformat=aout ;;
-+     *) objformat=elf ;;
-+     esac
-+   fi
-+@@ -18996,7 +18996,7 @@
-+   esac
-+   shlibpath_var=LD_LIBRARY_PATH
-+   case $host_os in
-+-  freebsd2*)
-++  freebsd2.*)
-+     shlibpath_overrides_runpath=yes
-+     ;;
-+   freebsd3.[01]* | freebsdelf3.[01]*)
\ No newline at end of file
diff --git a/editors/openoffice-3/files/patch-doublemmap b/editors/openoffice-3/files/patch-doublemmap
deleted file mode 100644
index 35397bd2b33f..000000000000
--- a/editors/openoffice-3/files/patch-doublemmap
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx
-===================================================================
---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	(revision 1337224)
-+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx	(working copy)
-@@ -355,7 +355,7 @@
- int const codeSnippetSize = 16;
- 
- unsigned char * codeSnippet(
--    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-+    unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-     typelib_TypeClass returnTypeClass)
- {
-     if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-@@ -401,7 +401,7 @@
-     // jmp privateSnippetExecutor:
-     *p++ = 0xE9;
-     *reinterpret_cast< sal_Int32 * >(p)
--        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-+        = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff;
-     p += sizeof (sal_Int32);
-     OSL_ASSERT(p - code <= codeSnippetSize);
-     return code + codeSnippetSize;
-@@ -434,7 +434,7 @@
- }
- 
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--    Slot ** slots, unsigned char * code,
-+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
-     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-     sal_Int32 functionCount, sal_Int32 vtableOffset)
- {
-@@ -447,9 +447,9 @@
-         switch (member->eTypeClass) {
-         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-             // Getter:
--            (s++)->fn = code;
-+            (s++)->fn = code + writetoexecdiff;
-             code = codeSnippet(
--                code, functionOffset++, vtableOffset,
-+                code, writetoexecdiff, functionOffset++, vtableOffset,
-                 reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-                     member)->pAttributeTypeRef->eTypeClass);
-             // Setter:
-@@ -457,17 +457,17 @@
-                 typelib_InterfaceAttributeTypeDescription * >(
-                     member)->bReadOnly)
-             {
--                (s++)->fn = code;
-+                (s++)->fn = code + writetoexecdiff;
-                 code = codeSnippet(
--                    code, functionOffset++, vtableOffset,
-+                    code, writetoexecdiff, functionOffset++, vtableOffset,
-                     typelib_TypeClass_VOID);
-             }
-             break;
- 
-         case typelib_TypeClass_INTERFACE_METHOD:
--            (s++)->fn = code;
-+            (s++)->fn = code + writetoexecdiff;
-             code = codeSnippet(
--                code, functionOffset++, vtableOffset,
-+                code, writetoexecdiff, functionOffset++, vtableOffset,
-                 reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-                     member)->pReturnTypeRef->eTypeClass);
-             break;
diff --git a/editors/openoffice-3/files/patch-java-vendors b/editors/openoffice-3/files/patch-java-vendors
deleted file mode 100644
index 0c3868e4eaef..000000000000
--- a/editors/openoffice-3/files/patch-java-vendors
+++ /dev/null
@@ -1,24 +0,0 @@
---- jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml	2012/03/28 11:18:19	1306262
-+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml	2012/04/24 04:16:01	1329547
-@@ -23,9 +23,12 @@
- <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  
-- <updated>2008-08-27</updated>
-+ <updated>2011-01-07</updated>
-  
-  <vendorInfos> 
-+  <vendor name="Oracle Corporation">
-+    <minVersion>1.7.0</minVersion>
-+  </vendor>
-   <vendor name="Sun Microsystems Inc.">
-     <minVersion>1.5.0</minVersion>
-   </vendor>
-@@ -38,6 +41,7 @@
-  </vendorInfos>
- 
-  <plugins>
-+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-   <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-   <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
diff --git a/editors/openoffice-3/files/patch-moz b/editors/openoffice-3/files/patch-moz
index 3a15772edb6e..aea881c67d54 100644
--- a/editors/openoffice-3/files/patch-moz
+++ b/editors/openoffice-3/files/patch-moz
@@ -1,215 +1,12 @@
-diff -urN moz/zipped/makefile.mk moz/zipped/makefile.mk
---- moz/zipped/makefile.mk	1970-01-01 09:00:00.000000000 +0900
-+++ moz/zipped/makefile.mk	2012-04-25 16:49:07.000000000 +0900
-@@ -0,0 +1,211 @@
-+#**************************************************************
-+#  
-+#  Licensed to the Apache Software Foundation (ASF) under one
-+#  or more contributor license agreements.  See the NOTICE file
-+#  distributed with this work for additional information
-+#  regarding copyright ownership.  The ASF licenses this file
-+#  to you under the Apache License, Version 2.0 (the
-+#  "License"); you may not use this file except in compliance
-+#  with the License.  You may obtain a copy of the License at
-+#  
-+#    http://www.apache.org/licenses/LICENSE-2.0
-+#  
-+#  Unless required by applicable law or agreed to in writing,
-+#  software distributed under the License is distributed on an
-+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+#  KIND, either express or implied.  See the License for the
-+#  specific language governing permissions and limitations
-+#  under the License.
-+#  
-+#**************************************************************
-+
-+
-+
-+PRJ=..
-+
-+PRJNAME=moz
-+TARGET=moz_unzip
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(PREBUILD_MOZAB)" == "" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO"
-+
-+dummy:
-+	@echo "No need to unpack the prebuilt mozab packages"
-+
-+.ELSE # unpack mozab zips
-+.INCLUDE :  target.mk
-+
-+.IF "$(BUILD_MOZAB)"=="TRUE"
-+ALLTAR:
-+	@echo "Does not need build mozab zipped!"
-+.ELSE
-+ALLTAR: \
-+	$(MISC)$/unpacked_$(TARGET)_inc \
-+	$(MISC)$/unpacked_$(TARGET)_lib \
-+	$(BIN)$/mozruntime.zip \
-+	$(MISC)$/replace_old_nss_libs
-+.ENDIF
-+.IF "$(GUI)" == "UNX"
-+
-+$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip'
-+	unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@
-+	chmod -R 775 $(LB)
-+
-+$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip
-+	unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
-+	chmod -R 775 $(INCCOM)
-+
-+.ELSE
-+
-+$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
-+	unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \
-+	$(TOUCH) $@
-+
-+$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
-+	unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH)	$@
-+
-+.ENDIF
-+
-+$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
-+	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
-+
-+# add alternative rules for universal binary moz-zips
-+.IF "$(GUIBASE)" == "aqua"
-+$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip'
-+	unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@
-+	chmod -R 775 $(LB)
-+  
-+$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip
-+	unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH)	$@
-+	chmod -R 775 $(INCCOM)
-+
-+$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip
-+	$(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip
-+
-+.ENDIF # "$(GUIBASE)"=="aqua"
-+
-+LIBLIST =
-+BIN_RUNTIMELIST = 
-+NSS_INCLUDE_LIST =
-+NSS_MODULE_RUNTIME_LIST =
-+.IF "$(ENABLE_NSS_MODULE)"=="YES"
-+# The prebuilt moz files include all the old NSS stuff from moz and not the new
-+# NSS libs, headers, etc, from the separate nss module. If we use the nss module
-+# then we must take care not to deliver the old NSS stuff from the "prebuilts"
-+.IF "$(GUI)" == "WNT"
-+    FREEBL_LIB_OLD=freebl3
-+.ELSE # "$(GUI)" == "WNT"
-+    .IF "$(OS)$(CPUNAME)" == "SOLARISSPARC"
-+        FREEBL_LIB_OLD=freebl_32fpu_3
-+    .ELSE # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
-+        FREEBL_LIB_OLD=freebl3
-+    .ENDIF # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
-+.ENDIF # "$(GUI)" == "WNT"
-+
-+BIN_RUNTIMELIST= \
-+    $(FREEBL_LIB_OLD) \
-+    nspr4 \
-+    plc4 \
-+    plds4 \
-+    nss3 \
-+    ssl3 \
-+    softokn3 \
-+    smime3
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(COM)"=="GCC"
-+LIBLIST= \
-+    libnspr4.a \
-+    libnss3.a \
-+    libsmime3.a \
-+    libplc4.a \
-+    libplds4.a \
-+    libssl3.a
-+
-+.ELSE
-+LIBLIST= \
-+    nspr4.lib \
-+    plc4.lib \
-+    plds4.lib \
-+    nss3.lib \
-+    ssl3.lib\
-+    smime3.lib
-+.ENDIF
-+.ELSE   #"$(GUI)"=="WNT"
-+LIBLIST= \
-+    lib$(FREEBL_LIB_OLD)$(DLLPOST) \
-+    libnspr4$(DLLPOST) \
-+    libsoftokn3$(DLLPOST) \
-+    libplc4$(DLLPOST) \
-+    libplds4$(DLLPOST) \
-+    libnss3$(DLLPOST) \
-+    libssl3$(DLLPOST) \
-+    libsmime3$(DLLPOST)
-+
-+.ENDIF # .IF "$(GUI)"=="WNT"
-+
-+
-+# On MacOS no include dirs nspr and nss exists in the prebuilt zip, no need to remove them 
-+.IF "$(OS)" != "MACOSX" 
-+NSS_INCLUDE_LIST= nspr nss
-+.ENDIF
-+
-+.IF "$(OS)" == "SOLARIS" 
-+.IF "$(CPU)" == "S" #32bit
-+FREEBL=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-+.ELIF "$(CPU)" == "U" #64bit unxsolu4
-+FREEBL=freebl_64int_3 freebl_64fpu_3
-+.ELSE
-+FREEBL=freebl3
-+.ENDIF #"$(CPU)" == "S"
-+
-+.ELSE # "$(OS)" == "SOLARIS" 
-+FREEBL=freebl3
-+.ENDIF # "$(OS)" == "SOLARIS" 
-+
-+
-+#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so
-+#See readme.txt  in module nss
-+NSS_MODULE_RUNTIME_LIST:= \
-+    $(FREEBL) \
-+    nspr4 \
-+    nss3 \
-+    nssckbi \
-+    nssdbm3 \
-+    nssutil3 \
-+    plc4 \
-+    plds4 \
-+    smime3 \
-+    softokn3 \
-+    sqlite/sqlite3 \
-+    ssl3
-+
-+
-+.ENDIF #.IF "$(ENABLE_NSS_MODULE)"=="YES"
-+# Remove the nss libs build in moz and those build in the nss module
-+$(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
-+$(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
-+    +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCCOM)$/$(dir) \
-+    $(INCCOM)$/$(dir)_remove_me &&)  echo >& $(NULLDEV)
-+    $(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCCOM)$/$(dir)_remove_me &&) \
-+        echo >& $(NULLDEV)
-+    $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \
-+    echo >& $(NULLDEV)
-+    $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib:f)$(DLLPOST) &&) \
-+    echo >& $(NULLDEV)
-+.IF "$(GUI)"=="WNT"
-+    +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib:f)$(DLLPOST) &&) \
-+    echo >& $(NULLDEV)
-+.ELSE
-+    +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(lib:d)$(DLLPRE)$(lib:f)$(DLLPOST) &&) \
-+    echo >& $(NULLDEV)
-+.ENDIF
-+    $(TOUCH) $@     
-+
-+.ENDIF   # unpack mozab zips
-+
+--- moz/zipped/makefile.mk	2012-01-11 21:19:49.000000000 +0900
++++ moz/zipped/makefile.mk	2012-09-20 15:35:23.000000000 +0900
+@@ -72,7 +72,8 @@
+ .ENDIF
+ 
+ $(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
+-	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
++	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip && \
++	chmod u+w $(BIN)$/mozruntime.zip
+ 
+ # add alternative rules for universal binary moz-zips
+ .IF "$(GUIBASE)" == "aqua"
diff --git a/editors/openoffice-3/files/patch-vcl b/editors/openoffice-3/files/patch-vcl
index b5897169e595..c9987e635319 100644
--- a/editors/openoffice-3/files/patch-vcl
+++ b/editors/openoffice-3/files/patch-vcl
@@ -1,24 +1,10 @@
-temporary hack. -I/usr/local/include appears too early so that graphite
-catches it thus build fails. 
-
-/workdir &&  mkdir -p $W/CxxObject/vcl/unx/generic/gdi/ && mkdir -p $W/Dep/CxxObject/vcl/unx/generic/gdi/ && c++ -DCPPU_ENV=gcc3 -DCUI -DENABLE_GRAPHITE -DENABLE_GTK -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -DFREEBSD -DGCC -DGXX_INCLUDE_PATH=/usr/include/c++/4.2 -DHAVE_GCC_VISIBILITY_FEATURE -DNDEBUG -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DPRODUCT -DPRODUCT_FULL -DSOLAR_JAVA -DSTLPORT_VERSION=400 -DSUPD=340 -DUNIX -DUNX -DVCL -DX86_64 -D_PTHREADS -D_REENTRANT   -D_XSALSET_LIBNAME=\"libspa.so\" -DVCLPLUG_GEN_IMPLEMENTATION  -DUSE_RANDR  -DUSE_XINERAMA_XORG  -Wall -Wendif-labels -Wextra -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wshadow -fPIC -fmessage-length=0 -fno-common -fno-strict-aliasing -fno-use-cxa-atexit -fvisibility-inlines-hidden -fvisibility=hidden -pipe   -D_THREAD_SAFE -I/usr/local/include    -DEXCEPTIONS_ON -fexceptions -fno-enforce-eh-specs  -Os -c $S/vcl/unx/generic/gdi/pspgraphics.cxx -o $W/CxxObject/vcl/unx/generic/gdi/pspgraphics.o -MMD -MT $W/CxxObject/vcl/unx/generic/gdi/pspgraphics.o -MF $W/Dep/CxxObject/vcl/unx/generic/gdi/pspgraphics.d -I$S/vcl/unx/generic/gdi/ -I$O/inc/stl -I$O/inc/stl -Iaaa -I$O/inc/external -I$O/inc -I$S/solenv/unxfbsdx/inc -I$S/solenv/inc -I$S/res -I$S/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$S/vcl/inc -I$S/vcl/inc/pch -I$S/solenv/inc -I$O/inc/offuh -I$O/inc/stl -I$O/inc 
-In file included from /usr/local/include/graphite/GrClient.h:31,
-                 from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/inc/graphite_layout.hxx:40,
-                 from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/unx/generic/gdi/pspgraphics.cxx:52:
-/usr/local/include/graphite/GrFeature.h:110: error: 'wstring' in namespace '_STL' does not name a type
-/usr/local/include/graphite/GrFeature.h:111: error: 'wstring' in namespace '_STL' does not name a type
-/usr/local/include/graphite/GrFeature.h:113: error: 'wstring' in namespace '_STL' does not name a type
-In file included from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/inc/graphite_layout.hxx:41,
-                 from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/unx/generic/gdi/pspgraphics.cxx:52:
-
-
---- vcl/Library_vclplug_gen.mk	2012-02-20 11:32:20.000000000 +0900
-+++ vcl/Library_vclplug_gen.mk	2012-02-20 11:53:47.000000000 +0900
-@@ -125,7 +125,6 @@
- ifeq ($(XRANDR_DLOPEN),FALSE)
- $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
-     $$(CXXFLAGS) \
--    $$(XRANDR_CFLAGS) \
- ))
+--- vcl/Library_vclplug_gen.mk.orig	2012-06-08 22:53:54.000000000 +0900
++++ vcl/Library_vclplug_gen.mk	2012-08-26 12:36:24.000000000 +0900
+@@ -150,6 +150,7 @@
+ ifeq ($(XINERAMA_LINK),dynamic)
  $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
      $$(LDFLAGS) \
++    -lXinerama \
+ ))
+ 
+ else