Better handling of PORTVERSION. version number of

ooo-build and openoffice.org-2.0 can be different.

12 files changed, 66 insertions, 66 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 5b7825537414..025f0f29a1f1 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2
+PORTVERSION?=	${OOOVERSION}
 CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
 		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_${PORTVERSION}_src.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_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_${PORTVERSION}_src.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
+OOOVERSION=	2.0.2
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -42,7 +43,6 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -64,11 +64,11 @@ IGNORE=		install lang/perl5.8 then try again
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
-INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
-EXECBASE?=		openoffice.org-${PORTVERSION}
+INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
+EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -222,7 +222,7 @@ post-install:
 	@${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#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
diff --git a/editors/openoffice-3/files/openoffice.org-wrapper b/editors/openoffice-3/files/openoffice.org-wrapper
index 3fd40fcd0110..46b46a78c6aa 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.2 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
+program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 5b7825537414..025f0f29a1f1 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2
+PORTVERSION?=	${OOOVERSION}
 CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
 		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_${PORTVERSION}_src.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_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_${PORTVERSION}_src.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
+OOOVERSION=	2.0.2
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -42,7 +43,6 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -64,11 +64,11 @@ IGNORE=		install lang/perl5.8 then try again
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
-INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
-EXECBASE?=		openoffice.org-${PORTVERSION}
+INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
+EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -222,7 +222,7 @@ post-install:
 	@${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#%%OOOVERSION%%#${OOOVERSION}#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/files/openoffice.org-wrapper b/editors/openoffice.org-2-RC/files/openoffice.org-wrapper
index b5531319f797..16f9d27ced5b 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.2 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
+program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 5b7825537414..025f0f29a1f1 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2
+PORTVERSION?=	${OOOVERSION}
 CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
 		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_${PORTVERSION}_src.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_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_${PORTVERSION}_src.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
+OOOVERSION=	2.0.2
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -42,7 +43,6 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -64,11 +64,11 @@ IGNORE=		install lang/perl5.8 then try again
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
-INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
-EXECBASE?=		openoffice.org-${PORTVERSION}
+INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
+EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -222,7 +222,7 @@ post-install:
 	@${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#%%OOOVERSION%%#${OOOVERSION}#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/files/openoffice.org-wrapper b/editors/openoffice.org-2.0/files/openoffice.org-wrapper
index 8c761792bb45..79cf583df82d 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.2 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
+program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 5b7825537414..025f0f29a1f1 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2
+PORTVERSION?=	${OOOVERSION}
 CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
 		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_${PORTVERSION}_src.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_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_${PORTVERSION}_src.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
+OOOVERSION=	2.0.2
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -42,7 +43,6 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -64,11 +64,11 @@ IGNORE=		install lang/perl5.8 then try again
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
-INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
-EXECBASE?=		openoffice.org-${PORTVERSION}
+INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
+EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -222,7 +222,7 @@ post-install:
 	@${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#%%OOOVERSION%%#${OOOVERSION}#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/files/openoffice.org-wrapper b/editors/openoffice.org-2/files/openoffice.org-wrapper
index 7bd4089e2b5a..32def8bc993c 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.2 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
+program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 5b7825537414..025f0f29a1f1 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2
+PORTVERSION?=	${OOOVERSION}
 CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
 		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_${PORTVERSION}_src.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_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_${PORTVERSION}_src.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
+OOOVERSION=	2.0.2
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -42,7 +43,6 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -64,11 +64,11 @@ IGNORE=		install lang/perl5.8 then try again
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
-INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
-EXECBASE?=		openoffice.org-${PORTVERSION}
+INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
+EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -222,7 +222,7 @@ post-install:
 	@${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#%%OOOVERSION%%#${OOOVERSION}#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/files/openoffice.org-wrapper b/editors/openoffice.org-3-RC/files/openoffice.org-wrapper
index 9357585b5078..cf280dc9d1d7 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.2 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
+program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 5b7825537414..025f0f29a1f1 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.2
+PORTVERSION?=	${OOOVERSION}
 CATEGORIES+=	editors java
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${PORTVERSION}/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOVERSION}/&,} \
 		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_${PORTVERSION}_src.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_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_${PORTVERSION}_src.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
+OOOVERSION=	2.0.2
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -42,7 +43,6 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	i386
@@ -64,11 +64,11 @@ IGNORE=		install lang/perl5.8 then try again
 CODELINE=		680
 RELEASE_NR=		2.0
 OOOTAG?=		OOB680_m5
-INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
-EXECBASE?=		openoffice.org-${PORTVERSION}
+INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
+EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-PACKAGE_BASENAME=	OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -222,7 +222,7 @@ post-install:
 	@${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#%%OOOVERSION%%#${OOOVERSION}#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/files/openoffice.org-wrapper b/editors/openoffice.org-3/files/openoffice.org-wrapper
index 178a6f7ae492..d9a2d75ac3ac 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.2 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice.org-wrapper,v 1.3 2006-04-20 21:56:12 maho Exp $
 
 oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
-program=`echo $0 | sed -e 's|.*-%%PORTVERSION%%-||'`
+program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)