Index: head/editors/openoffice-3-devel/Makefile
===================================================================
--- head/editors/openoffice-3-devel/Makefile	(revision 297646)
+++ head/editors/openoffice-3-devel/Makefile	(revision 297647)
@@ -1,317 +1,316 @@
 # New ports collection makefile for: Apache OpenOffice
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	3.4.${SVNREVISION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	maho/openoffice
 DISTFILES+=	${OOOSRC} ${EXTSRC} unowinreg.dll
 EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
 
 #de facto maintainer is maho@FreeBSD.org
 #Frequent Patch submitters should optionally sign Apache iCLA
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
 LICENSE=	AL2
 
 NO_LATEST_LINK=	yes
 
 USE_GNOME=	desktopfileutils gtk20 libxslt libidl gconf2 gnomevfs2 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=	4.6+
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	freebsd bsdjava openjdk
 JAVA_VERSION=	1.5 1.6
 
 .include <${FILESDIR}/Makefile.localized>
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 .else
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
 OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
 EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SVNREVISION=		1340369
+SVNREVISION=		1343442
 INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
 EXECBASE?=		openoffice-r${SVNREVISION}
 DIST_SUBDIR=		openoffice
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
 PACKAGE_BASENAME=	ApacheOpenOffice_${OPSYS}_${PORTREVISION}_x86-64
 .else
 PACKAGE_BASENAME=	ApacheOpenOffice_${OPSYS}_${PORTREVISION}_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}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel
 
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
 OOOCC=		${CCACHE_PREFIX} ${CC}
 OOOCXX=		${CCACHE_PREFIX} ${CXX}
 .else
 OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 		PATH=${WRKSRC}/solenv/bin:$$PATH	\
 		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		curl.6:${PORTSDIR}/ftp/curl \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
 		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		rdf.0:${PORTSDIR}/textproc/redland \
 		textcat.0:${PORTSDIR}/textproc/libtextcat \
 		freetype.9:${PORTSDIR}/print/freetype2
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${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}/bsh.jar:${PORTSDIR}/lang/bsh \
 		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
 		epm:${PORTSDIR}/devel/epm \
 		dmake:${PORTSDIR}/devel/dmake \
 		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 
 USE_AUTOTOOLS=	autoconf
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 WRKSRC?=	${WRKDIR}/ooo/main
 BASH?=		${PREFIX}/bin/bash
 SUB_FILES=	pkg-message
 SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
 
 .if defined(DISABLE_MAKE_JOBS)
 MAKE_JOBS_NUMBER=	4
 .endif
 
 CONFIGURE_ARGS+=	--enable-verbose \
 			--enable-symbols=small \
 			--enable-crashdump \
 			--with-vendor="FreeBSD ports system"	\
 			--with-epm=${LOCALBASE}/bin/epm \
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--with-gperf=${LOCALBASE}/bin/gperf	\
 			--x-includes=${LOCALBASE}/include	\
 			--x-libraries=${LOCALBASE}lib	\
 			--with-system-libxml 		\
 			--with-system-libxslt 		\
 			--with-system-cairo --enable-cairo \
 			--with-system-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-libtextcat-data=${LOCALBASE}/share/libtextcat \
 			--with-system-vigra \
 			--with-system-stdlibs \
 			--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-junit=${LOCALBASE}/share/java/classes/junit.jar \
 			--with-package-format="archive" \
 			--enable-gstreamer \
 			--enable-minimizer \
 			--enable-presenter-console \
 			--enable-wiki-publisher \
 			--enable-dbus \
 			--enable-opengl \
 			--enable-category-b \
 			--with-system-hunspell \
 			--with-system-saxon     \
 			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
 			--with-system-beanshell	\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar
 
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
 #OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
 OOOEXTENSIONS+=		swext/wiki-publisher.oxt
 
 ICONS=	${WRKSRC}/sysui/desktop/icons
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${MKDIR} ${WRKDIR}
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 
 post-patch:
 .if defined (USE_GCC)
 	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
 	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .else
 	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
 	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .endif
 
 pre-configure:
 	@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
 
 do-build:
 	@cd ${WRKDIR}/ooo ; ${PRINTF} "[repositories]\n" > source_config
 	@cd ${WRKDIR}/ooo ; ${PRINTF} "main=active\n" >> source_config
 	@cd ${WRKDIR}/ooo ; ${PRINTF} "extras=active\n" >> source_config
 	@cd ${WRKSRC} ; ./bootstrap
 	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice.org3/program/bootstraprc
 	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/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/
 
 post-install:
 	@${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
 			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${ECHO_CMD} "" > ${TMPPLIST}
 	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
 	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
 	@${ECHO_CMD} "share/licenses/${PKGNAME}/AL2"        >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}"     >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm share/licenses"                >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
 		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@for app in base calc draw impress math writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
 	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
 		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
 	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
 	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${DESKTOPDIR}/${EXECBASE}
 	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
 				${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
 				    ${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \
 				${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \
 			fi \
 		done ; \
 		for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
 			${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \
 			    ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \
 			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
 		done ; \
 	done
 	@${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE}
 	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice-3-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.535
\ No newline at end of property
+1.536
\ No newline at end of property
Index: head/editors/openoffice-3-devel/distinfo
===================================================================
--- head/editors/openoffice-3-devel/distinfo	(revision 297646)
+++ head/editors/openoffice-3-devel/distinfo	(revision 297647)
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1340369.tar.bz2) = 4ae7f8796fc431d859ec9e56d7d1955765cc93dd20b79455d2af40ec6f7e7161
-SIZE (openoffice/ApacheOpenOffice.r1340369.tar.bz2) = 251650050
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1340369.tar.bz2) = a02caf168d96b18e310bd102ee35c1098e6d98205a7471e1a79801da6a949567
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1340369.tar.bz2) = 223307883
+SHA256 (openoffice/ApacheOpenOffice.r1343442.tar.bz2) = 78ffa3551640d15b23537beb8dd06ac994a3253acc7a606904f9f34c35ee273c
+SIZE (openoffice/ApacheOpenOffice.r1343442.tar.bz2) = 251657502
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1343442.tar.bz2) = 07ed07aa297ccfd476a2b9c20e482a45cfb35f6b875d914545768e27a7d9823c
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1343442.tar.bz2) = 223305203
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144

