Build fix when DEVELOPER_VER is defined

2 files changed, 13 insertions, 24 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index e4da0d307eff..c2245ef2190d 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -14,7 +14,7 @@ DISTFILES+=	${OOOBUILD_SOURCE} ${OOO_CAIRO} \
 
 MAINTAINER=	maho@FreeBSD.org
 
-#DEVELOPER_VER=	yes #you must be an expert or guru to activate this 
+#DEVELOPER_VER=	yes #you must be an expert or guru to activate this
 .if defined(DEVELOPER_VER)
 OOOBUILD_VERSION=2.0.2.${MILESTONE}
 MILESTONE=	156
@@ -24,7 +24,7 @@ OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_CAIRO=	cairo-1.0.2.tar.gz
 OOO_MDBTOOLS=	mdbtools-0.6pre1.tar.gz
 OOO_EXTRA_ARTWORK=extras-2.tar.bz2
-OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.bz2
+OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .else
@@ -35,7 +35,7 @@ OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_CAIRO=	cairo-1.0.2.tar.gz
 OOO_MDBTOOLS=	mdbtools-0.6pre1.tar.gz
 OOO_EXTRA_ARTWORK=extras-2.tar.bz2
-OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.bz2
+OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .endif
@@ -66,6 +66,10 @@ pre-configure:
 #extract some goodies
 	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
 #apply FreeBSD specifc (?) patches for ooo-build :(
 #	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/cairo-patch
 #	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/patch-i18npool
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index c30381e4ec59..43e270e34d3b 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -7,9 +7,9 @@ SIZE (openoffice.org2.0/cairo-1.0.2.tar.gz) = 1458903
 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
-MD5 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3558c3d27ab789db6ab7f598a96d66e4
-SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = bd8345b962750e92f00ff9a57b9ea92de05034da482ed0663b2ddc1b4050b184
-SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3680307
+MD5 (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 9c57c933e793f791f2c8817ccd28911c
+SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 863a5d28a91c41d7d69de474895d7d67dbc4b50310c3f26f33641648b16ac817
+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
@@ -22,24 +22,9 @@ SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
-MD5 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = c61131dbbf63fead9477ad8445388dc4
-SHA256 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 0eacc02d33741189f849035a872c70c908aad01f799d28b9ef9c73aadea994ef
-SIZE (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 5090024
-MD5 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984
-SHA256 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e
-SIZE (openoffice.org2.0/cairo-1.0.2.tar.gz) = 1458903
-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
-MD5 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3558c3d27ab789db6ab7f598a96d66e4
-SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = bd8345b962750e92f00ff9a57b9ea92de05034da482ed0663b2ddc1b4050b184
-SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3680307
-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/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
 SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
 SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
-MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
+MD5 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = c61131dbbf63fead9477ad8445388dc4
+SHA256 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 0eacc02d33741189f849035a872c70c908aad01f799d28b9ef9c73aadea994ef
+SIZE (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 5090024