2 files changed, 21 insertions, 12 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index c6adb289f24a..dc312bb3ec0d 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -7,10 +7,14 @@ PORTNAME=	ooo-build
 PORTVERSION=	${OOOBUILD_VERSION}
 MASTER_SITES+=	http://www.go-ooo.org/packages/OOE680/ \
 		http://www.go-ooo.org/packages/SRC680/ \
-		http://www.openclipart.org/downloads/0.18/:openclipart
+		http://www.openclipart.org/downloads/0.18/:openclipart \
+		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/libwpd/g}:libwpd \
+		http://go-oo.org/packages/SRC680/:libwps
 DISTFILES+=	${OOOBUILD_SOURCE} \
 	${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \
-	${OOO_OPENCLIPART}:openclipart
+	${OOO_OPENCLIPART}:openclipart \
+	${OOO_LIBWPD}:libwpd \
+	${OOO_LIBWPS}:libwps
 
 MAINTAINER=	maho@FreeBSD.org
 
@@ -30,7 +34,7 @@ OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .else
-OOOBUILD_VERSION=2.1
+OOOBUILD_VERSION=2.1.7
 OOOBUILD_TAG=ooe680-m6
 OOOSRC=		OOo_OOE680_m6_source.tar.bz2
 OOOTAG=		OOE680_m6
@@ -40,13 +44,15 @@ OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_EXTRA_ARTWORK=extras-2.tar.bz2
 OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
+OOO_LIBWPD=		libwpd-0.8.8.tar.gz
+OOO_LIBWPS=		libwps-0.1.0~svn20070129.tar.gz
 OOO_PATCHDIR=src680
 .endif
 
 MD5_FILE=      ${.CURDIR}/distinfo
 USE_AUTOTOOLS=  autoconf:259
 
-CONFIGURE_ARGS+=	--enable-cairo --with-system-cairo --with-system-xrender-headers=yes #i62713#
+CONFIGURE_ARGS+=	--enable-cairo --with-system-cairo
 CONFIGURE_ARGS+=	--disable-access #--with-system-mdbtools
 #for lpsolve...
 CONFIGURE_ARGS+=	--with-system-lpsolve
@@ -77,6 +83,8 @@ pre-configure:
 .endif
 	@cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=${OOOBUILD_TAG}
 	@${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPD} ${WRKSRC}/libwpd/download/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPS} ${WRKSRC}/libwps/download/
 .if !defined(DEVELOPER_VER)
 	@${CP} ${WRKDIR}/${OOOBUILD}/src/go-oo-team.png ${WRKSRC}/default_images/sw/res
 .endif
@@ -84,11 +92,6 @@ pre-configure:
 	cd ${WRKSRC} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_EXTRA_ARTWORK}
 	#cd ${WRKDIR} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_OPENCLIPART}
 .if defined(DEVELOPER_VER)
-	@${MKDIR} ${WRKSRC}/external_images
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CRYSTAL_IMAGES} ${WRKSRC}/external_images
-.endif
-
-.if defined(DEVELOPER_VER)
 MASTERDIR=	${.CURDIR}/../openoffice.org-2-devel
 .else
 MASTERDIR=	${.CURDIR}/../openoffice.org-2
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index 65e4c0bca654..2a1448aa077e 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/ooo-build-2.1.tar.gz) = a9b1b3876a804251656374b92dd9e4f0
-SHA256 (openoffice.org2.0/ooo-build-2.1.tar.gz) = 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac
-SIZE (openoffice.org2.0/ooo-build-2.1.tar.gz) = 4034756
+MD5 (openoffice.org2.0/ooo-build-2.1.7.tar.gz) = 82bb16b6595200216155736e3a04a791
+SHA256 (openoffice.org2.0/ooo-build-2.1.7.tar.gz) = 8ef5f8f65619f32dfe0ced5b53901a28696b524f9584658e36c76fae632e724e
+SIZE (openoffice.org2.0/ooo-build-2.1.7.tar.gz) = 4250358
 MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020
 SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740
@@ -10,6 +10,12 @@ SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 1068060
 MD5 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619
 SHA256 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a
 SIZE (openoffice.org2.0/openclipart-0.18-full.tar.gz) = 126709000
+MD5 (openoffice.org2.0/libwpd-0.8.8.tar.gz) = cd5997284f4ba1e8dde5d1e5869fc342
+SHA256 (openoffice.org2.0/libwpd-0.8.8.tar.gz) = 3ded0ca9a24b55c844c2e82b84e6e55db4c46acbed4137c7be1f44b2cd68232b
+SIZE (openoffice.org2.0/libwpd-0.8.8.tar.gz) = 563088
+MD5 (openoffice.org2.0/libwps-0.1.0~svn20070129.tar.gz) = 2e442485100f7e00685737513f853546
+SHA256 (openoffice.org2.0/libwps-0.1.0~svn20070129.tar.gz) = 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
+SIZE (openoffice.org2.0/libwps-0.1.0~svn20070129.tar.gz) = 426668
 MD5 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = baa88794cb08d1a11169ae90ec25c0c4
 SHA256 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 492e702455a43c9c1b97266e74d3adc03815178e272c6f79b8e29c1089977e19
 SIZE (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 272194113