9 files changed, 85 insertions, 59 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 9ac733dec109..4157dbd7c4bf 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -9,12 +9,13 @@ PORTNAME?=	openoffice.org
 PORTVERSION?=	3.3.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
 		${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
 MASTER_SITE_SUBDIR+=	seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc
-DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
+DISTFILES+=	${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg
 
 #de facto maintainer is maho@FreeBSD.org
 #patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy
@@ -23,7 +24,9 @@ COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(devel
 
 CONFLICTS=	cppunit*
 
-EXTRATC_ONLY?=	${OOOSRC}
+EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
+
+OOOEXTSRC=	ext_sources.20100505.tar.bz2:extsrc
 
 .if defined(CWS)
 PORTNAME:=	openoffice.org-${CWS}
@@ -82,11 +85,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		76
+MILESTONE?=		77
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100409
+SNAPDATE=		20100424
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -131,7 +134,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		imake:${PORTSDIR}/devel/imake \
 		gtar:${PORTSDIR}/archivers/gtar \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		ant:${PORTSDIR}/devel/apache-ant
+		ant:${PORTSDIR}/devel/apache-ant \
+		${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit
 #see #i85469# for gperf
 
 USE_BISON=	build
@@ -148,6 +152,7 @@ MAKE_JOBS_NUMBER=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
+			--with-junit=${LOCALBASE}/share/java/classes/junit.jar	\
 			--with-system-zlib				\
 			--with-system-stdlibs				\
 			--with-epm=internal				\
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 56e567ff8b29..fdc61a7c116e 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,9 @@
-MD5 (openoffice.org3/OOo_DEV300_m76_source.tar.bz2) = 9353ba68637f18f2e6a59e07742c81cb
-SHA256 (openoffice.org3/OOo_DEV300_m76_source.tar.bz2) = d8440109eed0f0a3dadfc6b95c589854c318faa8e42fa8e94a725c4bcf4b0a56
-SIZE (openoffice.org3/OOo_DEV300_m76_source.tar.bz2) = 464902995
+MD5 (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = 6a6d7490a08e15249bb421425e12e0db
+SHA256 (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = a9b0609d890603feab6acf1b8059beeb11a0fc508ee0aa5f70e21c026624b8ad
+SIZE (openoffice.org3/OOo_DEV300_m77_source.tar.bz2) = 306196948
+MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41
+SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef
+SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i10000 b/editors/openoffice-3-devel/files/patch-i10000
new file mode 100644
index 000000000000..4316844fbd72
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i10000
@@ -0,0 +1,11 @@
+--- postprocess/checkdeliver/checkdeliver.pl~	2010-04-29 13:18:38.000000000 +0900
++++ postprocess/checkdeliver/checkdeliver.pl	2010-05-07 09:19:07.000000000 +0900
+@@ -48,7 +48,7 @@
+ my $platform         = '';
+ my $milestoneext     = '';
+ my $local_env        = 0;
+-my $source_config    = SourceConfig -> new();
++my $source_config    = SourceConfig -> new($ENV{SOLARSRC});
+ my @exceptionmodlist = (
+                         "postprocess",
+                         "instset.*native",
diff --git a/editors/openoffice-3-devel/files/patch-i100395 b/editors/openoffice-3-devel/files/patch-i100395
deleted file mode 100644
index afd73b787e8f..000000000000
--- a/editors/openoffice-3-devel/files/patch-i100395
+++ /dev/null
@@ -1,15 +0,0 @@
---- solenv/inc/unx.mk~	2009-02-25 02:58:24.000000000 +0900
-+++ solenv/inc/unx.mk	2009-03-20 16:52:22.000000000 +0900
-@@ -242,9 +242,9 @@
- # potentially affects multiple commands following on the recipe line:
- .IF "$(USE_SHELL)" == "bash"
- AUGMENT_LIBRARY_PATH *= : && \
--    LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
-+    LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR):.
- .ELSE
- AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \
--    eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \
--    if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
-+    eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR):."' && \
-+    if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR):." &&
- .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-i102181 b/editors/openoffice-3-devel/files/patch-i102181
index 53ccde029f35..314eea8b204a 100644
--- a/editors/openoffice-3-devel/files/patch-i102181
+++ b/editors/openoffice-3-devel/files/patch-i102181
@@ -1,6 +1,6 @@
---- openssl/makefile.mk.orig	2009-12-06 12:25:44.000000000 +0900
-+++ openssl/makefile.mk	2009-12-12 17:14:17.000000000 +0900
-@@ -65,7 +65,7 @@
+--- openssl/makefile.mk	2010-04-29 13:18:37.000000000 +0900
++++ openssl/makefile.mk	2010-05-05 12:46:55.000000000 +0900
+@@ -62,7 +62,7 @@
  OUT2LIB += libcrypto.*
  OUT2INC += include/openssl/*
  
@@ -9,7 +9,7 @@
  	PATCH_FILES=openssllnx.patch
  	ADDITIONAL_FILES:= \
  		libcrypto_OOo_0_9_8l.map \
-@@ -103,6 +103,22 @@
+@@ -100,6 +100,22 @@
  	.ENDIF
  .ENDIF
  
diff --git a/editors/openoffice-3-devel/files/patch-i109428 b/editors/openoffice-3-devel/files/patch-i109428
deleted file mode 100644
index e54a6f45ee7e..000000000000
--- a/editors/openoffice-3-devel/files/patch-i109428
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.in~	2010-02-04 02:35:04.000000000 +0900
-+++ configure.in	2010-02-19 10:05:22.000000000 +0900
-@@ -4467,7 +4467,7 @@
- dnl ===================================================================
- 
- AC_MSG_CHECKING([whether to enable graphite support])
--if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
-+if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
-     AC_MSG_RESULT([yes])
-     ENABLE_GRAPHITE="TRUE"
-     AC_MSG_CHECKING([which graphite to use])
-
---- configure.orig	2010-03-10 05:08:35.000000000 +0900
-+++ configure	2010-03-13 18:48:47.000000000 +0900
-@@ -15913,7 +15913,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
- $as_echo_n "checking whether to enable graphite support... " >&6; }
--if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
-+if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-     ENABLE_GRAPHITE="TRUE"
diff --git a/editors/openoffice-3-devel/files/patch-i111384 b/editors/openoffice-3-devel/files/patch-i111384
new file mode 100644
index 000000000000..edb766fe8f45
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i111384
@@ -0,0 +1,34 @@
+--- /dev/null	2010-05-05 13:00:20.000000000 +0900
++++ hunspell/hunspell.patch	2010-05-05 13:03:11.000000000 +0900
+@@ -0,0 +1,8 @@
++--- misc/hunspell-1.2.9/tests/test.sh	2010-02-23 21:18:50.000000000 +0900
+++++ misc/build/hunspell-1.2.9/tests/test.sh	2010-05-05 13:01:42.000000000 +0900
++@@ -1,4 +1,4 @@
++-#!/bin/bash
+++#!/usr/bin/env bash
++ export LC_ALL="C"
++ 
++ function check_valgrind_log () {
+--- hunspell/makefile.mk.orig	2010-05-05 12:59:48.000000000 +0900
++++ hunspell/makefile.mk	2010-05-05 13:02:14.000000000 +0900
+@@ -43,8 +43,9 @@
+ PATCH_FILES=\
+     hunspell-wntconfig.patch \
+     hunspell-solaris.patch \
+-    hunspell-stacksmash.patch
+-
++    hunspell-stacksmash.patch \
++    hunspell.patch
++	
+ .IF "$(GUI)"=="UNX"
+ 
+ #relative to CONFIGURE_DIR
+@@ -60,6 +61,8 @@
+ .ENDIF # "$(EXTRA_CFLAGS)"!=""
+ .ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
++.ELIF "$(OS)"=="FREEBSD" # "$(SYSBASE)"!=""
++CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS) -I$(COMPATH)/include" CXXFLAGS="$(EXTRA_CFLAGS) -I$(COMPATH)/include"
+ .ENDIF
+ 
+ BUILD_ACTION=make && make check
diff --git a/editors/openoffice-3-devel/files/patch-i111385 b/editors/openoffice-3-devel/files/patch-i111385
new file mode 100644
index 000000000000..fabd312ba7be
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i111385
@@ -0,0 +1,11 @@
+--- cppunit/makefile.mk	2010-04-29 13:16:42.000000000 +0900
++++ cppunit/makefile.mk	2010-05-05 13:09:50.000000000 +0900
+@@ -97,7 +97,7 @@
+ # execute that program; however, the program would fail to locate the STLport
+ # library (another work-around might be to add something like --as-needed around
+ # $(LIBSTLPORT)):
+-.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
++.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" || "$(OS)" == "FREEBSD"
+ .IF "$(LD_LIBRARY_PATH)" == ""
+ LD_LIBRARY_PATH := $(SOLARLIBDIR)
+     # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
diff --git a/editors/openoffice-3-devel/files/patch-i91318 b/editors/openoffice-3-devel/files/patch-i91318
index a87ec93e2460..4348b75903da 100644
--- a/editors/openoffice-3-devel/files/patch-i91318
+++ b/editors/openoffice-3-devel/files/patch-i91318
@@ -1,14 +1,14 @@
---- hunspell/hunspell-1.2.8.patch~	2009-03-11 22:17:54.000000000 +0900
-+++ hunspell/hunspell-1.2.8.patch	2009-03-20 21:37:49.000000000 +0900
-@@ -619,3 +619,11 @@
-              p++;
-          }
-          if (i > 0 && buf[i - 1] == '\n') {
-+--- misc/hunspell-1.2.8/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.2.8/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
+--- hyphen/hyphen-2.4.patch	2010-05-05 12:40:53.000000000 +0900
++++ hyphen/hyphen-2.4.patch	2010-05-05 12:41:25.000000000 +0900
+@@ -167,3 +167,11 @@
+ +
+ +.INCLUDE : target.mk
+ Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests
++--- misc/hyphen-2.4/tests/test.sh	2010-05-05 12:40:17.000000000 +0900
+++++ misc/build/hyphen-2.4/tests/test.sh	2010-05-05 12:40:31.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/bin/env bash
-+ export LC_ALL="C"
 + 
 + function check_valgrind_log () {
++ if [ "$VALGRIND" != "" ]; then