Update to OOO320_m2.

Funded by: OpenOffice.org community.
Feature safe:	yes

3 files changed, 46 insertions, 36 deletions

diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 68c8df2a6bc9..67f9d4e0cd0c 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -10,28 +10,28 @@ PORTNAME?=	openoffice.org
 PORTVERSION?=	3.2.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
+		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+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
+MASTER_SITE_SUBDIR+=	seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc
 DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
-.if defined(WITH_GPC)
-DISTFILES+=	gpc231.tar.Z:gpc
-.endif
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
 NO_LATEST_LINK=	yes
-USE_GNOME=	desktopfileutils gtk20
-MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
+
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	libidl
+SEAMONKEY_VERSION=	1.1.14
+SEAMONKEY_SOURCE=	seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2
+DISTFILES+=		${SEAMONKEY_SOURCE}:mozsrc
+USE_GNOME+=		libidl
 .endif
 
+USE_GNOME=	desktopfileutils gtk20
+
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=	3
 .endif
@@ -64,11 +64,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		1
+MILESTONE?=		2
 OOOTAG?=		OOO320_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20091008
+SNAPDATE=		20091015
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -104,7 +104,6 @@ CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
 
-LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
@@ -112,12 +111,10 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${PORTSDIR}/devel/imake \
+		gtar:${PORTSDIR}/archivers/gtar \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		ant:${PORTSDIR}/devel/apache-ant
-
-.if !defined(WITH_GPC)
-LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
-.endif
+#see #i85469# for gperf
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
@@ -135,12 +132,12 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-system-zlib				\
 			--with-system-stdlibs				\
 			--with-epm=internal				\
+			--enable-hids					\
 			--enable-minimizer 				\
 			--enable-presenter-console			\
 			--enable-pdfimport				\
 			--enable-wiki-publisher				\
-			--enable-report-builder                         \
-			--disable-nss-module
+			--enable-report-builder
 
 OOOEXTENSIONS+=		minimizer/sun-presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
@@ -148,9 +145,6 @@ OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
 OOOEXTENSIONS+=		swext/wiki-publisher.oxt
 OOOEXTENSIONS+=		sun-report-builder.oxt
 
-.if ${ARCH} == amd64
-WITHOUT_MOZILLA=	yes
-.endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .endif
@@ -185,13 +179,8 @@ post-extract:
 		cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \
 	done
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if defined(WITH_GPC)
-	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
-	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
-	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
-.endif
 .if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 pre-configure:
@@ -222,6 +211,9 @@ do-install:
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/320/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
@@ -234,7 +226,8 @@ do-install:
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/320/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 9f8a5adca239..80b1d076a19a 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,9 +1,9 @@
-MD5 (openoffice.org3/OOo_OOO320_m1_source.tar.bz2) = e9b60fe6a2a91126da3cc93003e2f178
-SHA256 (openoffice.org3/OOo_OOO320_m1_source.tar.bz2) = 8bcd38c73cdda30da0e1ee7cfe15fcaeae57a8bec175a55d5f44ff69e47a26cc
-SIZE (openoffice.org3/OOo_OOO320_m1_source.tar.bz2) = 454330709
+MD5 (openoffice.org3/OOo_OOO320_m2_source.tar.bz2) = e778d88b2d8faa1cc878c879b5c8fd3f
+SHA256 (openoffice.org3/OOo_OOO320_m2_source.tar.bz2) = 7f982db23cd68a3001cee8319817a191ce3ae26d77a502f63ba40fc2541ea2a3
+SIZE (openoffice.org3/OOo_OOO320_m2_source.tar.bz2) = 453991492
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
-MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
+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.org-3-RC/files/patch-i105977 b/editors/openoffice.org-3-RC/files/patch-i105977
new file mode 100644
index 000000000000..2a64e10e0fb0
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i105977
@@ -0,0 +1,17 @@
+--- nss/makefile.mk~	2009-10-18 14:50:43.000000000 +0900
++++ nss/makefile.mk	2009-10-18 14:50:56.000000000 +0900
+@@ -65,6 +65,14 @@
+ .ENDIF			# "$(CPU)"=="X"
+ .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+ 
++.IF "$(OS)$(COM)"=="FREEBSDGCC"
++.IF "$(CPU)"=="X"
++# force 64-bit buildmode
++USE_64:=1
++.EXPORT : USE_64
++.ENDIF			# "$(CPU)"=="X"
++.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
++
+ 
+ .IF "$(OS)"=="MACOSX"
+ .IF "$(EXTRA_CFLAGS)"!=""