diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2011-02-10 01:19:21 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2011-02-10 01:19:21 +0000 |
| commit | 16ee73d7fd9fa9b8905d75556d9673e4a8e1371e (patch) | |
| tree | 77eaee64b6ec40c9744324571600a366860a5b16 /editors | |
| parent | - Updated to 0.2.1 (diff) | |
Rename SDK and URE names so that meet OOo's official criterion.
Discussed with: Marcus Lange <marcus.lange@oracle.com>, "Jack L." <xxjack12xx@gmail.com>
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268846
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-3/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-3/files/Makefile.others | 8 | ||||
| -rw-r--r-- | editors/openoffice.org-3/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice.org-3/files/Makefile.others | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 318c1705d519..868e0fe4d053 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -82,9 +82,9 @@ EXECBASE?= openoffice.org-${OOOVERSION} DIST_SUBDIR= openoffice.org3 SIMPLEOSVER= ${OSREL:C/\.//g} .if ${ARCH} == amd64 -PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86-64 +PACKAGE_BASENAME= ${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86-64 .else -PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86 +PACKAGE_BASENAME= ${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86 .endif LOCALIZED_LANG?= en-US diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others index d0bd83eef195..105a5ab713da 100644 --- a/editors/openoffice-3/files/Makefile.others +++ b/editors/openoffice-3/files/Makefile.others @@ -12,12 +12,12 @@ package-rename: @${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload"; @${LN} ${PKGFILE} \ - ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} + ${WRKDIR}/../OOo_${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} package-canonical: @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ;\ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + ${TAR} cfj ${WRKDIR}/../OOo_${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @@ -28,7 +28,7 @@ sdk: @cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk + ${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" @@ -39,7 +39,7 @@ ure: @cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR} + ${TAR} cfj ${WRKDIR}/../OOo-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR} solver: @${ECHO_MSG} "===> Make Solver of OpenOffice.org" diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 318c1705d519..868e0fe4d053 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -82,9 +82,9 @@ EXECBASE?= openoffice.org-${OOOVERSION} DIST_SUBDIR= openoffice.org3 SIMPLEOSVER= ${OSREL:C/\.//g} .if ${ARCH} == amd64 -PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86-64 +PACKAGE_BASENAME= ${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86-64 .else -PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86 +PACKAGE_BASENAME= ${OOOVERSION}_${OPSYS}${SIMPLEOSVER}_x86 .endif LOCALIZED_LANG?= en-US diff --git a/editors/openoffice.org-3/files/Makefile.others b/editors/openoffice.org-3/files/Makefile.others index d0bd83eef195..105a5ab713da 100644 --- a/editors/openoffice.org-3/files/Makefile.others +++ b/editors/openoffice.org-3/files/Makefile.others @@ -12,12 +12,12 @@ package-rename: @${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload"; @${LN} ${PKGFILE} \ - ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} + ${WRKDIR}/../OOo_${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} package-canonical: @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ;\ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + ${TAR} cfj ${WRKDIR}/../OOo_${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @@ -28,7 +28,7 @@ sdk: @cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk + ${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" @@ -39,7 +39,7 @@ ure: @cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR} + ${TAR} cfj ${WRKDIR}/../OOo-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR} solver: @${ECHO_MSG} "===> Make Solver of OpenOffice.org" |