Index: head/editors/openoffice-3/Makefile
===================================================================
--- head/editors/openoffice-3/Makefile	(revision 156712)
+++ head/editors/openoffice-3/Makefile	(revision 156713)
@@ -1,240 +1,240 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2.rc1
+PORTVERSION?=	2.0.2.rc2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.2rc1_src.tar.gz
+DISTFILES+=	OOo_2.0.2rc2_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.2rc1_src.tar.gz
+EXTRACT_ONLY=	OOo_2.0.2rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m1
+OOOTAG?=		OOB680_m2
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
 #BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
 BROKEN=	"still work in progress"
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
 CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	${LOCALBASE}/gcc41/bin/gcc
 CXX=	${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
 .endif
 .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
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice-3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.221
\ No newline at end of property
+1.222
\ No newline at end of property
Index: head/editors/openoffice-3/distinfo
===================================================================
--- head/editors/openoffice-3/distinfo	(revision 156712)
+++ head/editors/openoffice-3/distinfo	(revision 156713)
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1
+SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda
+SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
 SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
 SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 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

Property changes on: head/editors/openoffice-3/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.82
\ No newline at end of property
+1.83
\ No newline at end of property
Index: head/editors/openoffice-3/files/patch-epm
===================================================================
--- head/editors/openoffice-3/files/patch-epm	(revision 156712)
+++ head/editors/openoffice-3/files/patch-epm	(nonexistent)
@@ -1,124 +0,0 @@
-Index: epm/epm-3.7.patch
-===================================================================
-RCS file: /cvs/external/epm/epm-3.7.patch,v
-retrieving revision 1.8
-diff -u -r1.8 epm-3.7.patch
---- epm/epm-3.7.patch	3 Feb 2006 17:32:08 -0000	1.8
-+++ epm/epm-3.7.patch	11 Feb 2006 09:28:33 -0000
-@@ -546,3 +546,116 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
-+--- misc/build/epm-3.7/bsd.c	Thu Jan 19 17:05:43 2006
-+***************
-+*** 26,31 ****
-+--- 26,38 ----
-+  
-+  #include "epm.h"
-+  
-++ void cr2semicolon(char *command)
-++ {
-++   int len, i;
-++   len=strlen(command);
-++   for (i=0;i<len;i++)
-++     if(*(command+i)=='\n') *(command+i)=';';
-++ }
-+  
-+  /*
-+   * 'make_bsd()' - Make a FreeBSD software distribution package.
-+***************
-+*** 149,156 ****
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+--- 156,172 ----
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+! #ifdef __FreeBSD__
-+!     if (d->type == DEPEND_REQUIRES) {
-+!       if (dist->relnumber)
-+! 	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+!       else
-+! 	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+!     }
-+! #else
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+! #endif
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+***************
-+*** 179,187 ****
-+--- 196,206 ----
-+  	        "         by the BSD packager.\n", stderr);
-+            break;
-+        case COMMAND_POST_INSTALL :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@exec %s\n", c->command);
-+  	  break;
-+        case COMMAND_PRE_REMOVE :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@unexec %s\n", c->command);
-+  	  break;
-+        case COMMAND_POST_REMOVE :
-+***************
-+*** 199,205 ****
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+--- 218,224 ----
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+*** misc/epm-3.7/qprintf.c	Tue Jan 28 06:48:03 2003
-+--- misc/build/epm-3.7/qprintf.c	Thu Jan 19 17:04:22 2006
-+***************
-+*** 181,192 ****
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! 
-+  	      putc(*s, fp);
-+  	    }
-+  
-+--- 181,199 ----
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-++ #if defined(__FreeBSD__)
-++ 	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-++ 	      {
-++ 	        putc('\\', fp);
-++ 		bytes ++;
-++ 	      }
-++ #else
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! #endif
-+  	      putc(*s, fp);
-+  	    }
-+  

Property changes on: head/editors/openoffice-3/files/patch-epm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice-3/files/patch-np_sdk
===================================================================
--- head/editors/openoffice-3/files/patch-np_sdk	(revision 156712)
+++ head/editors/openoffice-3/files/patch-np_sdk	(nonexistent)
@@ -1,15 +0,0 @@
-Index: np_sdk/mozsrc/makefile.mk
-===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 makefile.mk
---- np_sdk/mozsrc/makefile.mk	10 Feb 2006 14:06:33 -0000	1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk	15 Feb 2006 13:47:31 -0000
-@@ -41,7 +41,6 @@
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
--SOLARINC=
- JDKINCS=
- 
- # --- Files --------------------------------------------------------

Property changes on: head/editors/openoffice-3/files/patch-np_sdk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-2/Makefile
===================================================================
--- head/editors/openoffice.org-2/Makefile	(revision 156712)
+++ head/editors/openoffice.org-2/Makefile	(revision 156713)
@@ -1,240 +1,240 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2.rc1
+PORTVERSION?=	2.0.2.rc2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.2rc1_src.tar.gz
+DISTFILES+=	OOo_2.0.2rc2_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.2rc1_src.tar.gz
+EXTRACT_ONLY=	OOo_2.0.2rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m1
+OOOTAG?=		OOB680_m2
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
 #BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
 BROKEN=	"still work in progress"
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
 CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	${LOCALBASE}/gcc41/bin/gcc
 CXX=	${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
 .endif
 .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
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.221
\ No newline at end of property
+1.222
\ No newline at end of property
Index: head/editors/openoffice.org-2/distinfo
===================================================================
--- head/editors/openoffice.org-2/distinfo	(revision 156712)
+++ head/editors/openoffice.org-2/distinfo	(revision 156713)
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1
+SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda
+SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
 SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
 SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 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

Property changes on: head/editors/openoffice.org-2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.82
\ No newline at end of property
+1.83
\ No newline at end of property
Index: head/editors/openoffice.org-2/files/patch-epm
===================================================================
--- head/editors/openoffice.org-2/files/patch-epm	(revision 156712)
+++ head/editors/openoffice.org-2/files/patch-epm	(nonexistent)
@@ -1,124 +0,0 @@
-Index: epm/epm-3.7.patch
-===================================================================
-RCS file: /cvs/external/epm/epm-3.7.patch,v
-retrieving revision 1.8
-diff -u -r1.8 epm-3.7.patch
---- epm/epm-3.7.patch	3 Feb 2006 17:32:08 -0000	1.8
-+++ epm/epm-3.7.patch	11 Feb 2006 09:28:33 -0000
-@@ -546,3 +546,116 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
-+--- misc/build/epm-3.7/bsd.c	Thu Jan 19 17:05:43 2006
-+***************
-+*** 26,31 ****
-+--- 26,38 ----
-+  
-+  #include "epm.h"
-+  
-++ void cr2semicolon(char *command)
-++ {
-++   int len, i;
-++   len=strlen(command);
-++   for (i=0;i<len;i++)
-++     if(*(command+i)=='\n') *(command+i)=';';
-++ }
-+  
-+  /*
-+   * 'make_bsd()' - Make a FreeBSD software distribution package.
-+***************
-+*** 149,156 ****
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+--- 156,172 ----
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+! #ifdef __FreeBSD__
-+!     if (d->type == DEPEND_REQUIRES) {
-+!       if (dist->relnumber)
-+! 	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+!       else
-+! 	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+!     }
-+! #else
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+! #endif
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+***************
-+*** 179,187 ****
-+--- 196,206 ----
-+  	        "         by the BSD packager.\n", stderr);
-+            break;
-+        case COMMAND_POST_INSTALL :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@exec %s\n", c->command);
-+  	  break;
-+        case COMMAND_PRE_REMOVE :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@unexec %s\n", c->command);
-+  	  break;
-+        case COMMAND_POST_REMOVE :
-+***************
-+*** 199,205 ****
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+--- 218,224 ----
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+*** misc/epm-3.7/qprintf.c	Tue Jan 28 06:48:03 2003
-+--- misc/build/epm-3.7/qprintf.c	Thu Jan 19 17:04:22 2006
-+***************
-+*** 181,192 ****
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! 
-+  	      putc(*s, fp);
-+  	    }
-+  
-+--- 181,199 ----
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-++ #if defined(__FreeBSD__)
-++ 	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-++ 	      {
-++ 	        putc('\\', fp);
-++ 		bytes ++;
-++ 	      }
-++ #else
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! #endif
-+  	      putc(*s, fp);
-+  	    }
-+  

Property changes on: head/editors/openoffice.org-2/files/patch-epm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-2/files/patch-np_sdk
===================================================================
--- head/editors/openoffice.org-2/files/patch-np_sdk	(revision 156712)
+++ head/editors/openoffice.org-2/files/patch-np_sdk	(nonexistent)
@@ -1,15 +0,0 @@
-Index: np_sdk/mozsrc/makefile.mk
-===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 makefile.mk
---- np_sdk/mozsrc/makefile.mk	10 Feb 2006 14:06:33 -0000	1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk	15 Feb 2006 13:47:31 -0000
-@@ -41,7 +41,6 @@
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
--SOLARINC=
- JDKINCS=
- 
- # --- Files --------------------------------------------------------

Property changes on: head/editors/openoffice.org-2/files/patch-np_sdk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/Makefile
===================================================================
--- head/editors/openoffice.org-2-RC/Makefile	(revision 156712)
+++ head/editors/openoffice.org-2-RC/Makefile	(revision 156713)
@@ -1,240 +1,240 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2.rc1
+PORTVERSION?=	2.0.2.rc2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.2rc1_src.tar.gz
+DISTFILES+=	OOo_2.0.2rc2_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.2rc1_src.tar.gz
+EXTRACT_ONLY=	OOo_2.0.2rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m1
+OOOTAG?=		OOB680_m2
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
 #BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
 BROKEN=	"still work in progress"
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
 CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	${LOCALBASE}/gcc41/bin/gcc
 CXX=	${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
 .endif
 .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
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2-RC/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.221
\ No newline at end of property
+1.222
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/distinfo
===================================================================
--- head/editors/openoffice.org-2-RC/distinfo	(revision 156712)
+++ head/editors/openoffice.org-2-RC/distinfo	(revision 156713)
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1
+SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda
+SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
 SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
 SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 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

Property changes on: head/editors/openoffice.org-2-RC/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.82
\ No newline at end of property
+1.83
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/files/patch-epm
===================================================================
--- head/editors/openoffice.org-2-RC/files/patch-epm	(revision 156712)
+++ head/editors/openoffice.org-2-RC/files/patch-epm	(nonexistent)
@@ -1,124 +0,0 @@
-Index: epm/epm-3.7.patch
-===================================================================
-RCS file: /cvs/external/epm/epm-3.7.patch,v
-retrieving revision 1.8
-diff -u -r1.8 epm-3.7.patch
---- epm/epm-3.7.patch	3 Feb 2006 17:32:08 -0000	1.8
-+++ epm/epm-3.7.patch	11 Feb 2006 09:28:33 -0000
-@@ -546,3 +546,116 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
-+--- misc/build/epm-3.7/bsd.c	Thu Jan 19 17:05:43 2006
-+***************
-+*** 26,31 ****
-+--- 26,38 ----
-+  
-+  #include "epm.h"
-+  
-++ void cr2semicolon(char *command)
-++ {
-++   int len, i;
-++   len=strlen(command);
-++   for (i=0;i<len;i++)
-++     if(*(command+i)=='\n') *(command+i)=';';
-++ }
-+  
-+  /*
-+   * 'make_bsd()' - Make a FreeBSD software distribution package.
-+***************
-+*** 149,156 ****
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+--- 156,172 ----
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+! #ifdef __FreeBSD__
-+!     if (d->type == DEPEND_REQUIRES) {
-+!       if (dist->relnumber)
-+! 	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+!       else
-+! 	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+!     }
-+! #else
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+! #endif
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+***************
-+*** 179,187 ****
-+--- 196,206 ----
-+  	        "         by the BSD packager.\n", stderr);
-+            break;
-+        case COMMAND_POST_INSTALL :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@exec %s\n", c->command);
-+  	  break;
-+        case COMMAND_PRE_REMOVE :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@unexec %s\n", c->command);
-+  	  break;
-+        case COMMAND_POST_REMOVE :
-+***************
-+*** 199,205 ****
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+--- 218,224 ----
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+*** misc/epm-3.7/qprintf.c	Tue Jan 28 06:48:03 2003
-+--- misc/build/epm-3.7/qprintf.c	Thu Jan 19 17:04:22 2006
-+***************
-+*** 181,192 ****
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! 
-+  	      putc(*s, fp);
-+  	    }
-+  
-+--- 181,199 ----
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-++ #if defined(__FreeBSD__)
-++ 	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-++ 	      {
-++ 	        putc('\\', fp);
-++ 		bytes ++;
-++ 	      }
-++ #else
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! #endif
-+  	      putc(*s, fp);
-+  	    }
-+  

Property changes on: head/editors/openoffice.org-2-RC/files/patch-epm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-2-RC/files/patch-np_sdk
===================================================================
--- head/editors/openoffice.org-2-RC/files/patch-np_sdk	(revision 156712)
+++ head/editors/openoffice.org-2-RC/files/patch-np_sdk	(nonexistent)
@@ -1,15 +0,0 @@
-Index: np_sdk/mozsrc/makefile.mk
-===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 makefile.mk
---- np_sdk/mozsrc/makefile.mk	10 Feb 2006 14:06:33 -0000	1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk	15 Feb 2006 13:47:31 -0000
-@@ -41,7 +41,6 @@
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
--SOLARINC=
- JDKINCS=
- 
- # --- Files --------------------------------------------------------

Property changes on: head/editors/openoffice.org-2-RC/files/patch-np_sdk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/Makefile
===================================================================
--- head/editors/openoffice.org-2.0/Makefile	(revision 156712)
+++ head/editors/openoffice.org-2.0/Makefile	(revision 156713)
@@ -1,240 +1,240 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2.rc1
+PORTVERSION?=	2.0.2.rc2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.2rc1_src.tar.gz
+DISTFILES+=	OOo_2.0.2rc2_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.2rc1_src.tar.gz
+EXTRACT_ONLY=	OOo_2.0.2rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m1
+OOOTAG?=		OOB680_m2
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
 #BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
 BROKEN=	"still work in progress"
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
 CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	${LOCALBASE}/gcc41/bin/gcc
 CXX=	${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
 .endif
 .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
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-2.0/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.221
\ No newline at end of property
+1.222
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/distinfo
===================================================================
--- head/editors/openoffice.org-2.0/distinfo	(revision 156712)
+++ head/editors/openoffice.org-2.0/distinfo	(revision 156713)
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1
+SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda
+SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
 SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
 SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 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

Property changes on: head/editors/openoffice.org-2.0/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.82
\ No newline at end of property
+1.83
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/files/patch-epm
===================================================================
--- head/editors/openoffice.org-2.0/files/patch-epm	(revision 156712)
+++ head/editors/openoffice.org-2.0/files/patch-epm	(nonexistent)
@@ -1,124 +0,0 @@
-Index: epm/epm-3.7.patch
-===================================================================
-RCS file: /cvs/external/epm/epm-3.7.patch,v
-retrieving revision 1.8
-diff -u -r1.8 epm-3.7.patch
---- epm/epm-3.7.patch	3 Feb 2006 17:32:08 -0000	1.8
-+++ epm/epm-3.7.patch	11 Feb 2006 09:28:33 -0000
-@@ -546,3 +546,116 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
-+--- misc/build/epm-3.7/bsd.c	Thu Jan 19 17:05:43 2006
-+***************
-+*** 26,31 ****
-+--- 26,38 ----
-+  
-+  #include "epm.h"
-+  
-++ void cr2semicolon(char *command)
-++ {
-++   int len, i;
-++   len=strlen(command);
-++   for (i=0;i<len;i++)
-++     if(*(command+i)=='\n') *(command+i)=';';
-++ }
-+  
-+  /*
-+   * 'make_bsd()' - Make a FreeBSD software distribution package.
-+***************
-+*** 149,156 ****
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+--- 156,172 ----
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+! #ifdef __FreeBSD__
-+!     if (d->type == DEPEND_REQUIRES) {
-+!       if (dist->relnumber)
-+! 	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+!       else
-+! 	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+!     }
-+! #else
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+! #endif
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+***************
-+*** 179,187 ****
-+--- 196,206 ----
-+  	        "         by the BSD packager.\n", stderr);
-+            break;
-+        case COMMAND_POST_INSTALL :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@exec %s\n", c->command);
-+  	  break;
-+        case COMMAND_PRE_REMOVE :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@unexec %s\n", c->command);
-+  	  break;
-+        case COMMAND_POST_REMOVE :
-+***************
-+*** 199,205 ****
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+--- 218,224 ----
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+*** misc/epm-3.7/qprintf.c	Tue Jan 28 06:48:03 2003
-+--- misc/build/epm-3.7/qprintf.c	Thu Jan 19 17:04:22 2006
-+***************
-+*** 181,192 ****
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! 
-+  	      putc(*s, fp);
-+  	    }
-+  
-+--- 181,199 ----
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-++ #if defined(__FreeBSD__)
-++ 	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-++ 	      {
-++ 	        putc('\\', fp);
-++ 		bytes ++;
-++ 	      }
-++ #else
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! #endif
-+  	      putc(*s, fp);
-+  	    }
-+  

Property changes on: head/editors/openoffice.org-2.0/files/patch-epm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-2.0/files/patch-np_sdk
===================================================================
--- head/editors/openoffice.org-2.0/files/patch-np_sdk	(revision 156712)
+++ head/editors/openoffice.org-2.0/files/patch-np_sdk	(nonexistent)
@@ -1,15 +0,0 @@
-Index: np_sdk/mozsrc/makefile.mk
-===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 makefile.mk
---- np_sdk/mozsrc/makefile.mk	10 Feb 2006 14:06:33 -0000	1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk	15 Feb 2006 13:47:31 -0000
-@@ -41,7 +41,6 @@
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
--SOLARINC=
- JDKINCS=
- 
- # --- Files --------------------------------------------------------

Property changes on: head/editors/openoffice.org-2.0/files/patch-np_sdk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-3/Makefile
===================================================================
--- head/editors/openoffice.org-3/Makefile	(revision 156712)
+++ head/editors/openoffice.org-3/Makefile	(revision 156713)
@@ -1,240 +1,240 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2.rc1
+PORTVERSION?=	2.0.2.rc2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.2rc1_src.tar.gz
+DISTFILES+=	OOo_2.0.2rc2_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.2rc1_src.tar.gz
+EXTRACT_ONLY=	OOo_2.0.2rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m1
+OOOTAG?=		OOB680_m2
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
 #BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
 BROKEN=	"still work in progress"
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
 CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	${LOCALBASE}/gcc41/bin/gcc
 CXX=	${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
 .endif
 .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
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.221
\ No newline at end of property
+1.222
\ No newline at end of property
Index: head/editors/openoffice.org-3/distinfo
===================================================================
--- head/editors/openoffice.org-3/distinfo	(revision 156712)
+++ head/editors/openoffice.org-3/distinfo	(revision 156713)
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1
+SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda
+SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
 SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
 SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 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

Property changes on: head/editors/openoffice.org-3/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.82
\ No newline at end of property
+1.83
\ No newline at end of property
Index: head/editors/openoffice.org-3/files/patch-epm
===================================================================
--- head/editors/openoffice.org-3/files/patch-epm	(revision 156712)
+++ head/editors/openoffice.org-3/files/patch-epm	(nonexistent)
@@ -1,124 +0,0 @@
-Index: epm/epm-3.7.patch
-===================================================================
-RCS file: /cvs/external/epm/epm-3.7.patch,v
-retrieving revision 1.8
-diff -u -r1.8 epm-3.7.patch
---- epm/epm-3.7.patch	3 Feb 2006 17:32:08 -0000	1.8
-+++ epm/epm-3.7.patch	11 Feb 2006 09:28:33 -0000
-@@ -546,3 +546,116 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
-+--- misc/build/epm-3.7/bsd.c	Thu Jan 19 17:05:43 2006
-+***************
-+*** 26,31 ****
-+--- 26,38 ----
-+  
-+  #include "epm.h"
-+  
-++ void cr2semicolon(char *command)
-++ {
-++   int len, i;
-++   len=strlen(command);
-++   for (i=0;i<len;i++)
-++     if(*(command+i)=='\n') *(command+i)=';';
-++ }
-+  
-+  /*
-+   * 'make_bsd()' - Make a FreeBSD software distribution package.
-+***************
-+*** 149,156 ****
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+--- 156,172 ----
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+! #ifdef __FreeBSD__
-+!     if (d->type == DEPEND_REQUIRES) {
-+!       if (dist->relnumber)
-+! 	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+!       else
-+! 	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+!     }
-+! #else
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+! #endif
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+***************
-+*** 179,187 ****
-+--- 196,206 ----
-+  	        "         by the BSD packager.\n", stderr);
-+            break;
-+        case COMMAND_POST_INSTALL :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@exec %s\n", c->command);
-+  	  break;
-+        case COMMAND_PRE_REMOVE :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@unexec %s\n", c->command);
-+  	  break;
-+        case COMMAND_POST_REMOVE :
-+***************
-+*** 199,205 ****
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+--- 218,224 ----
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+*** misc/epm-3.7/qprintf.c	Tue Jan 28 06:48:03 2003
-+--- misc/build/epm-3.7/qprintf.c	Thu Jan 19 17:04:22 2006
-+***************
-+*** 181,192 ****
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! 
-+  	      putc(*s, fp);
-+  	    }
-+  
-+--- 181,199 ----
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-++ #if defined(__FreeBSD__)
-++ 	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-++ 	      {
-++ 	        putc('\\', fp);
-++ 		bytes ++;
-++ 	      }
-++ #else
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! #endif
-+  	      putc(*s, fp);
-+  	    }
-+  

Property changes on: head/editors/openoffice.org-3/files/patch-epm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-3/files/patch-np_sdk
===================================================================
--- head/editors/openoffice.org-3/files/patch-np_sdk	(revision 156712)
+++ head/editors/openoffice.org-3/files/patch-np_sdk	(nonexistent)
@@ -1,15 +0,0 @@
-Index: np_sdk/mozsrc/makefile.mk
-===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 makefile.mk
---- np_sdk/mozsrc/makefile.mk	10 Feb 2006 14:06:33 -0000	1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk	15 Feb 2006 13:47:31 -0000
-@@ -41,7 +41,6 @@
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
--SOLARINC=
- JDKINCS=
- 
- # --- Files --------------------------------------------------------

Property changes on: head/editors/openoffice.org-3/files/patch-np_sdk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/Makefile
===================================================================
--- head/editors/openoffice.org-3-RC/Makefile	(revision 156712)
+++ head/editors/openoffice.org-3-RC/Makefile	(revision 156713)
@@ -1,240 +1,240 @@
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2.rc1
+PORTVERSION?=	2.0.2.rc2
 CATEGORIES+=	editors java
 MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
 		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.2rc1_src.tar.gz
+DISTFILES+=	OOo_2.0.2rc2_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_2.0.2rc1_src.tar.gz
+EXTRACT_ONLY=	OOo_2.0.2rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 JAVA_VENDOR=	bsdjava
 .endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m1
+OOOTAG?=		OOB680_m2
 INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
 .if defined(LANG_PKGNAME)
 PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 .endif
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
 #BUILD_DEPENDS+=	${LOCALBASE}/bin/gcc41:${PORTSDIR}/lang/gcc41-wgcj
 BROKEN=	"still work in progress"
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
 
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 .if defined(WITH_GNUGCJ)
 CC=	ccache ${LOCALBASE}/gcc41/bin/gcc
 CXX=	ccache ${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	ccache gcc-ooo
 CXX=	ccache g++-ooo
 .endif #WITH_GNUGCJ
 .endif #WITH_CCACHE
 .if !defined(WITH_CCACHE)
 .if defined(WITH_GNUGCJ)
 CC=	${LOCALBASE}/gcc41/bin/gcc
 CXX=	${LOCALBASE}/gcc41/bin/g++
 .else
 CC=	gcc-ooo
 CXX=	g++-ooo
 .endif #WITH_GNUGCJ
 .endif #!WITH_CCACHE
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .else
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 .if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
 
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches
 .endif
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
 
 .include <${FILESDIR}/Makefile.knobs>
 
 pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
 	@${RM} -f ${WRKDIR}/.PLIST*
 	@${RM} -f ${WRKDIR}/.install_done.*
 	@${RM} -f ${WRKDIR}/.package_done.*
 	@${RM} -f ${WRKDIR}/.extract_done.*
 	@${RM} -f ${WRKDIR}/.patch_done.*
 	@${RM} -f ${WRKDIR}/.configure_done.*
 	@${RM} -f ${WRKDIR}/.build_done.*
 	@${TOUCH} ${EXTRACT_COOKIE}
 	@${TOUCH} ${PATCH_COOKIE}
 	@${TOUCH} ${CONFIGURE_COOKIE}
 	@${TOUCH} ${BUILD_COOKIE}
 .endif
 
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
 .endif
 .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
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
 	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
 		${PREFIX}/bin/${EXECBASE}
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp
 	@${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <${FILESDIR}/Makefile.others>
 .include <bsd.port.post.mk>

Property changes on: head/editors/openoffice.org-3-RC/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.221
\ No newline at end of property
+1.222
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/distinfo
===================================================================
--- head/editors/openoffice.org-3-RC/distinfo	(revision 156712)
+++ head/editors/openoffice.org-3-RC/distinfo	(revision 156713)
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1
+SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda
+SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 26031ee1a2fd248ad0cc2e7f17c44c39
 SHA256 (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = d463b8259cb199cd26799c817756c73e4e7808b0cf915f86841ac9779e0f9936
 SIZE (openoffice.org2.0/apache-ant-1.6.5-bin.tar.bz2) = 6743024
 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

Property changes on: head/editors/openoffice.org-3-RC/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.82
\ No newline at end of property
+1.83
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/files/patch-epm
===================================================================
--- head/editors/openoffice.org-3-RC/files/patch-epm	(revision 156712)
+++ head/editors/openoffice.org-3-RC/files/patch-epm	(nonexistent)
@@ -1,124 +0,0 @@
-Index: epm/epm-3.7.patch
-===================================================================
-RCS file: /cvs/external/epm/epm-3.7.patch,v
-retrieving revision 1.8
-diff -u -r1.8 epm-3.7.patch
---- epm/epm-3.7.patch	3 Feb 2006 17:32:08 -0000	1.8
-+++ epm/epm-3.7.patch	11 Feb 2006 09:28:33 -0000
-@@ -546,3 +546,116 @@
-   }
-   
- --- 457,462 ----
-+*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
-+--- misc/build/epm-3.7/bsd.c	Thu Jan 19 17:05:43 2006
-+***************
-+*** 26,31 ****
-+--- 26,38 ----
-+  
-+  #include "epm.h"
-+  
-++ void cr2semicolon(char *command)
-++ {
-++   int len, i;
-++   len=strlen(command);
-++   for (i=0;i<len;i++)
-++     if(*(command+i)=='\n') *(command+i)=';';
-++ }
-+  
-+  /*
-+   * 'make_bsd()' - Make a FreeBSD software distribution package.
-+***************
-+*** 149,156 ****
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+--- 156,172 ----
-+  
-+    for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-+    {
-+! #ifdef __FreeBSD__
-+!     if (d->type == DEPEND_REQUIRES) {
-+!       if (dist->relnumber)
-+! 	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+!       else
-+! 	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+!     }
-+! #else
-+!     if (d->type == DEPEND_REQUIRES)
-+!       fprintf(fp, "@pkgdep %s", d->product);
-+! #endif
-+      else
-+  #ifdef __FreeBSD__
-+       /*
-+***************
-+*** 179,187 ****
-+--- 196,206 ----
-+  	        "         by the BSD packager.\n", stderr);
-+            break;
-+        case COMMAND_POST_INSTALL :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@exec %s\n", c->command);
-+  	  break;
-+        case COMMAND_PRE_REMOVE :
-++       cr2semicolon(c->command);
-+            fprintf(fp, "@unexec %s\n", c->command);
-+  	  break;
-+        case COMMAND_POST_REMOVE :
-+***************
-+*** 199,205 ****
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+--- 218,224 ----
-+        */
-+  
-+        fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
-+!       fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-+                file->dst);
-+        fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-+      }
-+*** misc/epm-3.7/qprintf.c	Tue Jan 28 06:48:03 2003
-+--- misc/build/epm-3.7/qprintf.c	Thu Jan 19 17:04:22 2006
-+***************
-+*** 181,192 ****
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! 
-+  	      putc(*s, fp);
-+  	    }
-+  
-+--- 181,199 ----
-+  
-+              for (i = slen; i > 0; i --, s ++, bytes ++)
-+  	    {
-++ #if defined(__FreeBSD__)
-++ 	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-++ 	      {
-++ 	        putc('\\', fp);
-++ 		bytes ++;
-++ 	      }
-++ #else
-+  	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
-+  	      {
-+  	        putc('\\', fp);
-+  		bytes ++;
-+  	      }
-+! #endif
-+  	      putc(*s, fp);
-+  	    }
-+  

Property changes on: head/editors/openoffice.org-3-RC/files/patch-epm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/editors/openoffice.org-3-RC/files/patch-np_sdk
===================================================================
--- head/editors/openoffice.org-3-RC/files/patch-np_sdk	(revision 156712)
+++ head/editors/openoffice.org-3-RC/files/patch-np_sdk	(nonexistent)
@@ -1,15 +0,0 @@
-Index: np_sdk/mozsrc/makefile.mk
-===================================================================
-RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 makefile.mk
---- np_sdk/mozsrc/makefile.mk	10 Feb 2006 14:06:33 -0000	1.2.2.1
-+++ np_sdk/mozsrc/makefile.mk	15 Feb 2006 13:47:31 -0000
-@@ -41,7 +41,6 @@
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
--SOLARINC=
- JDKINCS=
- 
- # --- Files --------------------------------------------------------

Property changes on: head/editors/openoffice.org-3-RC/files/patch-np_sdk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property