Property changes on: head/editors/openoffice-3-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.286
\ No newline at end of property
+1.287
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/patch-coinmp
===================================================================
--- head/editors/openoffice-3-devel/files/patch-coinmp	(revision 297646)
+++ head/editors/openoffice-3-devel/files/patch-coinmp	(nonexistent)
@@ -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

Property changes on: head/editors/openoffice-3-devel/files/patch-coinmp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/patch-gperf
===================================================================
--- head/editors/openoffice-3-devel/files/patch-gperf	(revision 297646)
+++ head/editors/openoffice-3-devel/files/patch-gperf	(nonexistent)
@@ -1,11 +0,0 @@
---- oox/source/token/makefile.mk~	2011-12-21 09:52:48.000000000 +0900
-+++ oox/source/token/makefile.mk	2011-12-25 13:12:55.000000000 +0900
-@@ -48,7 +48,7 @@
- 
- .INCLUDE :  target.mk
- .IF "$(GPERF)" == "" || !DEFINED $(GPERF)
--GPERF=gperf
-+GPERF=/usr/local/bin/gperf
- .ENDIF
- 
- GENHEADERPATH = $(INCCOM)$/oox$/token

Property changes on: head/editors/openoffice-3-devel/files/patch-gperf
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/patch-apr
===================================================================
--- head/editors/openoffice-3-devel/files/patch-apr	(revision 297646)
+++ head/editors/openoffice-3-devel/files/patch-apr	(nonexistent)
@@ -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]*)

Property changes on: head/editors/openoffice-3-devel/files/patch-apr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice-3-devel/files/patch-vcl
===================================================================
--- head/editors/openoffice-3-devel/files/patch-vcl	(revision 297646)
+++ head/editors/openoffice-3-devel/files/patch-vcl	(revision 297647)
@@ -1,20 +1,10 @@
 --- vcl/Library_vclplug_gen.mk.orig	2012-05-19 17:17:44.000000000 +0900
 +++ vcl/Library_vclplug_gen.mk	2012-05-20 16:11:53.000000000 +0900
 @@ -124,7 +124,6 @@
  ifeq ($(XRANDR_DLOPEN),FALSE)
  $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
      $$(CXXFLAGS) \
 -    $$(XRANDR_CFLAGS) \
  ))
  $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
      $$(LDFLAGS) \
-@@ -204,4 +203,9 @@
- 	Xinerama Xrandr					\
- ))
- endif
-+ifeq ($(OS),FREEBSD)
-+$(eval $(call gb_Library_add_external_libs,vclplug_gen,	\
-+	Xinerama Xrandr					\
-+))
-+endif
- # vim: set noet sw=4 ts=4:

Property changes on: head/editors/openoffice-3-devel/files/patch-vcl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property