Update to DEV300_m85.

Funded by: OpenOffice.org community.

3 files changed, 23 insertions, 39 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 7c4a70f40772..dc4664020235 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -5,16 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	openoffice.org
-PORTVERSION?=	3.3.${SNAPDATE}
-CATEGORIES+=	editors java
+PORTNAME=	openoffice.org
+PORTVERSION=	3.4.${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} ${OOOEXTSRC} unowinreg.dll:unowinreg
 
 #de facto maintainer is maho@FreeBSD.org
@@ -26,7 +23,7 @@ CONFLICTS=	cppunit*
 
 EXTRATC_ONLY?=	${OOOSRC} ${OOOEXTSRC}
 
-OOOEXTSRC=	ext_sources.20100505.tar.bz2:extsrc
+OOOEXTSRC=	ext_sources.20100718.tar.bz2:extsrc
 
 .if defined(CWS)
 PORTNAME:=	openoffice.org-${CWS}
@@ -37,9 +34,6 @@ OOOTAG=		${CWS}
 NO_LATEST_LINK=	yes
 
 .if !defined(WITHOUT_MOZILLA)
-SEAMONKEY_VERSION=	1.1.14
-SEAMONKEY_SOURCE=	seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2
-DISTFILES+=		${SEAMONKEY_SOURCE}:mozsrc
 USE_GNOME+=		libidl
 .endif
 
@@ -85,11 +79,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		84
+MILESTONE?=		85
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20100704
+SNAPDATE=		20100724
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -135,7 +129,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gtar:${PORTSDIR}/archivers/gtar \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		ant:${PORTSDIR}/devel/apache-ant \
-		${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 #see #i85469# for gperf
 
 USE_BISON=	build
@@ -198,16 +192,9 @@ pre-everything::
 .endif
 
 #issue XXXXXX not raised yet...
-CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch
-
+DOS2UNIX_REGEX=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch
 post-extract:
-	for i in ${CRLFFILES};  do \
-		cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \
-	done
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download
-.endif
 
 pre-configure:
 #Workaround for gperf. #i85469#
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index bc09eaf0dfca..8e225bfcca79 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,12 +1,9 @@
-MD5 (openoffice.org3/OOo_DEV300_m84_source.tar.bz2) = c857f4809a084744e34bf12bea13445d
-SHA256 (openoffice.org3/OOo_DEV300_m84_source.tar.bz2) = 03a9bccc6c2446dd8fe4b2a7ac2463a8e834f0e92bd742fff47cecf370e86836
-SIZE (openoffice.org3/OOo_DEV300_m84_source.tar.bz2) = 308628587
-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/OOo_DEV300_m85_source.tar.bz2) = 0b309c9d0c411ee52a396fdd61702d7e
+SHA256 (openoffice.org3/OOo_DEV300_m85_source.tar.bz2) = 17e8e0ce3bf98090030f488bdd00eacd2afb46b5eccaea8ded1ec3748ea95917
+SIZE (openoffice.org3/OOo_DEV300_m85_source.tar.bz2) = 308287292
+MD5 (openoffice.org3/ext_sources.20100718.tar.bz2) = da1971f1f0f3d23a3f1a63c1f9c18a88
+SHA256 (openoffice.org3/ext_sources.20100718.tar.bz2) = 68b032b0a2918eeb2af46b1d4adfb30af5f3d5ff1898de33460f5ec9b834dfc0
+SIZE (openoffice.org3/ext_sources.20100718.tar.bz2) = 214053194
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
-MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712
-SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28
-SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082
diff --git a/editors/openoffice-3-devel/files/patch-i102181 b/editors/openoffice-3-devel/files/patch-i102181
index 314eea8b204a..b649ffcb87c8 100644
--- a/editors/openoffice-3-devel/files/patch-i102181
+++ b/editors/openoffice-3-devel/files/patch-i102181
@@ -1,23 +1,23 @@
---- 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/*
+--- openssl/makefile.mk.orig	2010-07-17 07:41:38.000000000 +0900
++++ openssl/makefile.mk	2010-07-17 17:23:07.000000000 +0900
+@@ -64,7 +64,7 @@
+ 
+ UNAME=$(shell uname)
  
 -.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
 +.IF "$(OS)" == "LINUX"
  	PATCH_FILES=openssllnx.patch
  	ADDITIONAL_FILES:= \
- 		libcrypto_OOo_0_9_8l.map \
-@@ -100,6 +100,22 @@
+ 		libcrypto_OOo_0_9_8o.map \
+@@ -110,6 +110,22 @@
  	.ENDIF
  .ENDIF
  
 +.IF "$(OS)" == "FREEBSD"
 +	PATCH_FILES=openssllnx.patch
 +	ADDITIONAL_FILES:= \
-+		libcrypto_OOo_0_9_8l.map \
-+		libssl_OOo_0_9_8l.map
++		libcrypto_OOo_0_9_8o.map \
++		libssl_OOo_0_9_8o.map
 +	.IF "$(CPU)" == "I"
 +		CONFIGURE_ACTION=Configure BSD-x86-elf
 +	.ELIF "$(BUILD64)" == "1"