aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/openoffice-3-devel/Makefile19
-rw-r--r--editors/openoffice-3-devel/files/Makefile.knobs18
-rw-r--r--editors/openoffice-3-devel/files/Makefile.localized47
-rw-r--r--editors/openoffice.org-2-devel/Makefile19
-rw-r--r--editors/openoffice.org-2-devel/files/Makefile.knobs18
-rw-r--r--editors/openoffice.org-2-devel/files/Makefile.localized47
-rw-r--r--editors/openoffice.org-3-devel/Makefile19
-rw-r--r--editors/openoffice.org-3-devel/files/Makefile.knobs18
-rw-r--r--editors/openoffice.org-3-devel/files/Makefile.localized47
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile19
-rw-r--r--editors/openoffice.org-vcltesttool/files/Makefile.knobs18
-rw-r--r--editors/openoffice.org-vcltesttool/files/Makefile.localized47
12 files changed, 268 insertions, 68 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index ff8e669f8e20..9f52b17c93ae 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -56,7 +56,7 @@ JAVA_VENDOR= freebsd bsdjava
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
GCC_TARGET= x86_64-portbld-freebsd${OSREL}
@@ -71,11 +71,10 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
-RELEASE_NR= 2.2
MILESTONE?= 194
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE= 20061122
+SNAPDATE= 20061121
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@@ -237,13 +236,12 @@ post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+ -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
${WRKDIR}/openoffice.org-wrapper
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
${PREFIX}/bin/${EXECBASE}
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
@@ -252,9 +250,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
- @${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \
- -e '/^Exec/s/printeradmin/spadmin/' \
+.if defined(WITH_MENU)
+ @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@@ -264,8 +261,8 @@ post-install:
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
- ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png ; \
- ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png\n" >> ${TMPPLIST} ; \
+ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \
+ ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \
fi \
done ; \
for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
@@ -274,6 +271,7 @@ post-install:
${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
done ; \
done
+.endif
@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@@ -285,7 +283,6 @@ post-install:
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
${PKGMESSAGE}
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 87843d8a66bc..33fa59095e15 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -99,12 +99,13 @@ pre-fetch:
@${ECHO} "You can select the language for OOo by making it with:"
@${ECHO} "make LOCALIZED_LANG=xx"
@${ECHO} "while xx can be one of the following"
- @${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
- @${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
- @${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
- @${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
- @${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
- @${ECHO} "zh-TW zu"
+ @${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
+ @${ECHO} "de el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
+ @${ECHO} "gu-IN he hi-IN hr hu it ja km kn-IN ko ku lo lt lv mk"
+ @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt"
+ @${ECHO} "pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx"
+ @${ECHO} "te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh"
+ @${ECHO} "zh-CN zh-TW zu"
@${ECHO} "Default: en-US"
.endif
.if !defined(WITH_GNUGCJ)
@@ -132,6 +133,11 @@ pre-fetch:
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
+.if !defined(WITH_MENU)
+ @${ECHO}
+ @${ECHO} "You can install OOo with menu items by"
+ @${ECHO} "make -DWITH_MENU"
+.endif
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index 410647cd4dff..4bcfcf78d781 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -14,6 +14,11 @@ CATEGORIES+= arabic
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "as-IN"
+LANG_PKGNAME= as
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "be-BY"
LANG_PKGNAME= be
LANG_SUFFIX= BY
@@ -170,6 +175,10 @@ CATEGORIES+= korean
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ku"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "lo"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -190,6 +199,16 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ml-IN"
+LANG_PKGNAME= ml
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mr-IN"
+LANG_PKGNAME= mr
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ne"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -214,6 +233,11 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "or-IN"
+LANG_PKGNAME= or
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "pa-IN"
LANG_PKGNAME= pa
LANG_SUFFIX= IN
@@ -295,6 +319,16 @@ LANG_PKGNAME= ta
LANG_SUFFIX= IN
.endif
################################################################
+.if ${LOCALIZED_LANG} == "te-IN"
+LANG_PKGNAME= te
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ti-IN"
+LANG_PKGNAME= ti
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "th"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -311,6 +345,19 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "tg"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ur-IN"
+LANG_PKGNAME= ur
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "uk"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ve"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index ff8e669f8e20..9f52b17c93ae 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -56,7 +56,7 @@ JAVA_VENDOR= freebsd bsdjava
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
GCC_TARGET= x86_64-portbld-freebsd${OSREL}
@@ -71,11 +71,10 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
-RELEASE_NR= 2.2
MILESTONE?= 194
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE= 20061122
+SNAPDATE= 20061121
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@@ -237,13 +236,12 @@ post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+ -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
${WRKDIR}/openoffice.org-wrapper
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
${PREFIX}/bin/${EXECBASE}
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
@@ -252,9 +250,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
- @${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \
- -e '/^Exec/s/printeradmin/spadmin/' \
+.if defined(WITH_MENU)
+ @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@@ -264,8 +261,8 @@ post-install:
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
- ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png ; \
- ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png\n" >> ${TMPPLIST} ; \
+ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \
+ ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \
fi \
done ; \
for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
@@ -274,6 +271,7 @@ post-install:
${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
done ; \
done
+.endif
@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@@ -285,7 +283,6 @@ post-install:
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
${PKGMESSAGE}
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index 87843d8a66bc..33fa59095e15 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -99,12 +99,13 @@ pre-fetch:
@${ECHO} "You can select the language for OOo by making it with:"
@${ECHO} "make LOCALIZED_LANG=xx"
@${ECHO} "while xx can be one of the following"
- @${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
- @${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
- @${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
- @${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
- @${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
- @${ECHO} "zh-TW zu"
+ @${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
+ @${ECHO} "de el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
+ @${ECHO} "gu-IN he hi-IN hr hu it ja km kn-IN ko ku lo lt lv mk"
+ @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt"
+ @${ECHO} "pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx"
+ @${ECHO} "te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh"
+ @${ECHO} "zh-CN zh-TW zu"
@${ECHO} "Default: en-US"
.endif
.if !defined(WITH_GNUGCJ)
@@ -132,6 +133,11 @@ pre-fetch:
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
+.if !defined(WITH_MENU)
+ @${ECHO}
+ @${ECHO} "You can install OOo with menu items by"
+ @${ECHO} "make -DWITH_MENU"
+.endif
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
index 410647cd4dff..4bcfcf78d781 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2-devel/files/Makefile.localized
@@ -14,6 +14,11 @@ CATEGORIES+= arabic
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "as-IN"
+LANG_PKGNAME= as
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "be-BY"
LANG_PKGNAME= be
LANG_SUFFIX= BY
@@ -170,6 +175,10 @@ CATEGORIES+= korean
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ku"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "lo"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -190,6 +199,16 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ml-IN"
+LANG_PKGNAME= ml
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mr-IN"
+LANG_PKGNAME= mr
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ne"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -214,6 +233,11 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "or-IN"
+LANG_PKGNAME= or
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "pa-IN"
LANG_PKGNAME= pa
LANG_SUFFIX= IN
@@ -295,6 +319,16 @@ LANG_PKGNAME= ta
LANG_SUFFIX= IN
.endif
################################################################
+.if ${LOCALIZED_LANG} == "te-IN"
+LANG_PKGNAME= te
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ti-IN"
+LANG_PKGNAME= ti
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "th"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -311,6 +345,19 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "tg"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ur-IN"
+LANG_PKGNAME= ur
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "uk"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ve"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index ff8e669f8e20..9f52b17c93ae 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -56,7 +56,7 @@ JAVA_VENDOR= freebsd bsdjava
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
GCC_TARGET= x86_64-portbld-freebsd${OSREL}
@@ -71,11 +71,10 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
-RELEASE_NR= 2.2
MILESTONE?= 194
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE= 20061122
+SNAPDATE= 20061121
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@@ -237,13 +236,12 @@ post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+ -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
${WRKDIR}/openoffice.org-wrapper
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
${PREFIX}/bin/${EXECBASE}
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
@@ -252,9 +250,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
- @${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \
- -e '/^Exec/s/printeradmin/spadmin/' \
+.if defined(WITH_MENU)
+ @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@@ -264,8 +261,8 @@ post-install:
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
- ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png ; \
- ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png\n" >> ${TMPPLIST} ; \
+ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \
+ ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \
fi \
done ; \
for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
@@ -274,6 +271,7 @@ post-install:
${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
done ; \
done
+.endif
@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@@ -285,7 +283,6 @@ post-install:
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
${PKGMESSAGE}
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index 87843d8a66bc..33fa59095e15 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -99,12 +99,13 @@ pre-fetch:
@${ECHO} "You can select the language for OOo by making it with:"
@${ECHO} "make LOCALIZED_LANG=xx"
@${ECHO} "while xx can be one of the following"
- @${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
- @${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
- @${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
- @${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
- @${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
- @${ECHO} "zh-TW zu"
+ @${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
+ @${ECHO} "de el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
+ @${ECHO} "gu-IN he hi-IN hr hu it ja km kn-IN ko ku lo lt lv mk"
+ @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt"
+ @${ECHO} "pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx"
+ @${ECHO} "te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh"
+ @${ECHO} "zh-CN zh-TW zu"
@${ECHO} "Default: en-US"
.endif
.if !defined(WITH_GNUGCJ)
@@ -132,6 +133,11 @@ pre-fetch:
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
+.if !defined(WITH_MENU)
+ @${ECHO}
+ @${ECHO} "You can install OOo with menu items by"
+ @${ECHO} "make -DWITH_MENU"
+.endif
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized
index 410647cd4dff..4bcfcf78d781 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.localized
+++ b/editors/openoffice.org-3-devel/files/Makefile.localized
@@ -14,6 +14,11 @@ CATEGORIES+= arabic
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "as-IN"
+LANG_PKGNAME= as
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "be-BY"
LANG_PKGNAME= be
LANG_SUFFIX= BY
@@ -170,6 +175,10 @@ CATEGORIES+= korean
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ku"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "lo"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -190,6 +199,16 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ml-IN"
+LANG_PKGNAME= ml
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mr-IN"
+LANG_PKGNAME= mr
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ne"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -214,6 +233,11 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "or-IN"
+LANG_PKGNAME= or
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "pa-IN"
LANG_PKGNAME= pa
LANG_SUFFIX= IN
@@ -295,6 +319,16 @@ LANG_PKGNAME= ta
LANG_SUFFIX= IN
.endif
################################################################
+.if ${LOCALIZED_LANG} == "te-IN"
+LANG_PKGNAME= te
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ti-IN"
+LANG_PKGNAME= ti
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "th"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -311,6 +345,19 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "tg"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ur-IN"
+LANG_PKGNAME= ur
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "uk"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ve"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index ff8e669f8e20..9f52b17c93ae 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -56,7 +56,7 @@ JAVA_VENDOR= freebsd bsdjava
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
GCC_TARGET= x86_64-portbld-freebsd${OSREL}
@@ -71,11 +71,10 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
-RELEASE_NR= 2.2
MILESTONE?= 194
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE= 20061122
+SNAPDATE= 20061121
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@@ -237,13 +236,12 @@ post-install:
@${ECHO_MSG} "===> Add wrapper scripts";
@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+ -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
${WRKDIR}/openoffice.org-wrapper
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
${PREFIX}/bin/${EXECBASE}
- @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
@@ -252,9 +250,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
- @${REINPLACE_CMD} -e 's#${RELEASE_NR}#${OOOVERSION}#g' \
- -e '/^Exec/s/printeradmin/spadmin/' \
+.if defined(WITH_MENU)
+ @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@@ -264,8 +261,8 @@ post-install:
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \
- ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png ; \
- ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-20-$${app}.png\n" >> ${TMPPLIST} ; \
+ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \
+ ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \
fi \
done ; \
for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \
@@ -274,6 +271,7 @@ post-install:
${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
done ; \
done
+.endif
@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@@ -285,7 +283,6 @@ post-install:
-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-e 's#%%OOOTAG%%#${OOOTAG}#g' \
- -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
${PKGMESSAGE}
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index 87843d8a66bc..33fa59095e15 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -99,12 +99,13 @@ pre-fetch:
@${ECHO} "You can select the language for OOo by making it with:"
@${ECHO} "make LOCALIZED_LANG=xx"
@${ECHO} "while xx can be one of the following"
- @${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
- @${ECHO} "en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he"
- @${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
- @${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
- @${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
- @${ECHO} "zh-TW zu"
+ @${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
+ @${ECHO} "de el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
+ @${ECHO} "gu-IN he hi-IN hr hu it ja km kn-IN ko ku lo lt lv mk"
+ @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt"
+ @${ECHO} "pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx"
+ @${ECHO} "te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh"
+ @${ECHO} "zh-CN zh-TW zu"
@${ECHO} "Default: en-US"
.endif
.if !defined(WITH_GNUGCJ)
@@ -132,6 +133,11 @@ pre-fetch:
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
+.if !defined(WITH_MENU)
+ @${ECHO}
+ @${ECHO} "You can install OOo with menu items by"
+ @${ECHO} "make -DWITH_MENU"
+.endif
@${ECHO}
@${ECHO} "NOTICE:"
@${ECHO}
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
index 410647cd4dff..4bcfcf78d781 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized
@@ -14,6 +14,11 @@ CATEGORIES+= arabic
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "as-IN"
+LANG_PKGNAME= as
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "be-BY"
LANG_PKGNAME= be
LANG_SUFFIX= BY
@@ -170,6 +175,10 @@ CATEGORIES+= korean
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ku"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "lo"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -190,6 +199,16 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ml-IN"
+LANG_PKGNAME= ml
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mr-IN"
+LANG_PKGNAME= mr
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ne"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -214,6 +233,11 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "or-IN"
+LANG_PKGNAME= or
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "pa-IN"
LANG_PKGNAME= pa
LANG_SUFFIX= IN
@@ -295,6 +319,16 @@ LANG_PKGNAME= ta
LANG_SUFFIX= IN
.endif
################################################################
+.if ${LOCALIZED_LANG} == "te-IN"
+LANG_PKGNAME= te
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ti-IN"
+LANG_PKGNAME= ti
+LANG_SUFFIX= IN
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "th"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -311,6 +345,19 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "tg"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ur-IN"
+LANG_PKGNAME= ur
+LANG_SUFFIX= IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "uk"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "ve"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif