update to 2.0beta2

30 files changed, 126 insertions, 156 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index b92cfb55f21f..f30984fbb41f 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openoffice
-PORTVERSION=	2.0.${SNAPDATE}
+PORTNAME=	openoffice.org
+PORTVERSION=	2.0.beta2
 CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/2.0beta2rc/&,}  \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_2.0beta2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0beta2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -30,7 +30,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -53,14 +52,12 @@ IGNORE=		Install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-RELEASE_NR=		1.9
-MILESTONE=		126
-SNAPDATE=		20050827
-INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
+RELEASE_NR=		2.0
+INSTALLATION_BASEDIR=	openoffice.org${PORTVERSION}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -114,8 +111,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=      259 #workaround:bad config_office/configure of m126
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_2.0beta2
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -181,6 +177,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index dbd3fe7fa55d..4a8b4739fae4 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2
-SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706
+MD5 (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 84c2b085756184c27b2734ffaf7ee6ef
+SIZE (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 272613504
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
index 6d2e83591f43..2202f8265b00 100644
--- a/editors/openoffice-3/files/generate.pl
+++ b/editors/openoffice-3/files/generate.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -20,4 +19,3 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice-3/files/openoffice.org-wrapper b/editors/openoffice-3/files/openoffice.org-wrapper
index 993f8d362998..3fd40fcd0110 100644
--- a/editors/openoffice-3/files/openoffice.org-wrapper
+++ b/editors/openoffice-3/files/openoffice.org-wrapper
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/Attic/openoffice.org-wrapper,v 1.2 2005-08-29 01:06:13 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'`
+program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in
index ce2dd40c131e..7046934ee3f2 100644
--- a/editors/openoffice-3/files/pkg-message.in
+++ b/editors/openoffice-3/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
+The setup installs a ".openoffice.org2" folder
 in your homedir.
 
 2. Starting OO.org
@@ -39,8 +39,8 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
-Redo the user installation and the problems should go away.
+".openoffice.org2" dir in your homedir. Redo the user
+installation and the problems should go away.
 
 4. Known issue
 --------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index b92cfb55f21f..f30984fbb41f 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openoffice
-PORTVERSION=	2.0.${SNAPDATE}
+PORTNAME=	openoffice.org
+PORTVERSION=	2.0.beta2
 CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/2.0beta2rc/&,}  \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_2.0beta2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0beta2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -30,7 +30,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -53,14 +52,12 @@ IGNORE=		Install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-RELEASE_NR=		1.9
-MILESTONE=		126
-SNAPDATE=		20050827
-INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
+RELEASE_NR=		2.0
+INSTALLATION_BASEDIR=	openoffice.org${PORTVERSION}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -114,8 +111,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=      259 #workaround:bad config_office/configure of m126
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_2.0beta2
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -181,6 +177,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index dbd3fe7fa55d..4a8b4739fae4 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2
-SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706
+MD5 (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 84c2b085756184c27b2734ffaf7ee6ef
+SIZE (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 272613504
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-RC/files/generate.pl b/editors/openoffice.org-2-RC/files/generate.pl
index 76119dfba92a..11b9c75d169e 100644
--- a/editors/openoffice.org-2-RC/files/generate.pl
+++ b/editors/openoffice.org-2-RC/files/generate.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -20,4 +19,3 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice.org-2-RC/files/openoffice.org-wrapper b/editors/openoffice.org-2-RC/files/openoffice.org-wrapper
index d32d4421b264..b5531319f797 100644
--- a/editors/openoffice.org-2-RC/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-2-RC/files/openoffice.org-wrapper
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice.org-wrapper,v 1.2 2005-08-29 01:06:13 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'`
+program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-2-RC/files/pkg-message.in b/editors/openoffice.org-2-RC/files/pkg-message.in
index ce2dd40c131e..7046934ee3f2 100644
--- a/editors/openoffice.org-2-RC/files/pkg-message.in
+++ b/editors/openoffice.org-2-RC/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
+The setup installs a ".openoffice.org2" folder
 in your homedir.
 
 2. Starting OO.org
@@ -39,8 +39,8 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
-Redo the user installation and the problems should go away.
+".openoffice.org2" dir in your homedir. Redo the user
+installation and the problems should go away.
 
 4. Known issue
 --------------------------------------------------
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index b92cfb55f21f..f30984fbb41f 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openoffice
-PORTVERSION=	2.0.${SNAPDATE}
+PORTNAME=	openoffice.org
+PORTVERSION=	2.0.beta2
 CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/2.0beta2rc/&,}  \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_2.0beta2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0beta2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -30,7 +30,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -53,14 +52,12 @@ IGNORE=		Install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-RELEASE_NR=		1.9
-MILESTONE=		126
-SNAPDATE=		20050827
-INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
+RELEASE_NR=		2.0
+INSTALLATION_BASEDIR=	openoffice.org${PORTVERSION}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -114,8 +111,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=      259 #workaround:bad config_office/configure of m126
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_2.0beta2
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -181,6 +177,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index dbd3fe7fa55d..4a8b4739fae4 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2
-SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706
+MD5 (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 84c2b085756184c27b2734ffaf7ee6ef
+SIZE (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 272613504
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0/files/generate.pl b/editors/openoffice.org-2.0/files/generate.pl
index 2cbbc4e47576..605a1edcaaf0 100644
--- a/editors/openoffice.org-2.0/files/generate.pl
+++ b/editors/openoffice.org-2.0/files/generate.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -20,4 +19,3 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice.org-2.0/files/openoffice.org-wrapper b/editors/openoffice.org-2.0/files/openoffice.org-wrapper
index 592523c216e9..8c761792bb45 100644
--- a/editors/openoffice.org-2.0/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-2.0/files/openoffice.org-wrapper
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice.org-wrapper,v 1.2 2005-08-29 01:06:13 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'`
+program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-2.0/files/pkg-message.in b/editors/openoffice.org-2.0/files/pkg-message.in
index ce2dd40c131e..7046934ee3f2 100644
--- a/editors/openoffice.org-2.0/files/pkg-message.in
+++ b/editors/openoffice.org-2.0/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
+The setup installs a ".openoffice.org2" folder
 in your homedir.
 
 2. Starting OO.org
@@ -39,8 +39,8 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
-Redo the user installation and the problems should go away.
+".openoffice.org2" dir in your homedir. Redo the user
+installation and the problems should go away.
 
 4. Known issue
 --------------------------------------------------
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index b92cfb55f21f..f30984fbb41f 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openoffice
-PORTVERSION=	2.0.${SNAPDATE}
+PORTNAME=	openoffice.org
+PORTVERSION=	2.0.beta2
 CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/2.0beta2rc/&,}  \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_2.0beta2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0beta2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -30,7 +30,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -53,14 +52,12 @@ IGNORE=		Install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-RELEASE_NR=		1.9
-MILESTONE=		126
-SNAPDATE=		20050827
-INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
+RELEASE_NR=		2.0
+INSTALLATION_BASEDIR=	openoffice.org${PORTVERSION}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -114,8 +111,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=      259 #workaround:bad config_office/configure of m126
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_2.0beta2
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -181,6 +177,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index dbd3fe7fa55d..4a8b4739fae4 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2
-SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706
+MD5 (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 84c2b085756184c27b2734ffaf7ee6ef
+SIZE (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 272613504
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2/files/generate.pl b/editors/openoffice.org-2/files/generate.pl
index 0747e60cc00e..ff4ebc247121 100644
--- a/editors/openoffice.org-2/files/generate.pl
+++ b/editors/openoffice.org-2/files/generate.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -20,4 +19,3 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice.org-2/files/openoffice.org-wrapper b/editors/openoffice.org-2/files/openoffice.org-wrapper
index 9a8be83a9c8a..7bd4089e2b5a 100644
--- a/editors/openoffice.org-2/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-2/files/openoffice.org-wrapper
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice.org-wrapper,v 1.2 2005-08-29 01:06:13 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'`
+program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-2/files/pkg-message.in b/editors/openoffice.org-2/files/pkg-message.in
index ce2dd40c131e..7046934ee3f2 100644
--- a/editors/openoffice.org-2/files/pkg-message.in
+++ b/editors/openoffice.org-2/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
+The setup installs a ".openoffice.org2" folder
 in your homedir.
 
 2. Starting OO.org
@@ -39,8 +39,8 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
-Redo the user installation and the problems should go away.
+".openoffice.org2" dir in your homedir. Redo the user
+installation and the problems should go away.
 
 4. Known issue
 --------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index b92cfb55f21f..f30984fbb41f 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openoffice
-PORTVERSION=	2.0.${SNAPDATE}
+PORTNAME=	openoffice.org
+PORTVERSION=	2.0.beta2
 CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/2.0beta2rc/&,}  \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_2.0beta2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0beta2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -30,7 +30,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -53,14 +52,12 @@ IGNORE=		Install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-RELEASE_NR=		1.9
-MILESTONE=		126
-SNAPDATE=		20050827
-INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
+RELEASE_NR=		2.0
+INSTALLATION_BASEDIR=	openoffice.org${PORTVERSION}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -114,8 +111,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=      259 #workaround:bad config_office/configure of m126
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_2.0beta2
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -181,6 +177,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index dbd3fe7fa55d..4a8b4739fae4 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2
-SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706
+MD5 (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 84c2b085756184c27b2734ffaf7ee6ef
+SIZE (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 272613504
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-RC/files/generate.pl b/editors/openoffice.org-3-RC/files/generate.pl
index d3d65337062a..99bb6bbd330b 100644
--- a/editors/openoffice.org-3-RC/files/generate.pl
+++ b/editors/openoffice.org-3-RC/files/generate.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -20,4 +19,3 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice.org-3-RC/files/openoffice.org-wrapper b/editors/openoffice.org-3-RC/files/openoffice.org-wrapper
index 6ab393c5fdf3..9357585b5078 100644
--- a/editors/openoffice.org-3-RC/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-3-RC/files/openoffice.org-wrapper
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice.org-wrapper,v 1.2 2005-08-29 01:06:13 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'`
+program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-3-RC/files/pkg-message.in b/editors/openoffice.org-3-RC/files/pkg-message.in
index ce2dd40c131e..7046934ee3f2 100644
--- a/editors/openoffice.org-3-RC/files/pkg-message.in
+++ b/editors/openoffice.org-3-RC/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
+The setup installs a ".openoffice.org2" folder
 in your homedir.
 
 2. Starting OO.org
@@ -39,8 +39,8 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
-Redo the user installation and the problems should go away.
+".openoffice.org2" dir in your homedir. Redo the user
+installation and the problems should go away.
 
 4. Known issue
 --------------------------------------------------
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index b92cfb55f21f..f30984fbb41f 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openoffice
-PORTVERSION=	2.0.${SNAPDATE}
+PORTNAME=	openoffice.org
+PORTVERSION=	2.0.beta2
 CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/2.0beta2rc/&,}  \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_2.0beta2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0beta2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -30,7 +30,6 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=        3
 .endif
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
@@ -53,14 +52,12 @@ IGNORE=		Install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-RELEASE_NR=		1.9
-MILESTONE=		126
-SNAPDATE=		20050827
-INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
-EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
+RELEASE_NR=		2.0
+INSTALLATION_BASEDIR=	openoffice.org${PORTVERSION}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -114,8 +111,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=      259 #workaround:bad config_office/configure of m126
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_2.0beta2
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -181,6 +177,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
+			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index dbd3fe7fa55d..4a8b4739fae4 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 4457e89d911a69417d294fb45e1304e2
-SIZE (openoffice.org2.0/OOo_1.9m126_source.tar.bz2) = 224938706
+MD5 (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 84c2b085756184c27b2734ffaf7ee6ef
+SIZE (openoffice.org2.0/OOo_2.0beta2_src.tar.gz) = 272613504
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3/files/generate.pl b/editors/openoffice.org-3/files/generate.pl
index 0a832e02e905..38c143b5f533 100644
--- a/editors/openoffice.org-3/files/generate.pl
+++ b/editors/openoffice.org-3/files/generate.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -20,4 +19,3 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice.org-3/files/openoffice.org-wrapper b/editors/openoffice.org-3/files/openoffice.org-wrapper
index c09d57f0acc4..178a6f7ae492 100644
--- a/editors/openoffice.org-3/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-3/files/openoffice.org-wrapper
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice.org-wrapper,v 1.2 2005-08-29 01:06:13 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'`
+program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-3/files/pkg-message.in b/editors/openoffice.org-3/files/pkg-message.in
index ce2dd40c131e..7046934ee3f2 100644
--- a/editors/openoffice.org-3/files/pkg-message.in
+++ b/editors/openoffice.org-3/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To
+OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
+OpenOffice.org %%RELEASE_NR%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
+The setup installs a ".openoffice.org2" folder
 in your homedir.
 
 2. Starting OO.org
@@ -39,8 +39,8 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir.
-Redo the user installation and the problems should go away.
+".openoffice.org2" dir in your homedir. Redo the user
+installation and the problems should go away.
 
 4. Known issue
 --------------------------------------------------