Update to SRC680_m243.

8 files changed, 44 insertions, 24 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 18d714413dff..c2d37487ebf5 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		242
+MILESTONE?=		243
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20080109
+SNAPDATE=		20080122
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -124,7 +124,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
-		imake:${X_IMAKE_PORT}
+		imake:${X_IMAKE_PORT} \
+		gperf:${PORTSDIR}/devel/gperf #i85469#
+
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -189,6 +191,9 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+pre-configure:
+#Workaround for gperf. #i85469#
+	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 25a9ef888a52..94b1ceafb940 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = d7548f079437b7e3cb534ed45a7c5a13
-SHA256 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 807418dbfa7bed810be5080130a23f2718e4448db5016dd96947e80a0cdd3d21
-SIZE (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 318276319
+MD5 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 8ed165999c1cf5acf45c761b4bab8e37
+SHA256 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = f311a9bb0b10524ae57b7f22331690fcc15d179ab0034bf877bc5106074ef8f5
+SIZE (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 312436188
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 18d714413dff..c2d37487ebf5 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		242
+MILESTONE?=		243
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20080109
+SNAPDATE=		20080122
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -124,7 +124,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
-		imake:${X_IMAKE_PORT}
+		imake:${X_IMAKE_PORT} \
+		gperf:${PORTSDIR}/devel/gperf #i85469#
+
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -189,6 +191,9 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+pre-configure:
+#Workaround for gperf. #i85469#
+	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 25a9ef888a52..94b1ceafb940 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = d7548f079437b7e3cb534ed45a7c5a13
-SHA256 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 807418dbfa7bed810be5080130a23f2718e4448db5016dd96947e80a0cdd3d21
-SIZE (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 318276319
+MD5 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 8ed165999c1cf5acf45c761b4bab8e37
+SHA256 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = f311a9bb0b10524ae57b7f22331690fcc15d179ab0034bf877bc5106074ef8f5
+SIZE (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 312436188
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 18d714413dff..c2d37487ebf5 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		242
+MILESTONE?=		243
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20080109
+SNAPDATE=		20080122
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -124,7 +124,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
-		imake:${X_IMAKE_PORT}
+		imake:${X_IMAKE_PORT} \
+		gperf:${PORTSDIR}/devel/gperf #i85469#
+
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -189,6 +191,9 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+pre-configure:
+#Workaround for gperf. #i85469#
+	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 25a9ef888a52..94b1ceafb940 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = d7548f079437b7e3cb534ed45a7c5a13
-SHA256 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 807418dbfa7bed810be5080130a23f2718e4448db5016dd96947e80a0cdd3d21
-SIZE (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 318276319
+MD5 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 8ed165999c1cf5acf45c761b4bab8e37
+SHA256 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = f311a9bb0b10524ae57b7f22331690fcc15d179ab0034bf877bc5106074ef8f5
+SIZE (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 312436188
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 18d714413dff..c2d37487ebf5 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		242
+MILESTONE?=		243
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20080109
+SNAPDATE=		20080122
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -124,7 +124,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
-		imake:${X_IMAKE_PORT}
+		imake:${X_IMAKE_PORT} \
+		gperf:${PORTSDIR}/devel/gperf #i85469#
+
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -189,6 +191,9 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+pre-configure:
+#Workaround for gperf. #i85469#
+	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 25a9ef888a52..94b1ceafb940 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = d7548f079437b7e3cb534ed45a7c5a13
-SHA256 (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 807418dbfa7bed810be5080130a23f2718e4448db5016dd96947e80a0cdd3d21
-SIZE (openoffice.org2/OOo_SRC680_m242_source.tar.bz2) = 318276319
+MD5 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 8ed165999c1cf5acf45c761b4bab8e37
+SHA256 (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = f311a9bb0b10524ae57b7f22331690fcc15d179ab0034bf877bc5106074ef8f5
+SIZE (openoffice.org2/OOo_SRC680_m243_source.tar.bz2) = 312436188
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144