diff options
20 files changed, 90 insertions, 85 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index a03065dd7aa3..739753ae625b 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -13,11 +13,11 @@ MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +DISTFILES+= OOo_${OOOTAG}_source.tar.bz2 .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif -EXTRACT_ONLY= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) @@ -59,13 +59,14 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 145 -SNAPDATE= 20051208 -INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} -EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} +MILESTONE?= 146 +OOOTAG?= SRC680_m${MILESTONE} +SNAPDATE= 20051222 +INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} +EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel +PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) @@ -191,7 +192,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#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ @@ -216,7 +217,7 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ ${PKGMESSAGE} @${ECHO_CMD} diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index f592b1f162bd..8aec1c06d070 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 -SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 -SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588 +MD5 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 9afc1958f84a6ab003f0a710f6644741 +SHA256 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 43f55a7e622038895f9a2ad58e97a5c38044d4b2986285f7a7c95856bfc0fbd2 +SIZE (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 235432632 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/openoffice.org-wrapper b/editors/openoffice-3-devel/files/openoffice.org-wrapper index f0289966206d..a5149e8e21d5 100644 --- a/editors/openoffice-3-devel/files/openoffice.org-wrapper +++ b/editors/openoffice-3-devel/files/openoffice.org-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` +program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` case $program in $0) diff --git a/editors/openoffice-3-devel/files/pkg-message.in b/editors/openoffice-3-devel/files/pkg-message.in index 197e0ddd1e2b..03a7ca76151e 100644 --- a/editors/openoffice-3-devel/files/pkg-message.in +++ b/editors/openoffice-3-devel/files/pkg-message.in @@ -1,9 +1,9 @@ -OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To +OpenOffice.org Build %%OOOTAG%% 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 %%OOOTAG%% 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 diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index a03065dd7aa3..739753ae625b 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -13,11 +13,11 @@ MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +DISTFILES+= OOo_${OOOTAG}_source.tar.bz2 .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif -EXTRACT_ONLY= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) @@ -59,13 +59,14 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 145 -SNAPDATE= 20051208 -INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} -EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} +MILESTONE?= 146 +OOOTAG?= SRC680_m${MILESTONE} +SNAPDATE= 20051222 +INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} +EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel +PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) @@ -191,7 +192,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#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ @@ -216,7 +217,7 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ ${PKGMESSAGE} @${ECHO_CMD} diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index f592b1f162bd..8aec1c06d070 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_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 -SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 -SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588 +MD5 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 9afc1958f84a6ab003f0a710f6644741 +SHA256 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 43f55a7e622038895f9a2ad58e97a5c38044d4b2986285f7a7c95856bfc0fbd2 +SIZE (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 235432632 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/openoffice.org-wrapper b/editors/openoffice.org-2-devel/files/openoffice.org-wrapper index f5bd1a8f5fda..857170b21172 100644 --- a/editors/openoffice.org-2-devel/files/openoffice.org-wrapper +++ b/editors/openoffice.org-2-devel/files/openoffice.org-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` +program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2-devel/files/pkg-message.in b/editors/openoffice.org-2-devel/files/pkg-message.in index 197e0ddd1e2b..03a7ca76151e 100644 --- a/editors/openoffice.org-2-devel/files/pkg-message.in +++ b/editors/openoffice.org-2-devel/files/pkg-message.in @@ -1,9 +1,9 @@ -OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To +OpenOffice.org Build %%OOOTAG%% 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 %%OOOTAG%% 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 diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index a03065dd7aa3..739753ae625b 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -13,11 +13,11 @@ MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +DISTFILES+= OOo_${OOOTAG}_source.tar.bz2 .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif -EXTRACT_ONLY= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) @@ -59,13 +59,14 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 145 -SNAPDATE= 20051208 -INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} -EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} +MILESTONE?= 146 +OOOTAG?= SRC680_m${MILESTONE} +SNAPDATE= 20051222 +INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} +EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel +PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) @@ -191,7 +192,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#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ @@ -216,7 +217,7 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ ${PKGMESSAGE} @${ECHO_CMD} diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index f592b1f162bd..8aec1c06d070 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_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 -SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 -SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588 +MD5 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 9afc1958f84a6ab003f0a710f6644741 +SHA256 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 43f55a7e622038895f9a2ad58e97a5c38044d4b2986285f7a7c95856bfc0fbd2 +SIZE (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 235432632 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/openoffice.org-wrapper b/editors/openoffice.org-2.0-devel/files/openoffice.org-wrapper index e7dcbddf9d70..b33db74c7163 100644 --- a/editors/openoffice.org-2.0-devel/files/openoffice.org-wrapper +++ b/editors/openoffice.org-2.0-devel/files/openoffice.org-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/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-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` +program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2.0-devel/files/pkg-message.in b/editors/openoffice.org-2.0-devel/files/pkg-message.in index 197e0ddd1e2b..03a7ca76151e 100644 --- a/editors/openoffice.org-2.0-devel/files/pkg-message.in +++ b/editors/openoffice.org-2.0-devel/files/pkg-message.in @@ -1,9 +1,9 @@ -OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To +OpenOffice.org Build %%OOOTAG%% 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 %%OOOTAG%% 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 diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index a03065dd7aa3..739753ae625b 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -13,11 +13,11 @@ MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +DISTFILES+= OOo_${OOOTAG}_source.tar.bz2 .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif -EXTRACT_ONLY= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) @@ -59,13 +59,14 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 145 -SNAPDATE= 20051208 -INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} -EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} +MILESTONE?= 146 +OOOTAG?= SRC680_m${MILESTONE} +SNAPDATE= 20051222 +INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} +EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel +PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) @@ -191,7 +192,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#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ @@ -216,7 +217,7 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ ${PKGMESSAGE} @${ECHO_CMD} diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index f592b1f162bd..8aec1c06d070 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_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 -SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 -SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588 +MD5 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 9afc1958f84a6ab003f0a710f6644741 +SHA256 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 43f55a7e622038895f9a2ad58e97a5c38044d4b2986285f7a7c95856bfc0fbd2 +SIZE (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 235432632 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/openoffice.org-wrapper b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper index 5123d1c4bc94..b0a4c8178fea 100644 --- a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper +++ b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` +program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` case $program in $0) diff --git a/editors/openoffice.org-3-devel/files/pkg-message.in b/editors/openoffice.org-3-devel/files/pkg-message.in index 197e0ddd1e2b..03a7ca76151e 100644 --- a/editors/openoffice.org-3-devel/files/pkg-message.in +++ b/editors/openoffice.org-3-devel/files/pkg-message.in @@ -1,9 +1,9 @@ -OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To +OpenOffice.org Build %%OOOTAG%% 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 %%OOOTAG%% 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 diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index a03065dd7aa3..739753ae625b 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -13,11 +13,11 @@ MASTER_SITES+= http://openoffice.lunarshells.com/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +DISTFILES+= OOo_${OOOTAG}_source.tar.bz2 .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif -EXTRACT_ONLY= OOo_SRC680_m${MILESTONE}_source.tar.bz2 +EXTRACT_ONLY= OOo_${OOOTAG}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) @@ -59,13 +59,14 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 145 -SNAPDATE= 20051208 -INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} -EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} +MILESTONE?= 146 +OOOTAG?= SRC680_m${MILESTONE} +SNAPDATE= 20051222 +INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} +EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel +PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) @@ -191,7 +192,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#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ @@ -216,7 +217,7 @@ post-install: @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ + -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ ${PKGMESSAGE} @${ECHO_CMD} diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index f592b1f162bd..8aec1c06d070 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 -SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 -SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588 +MD5 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 9afc1958f84a6ab003f0a710f6644741 +SHA256 (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 43f55a7e622038895f9a2ad58e97a5c38044d4b2986285f7a7c95856bfc0fbd2 +SIZE (openoffice.org2.0/OOo_SRC680_m146_source.tar.bz2) = 235432632 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/openoffice.org-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper index 86ebda17c08a..382488f39adc 100644 --- a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper +++ b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` +program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` case $program in $0) diff --git a/editors/openoffice.org-vcltesttool/files/pkg-message.in b/editors/openoffice.org-vcltesttool/files/pkg-message.in index 197e0ddd1e2b..03a7ca76151e 100644 --- a/editors/openoffice.org-vcltesttool/files/pkg-message.in +++ b/editors/openoffice.org-vcltesttool/files/pkg-message.in @@ -1,9 +1,9 @@ -OpenOffice.org Build %%RELEASE_NR%%m%%MILESTONE%% Personal Install How-To +OpenOffice.org Build %%OOOTAG%% 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 %%OOOTAG%% 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 |