diff options
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/Makefile.others | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index aba8ac01793f..dad1fdf2f67f 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -85,9 +85,9 @@ EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org3 SIMPLEOSVER= ${OSREL:C/\.//g} .if ${ARCH} == amd64 -PACKAGE_BASENAME= OOo-Dev_${OOOTAG2}_${OPSYS}${SIMPLEOSVER}_x86-64 +PACKAGE_BASENAME= ${OOOTAG2}_${OPSYS}${SIMPLEOSVER}_x86-64 .else -PACKAGE_BASENAME= OOo-Dev_${OOOTAG2}_${OPSYS}${SIMPLEOSVER}_x86 +PACKAGE_BASENAME= ${OOOTAG2}_${OPSYS}${SIMPLEOSVER}_x86 .endif LOCALIZED_LANG?= en-US diff --git a/editors/openoffice.org-3-RC/files/Makefile.others b/editors/openoffice.org-3-RC/files/Makefile.others index d0bd83eef195..412e8f96f6b7 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.others +++ b/editors/openoffice.org-3-RC/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-Dev_${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-Dev_${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-Dev-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-Dev-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR} solver: @${ECHO_MSG} "===> Make Solver of OpenOffice.org" @@ -66,6 +66,6 @@ languagepack: @cd ${WRKDIR}/langpack_tmp/opt/ ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR} + ${TAR} cfj ${WRKDIR}/../OOo-Dev_${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR} .endif .endif |