15 files changed, 670 insertions, 50 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index d1de2d1a680c..29119ca8c3a7 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -8,20 +8,21 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
+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_${OOOTAG}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOTAG}_source${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -39,7 +40,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -63,9 +63,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		155
+MILESTONE?=		156
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060203
+SNAPDATE=		20060211
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -131,7 +131,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 5f814dd0406e..d9e94a17ad36 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
-SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
-SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
+MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
+SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
+SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3-devel/files/patch-epm b/editors/openoffice-3-devel/files/patch-epm
new file mode 100644
index 000000000000..8808325b529d
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-epm
@@ -0,0 +1,124 @@
+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);
++  	    }
++  
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index d1de2d1a680c..29119ca8c3a7 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -8,20 +8,21 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
+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_${OOOTAG}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOTAG}_source${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -39,7 +40,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -63,9 +63,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		155
+MILESTONE?=		156
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060203
+SNAPDATE=		20060211
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -131,7 +131,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 5f814dd0406e..d9e94a17ad36 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
-SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
-SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
+MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
+SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
+SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-devel/files/patch-epm b/editors/openoffice.org-2-devel/files/patch-epm
new file mode 100644
index 000000000000..8808325b529d
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-epm
@@ -0,0 +1,124 @@
+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);
++  	    }
++  
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index d1de2d1a680c..29119ca8c3a7 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -8,20 +8,21 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
+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_${OOOTAG}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOTAG}_source${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -39,7 +40,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -63,9 +63,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		155
+MILESTONE?=		156
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060203
+SNAPDATE=		20060211
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -131,7 +131,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 5f814dd0406e..d9e94a17ad36 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
-SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
-SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
+MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
+SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
+SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0-devel/files/patch-epm b/editors/openoffice.org-2.0-devel/files/patch-epm
new file mode 100644
index 000000000000..8808325b529d
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-epm
@@ -0,0 +1,124 @@
+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);
++  	    }
++  
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index d1de2d1a680c..29119ca8c3a7 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -8,20 +8,21 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
+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_${OOOTAG}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOTAG}_source${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -39,7 +40,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -63,9 +63,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		155
+MILESTONE?=		156
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060203
+SNAPDATE=		20060211
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -131,7 +131,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 5f814dd0406e..d9e94a17ad36 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
-SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
-SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
+MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
+SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
+SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-devel/files/patch-epm b/editors/openoffice.org-3-devel/files/patch-epm
new file mode 100644
index 000000000000..8808325b529d
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-epm
@@ -0,0 +1,124 @@
+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);
++  	    }
++  
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index d1de2d1a680c..29119ca8c3a7 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -8,20 +8,21 @@
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.0.${SNAPDATE}
 CATEGORIES+=	editors java
-MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
+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_${OOOTAG}_source${EXTRACT_SUFX}
+DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOTAG}_source${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -39,7 +40,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -63,9 +63,9 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		155
+MILESTONE?=		156
 OOOTAG?=		SRC680_m${MILESTONE}
-SNAPDATE=		20060203
+SNAPDATE=		20060211
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -131,7 +131,7 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 5f814dd0406e..d9e94a17ad36 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = b8a712737bb146baf1ebb00c88ed3dc3
-SHA256 (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 80b481f8815f7bc9263d9544f1a0326abeb61de7349e4947614a5e72e49c4b0b
-SIZE (openoffice.org2.0/OOo_SRC680_m155_source.tar.bz2) = 235716251
+MD5 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
+SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
+SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-vcltesttool/files/patch-epm b/editors/openoffice.org-vcltesttool/files/patch-epm
new file mode 100644
index 000000000000..8808325b529d
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-epm
@@ -0,0 +1,124 @@
+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);
++  	    }
++