update to 2.0beta2

3 files changed, 8 insertions, 10 deletions

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
 --------------------------------------------------