diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-05-15 04:08:55 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-05-15 04:08:55 +0000 |
| commit | 298d7ced8e43133b0e021ec36e3226a13d409cdc (patch) | |
| tree | 7bba741e596de2d94c42d966c9b4999c2be1d2b5 | |
| parent | update to m103 (diff) | |
Fix wrapper
Submitted by: Mike Durian <durian@shadetreesoftware.com>
Notes
Notes:
svn path=/head/; revision=135276
24 files changed, 35 insertions, 23 deletions
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice-2.0-devel/files/openoffice-wrapper b/editors/openoffice-2.0-devel/files/openoffice-wrapper index 007c4e0e71c2..5f310899a10f 100644 --- a/editors/openoffice-2.0-devel/files/openoffice-wrapper +++ b/editors/openoffice-2.0-devel/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice-3-devel/files/openoffice-wrapper b/editors/openoffice-3-devel/files/openoffice-wrapper index e0f74354ecef..08f6be3151b0 100644 --- a/editors/openoffice-3-devel/files/openoffice-wrapper +++ b/editors/openoffice-3-devel/files/openoffice-wrapper @@ -3,7 +3,7 @@ # $FreeBSD$ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice-3/files/openoffice-wrapper b/editors/openoffice-3/files/openoffice-wrapper index 7dc25c8dcded..9016ae740191 100644 --- a/editors/openoffice-3/files/openoffice-wrapper +++ b/editors/openoffice-3/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-2-RC/files/openoffice-wrapper b/editors/openoffice.org-2-RC/files/openoffice-wrapper index e2347f2b46cd..27a3d3d5ceb8 100644 --- a/editors/openoffice.org-2-RC/files/openoffice-wrapper +++ b/editors/openoffice.org-2-RC/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-2-devel/files/openoffice-wrapper b/editors/openoffice.org-2-devel/files/openoffice-wrapper index 5bfeab524a87..6e91ea42c580 100644 --- a/editors/openoffice.org-2-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-2-devel/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper index 2455a90d4650..cc832e8e0d1d 100644 --- a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-2.0/files/openoffice-wrapper b/editors/openoffice.org-2.0/files/openoffice-wrapper index a41f8d0ad3bd..1f675c22c07d 100644 --- a/editors/openoffice.org-2.0/files/openoffice-wrapper +++ b/editors/openoffice.org-2.0/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-2/files/openoffice-wrapper b/editors/openoffice.org-2/files/openoffice-wrapper index dac41f5ecf86..691521ceb40b 100644 --- a/editors/openoffice.org-2/files/openoffice-wrapper +++ b/editors/openoffice.org-2/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-3-RC/files/openoffice-wrapper b/editors/openoffice.org-3-RC/files/openoffice-wrapper index 3fb57f9a1196..c88f5546dc18 100644 --- a/editors/openoffice.org-3-RC/files/openoffice-wrapper +++ b/editors/openoffice.org-3-RC/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-3-devel/files/openoffice-wrapper b/editors/openoffice.org-3-devel/files/openoffice-wrapper index a1027f925663..a8c0011c3c97 100644 --- a/editors/openoffice.org-3-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-3-devel/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-3/files/openoffice-wrapper b/editors/openoffice.org-3/files/openoffice-wrapper index 6b2037d8040b..f7c5bb8917a3 100644 --- a/editors/openoffice.org-3/files/openoffice-wrapper +++ b/editors/openoffice.org-3/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index d4a65773b3c8..15fe526efb13 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -159,6 +159,7 @@ post-install: @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ + -e 's#%%MILESTONE%%#${MILESTONE}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ diff --git a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper index bf4c88995f10..a1a8c1424e79 100644 --- a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper +++ b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.14 2005-01-10 12:28:19 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.15 2005-05-15 04:08:55 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%m%%MILESTONE%%-||'` case $program in $0) |