Fix SDK name.

Submitted by:	Marcus Lange <marcus.lange@oracle.com>

7 files changed, 12 insertions, 10 deletions

diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others
index 412e8f96f6b7..d361328d8997 100644
--- a/editors/openoffice-3-devel/files/Makefile.others
+++ b/editors/openoffice-3-devel/files/Makefile.others
@@ -28,7 +28,7 @@ sdk:
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_install_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}/../OOo-Dev-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../OOo-Dev-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
 
 solver:
 	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 868e0fe4d053..d607e4986dae 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -75,6 +75,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 
 MILESTONE?=		20
 OOOTAG?=		OOO330_m${MILESTONE}
+OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
index f1545d957b7d..5910bf4babfd 100644
--- a/editors/openoffice-3/files/Makefile.others
+++ b/editors/openoffice-3/files/Makefile.others
@@ -28,7 +28,7 @@ sdk:
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_install_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}/../OOo-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../OOo-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
 
 solver:
 	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
diff --git a/editors/openoffice.org-3-RC/files/Makefile.others b/editors/openoffice.org-3-RC/files/Makefile.others
index 412e8f96f6b7..d361328d8997 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.others
+++ b/editors/openoffice.org-3-RC/files/Makefile.others
@@ -28,7 +28,7 @@ sdk:
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_install_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}/../OOo-Dev-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../OOo-Dev-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
 
 solver:
 	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others
index 412e8f96f6b7..d361328d8997 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.others
+++ b/editors/openoffice.org-3-devel/files/Makefile.others
@@ -28,7 +28,7 @@ sdk:
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_install_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}/../OOo-Dev-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../OOo-Dev-URE_${PACKAGE_BASENAME}_install_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 868e0fe4d053..d607e4986dae 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -75,6 +75,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 
 MILESTONE?=		20
 OOOTAG?=		OOO330_m${MILESTONE}
+OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
diff --git a/editors/openoffice.org-3/files/Makefile.others b/editors/openoffice.org-3/files/Makefile.others
index f1545d957b7d..5910bf4babfd 100644
--- a/editors/openoffice.org-3/files/Makefile.others
+++ b/editors/openoffice.org-3/files/Makefile.others
@@ -28,7 +28,7 @@ sdk:
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
-		${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
+		${TAR} cfj ${WRKDIR}/../OOo-SDK_${PACKAGE_BASENAME}_install_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}/../OOo-URE_${PACKAGE_BASENAME}_en-US.tbz ${INSTALLATION_BASEDIR}
+		${TAR} cfj ${WRKDIR}/../OOo-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
 
 solver:
 	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"