summaryrefslogtreecommitdiff
path: root/editors/openoffice-3-devel
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-3-devel')
-rw-r--r--editors/openoffice-3-devel/Makefile30
-rw-r--r--editors/openoffice-3-devel/distinfo4
-rw-r--r--editors/openoffice-3-devel/files/Makefile.knobs46
-rw-r--r--editors/openoffice-3-devel/files/Makefile.localized33
-rw-r--r--editors/openoffice-3-devel/files/pkg-message.in32
5 files changed, 105 insertions, 40 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index ac78d1db2303..02b264cd020e 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -35,7 +35,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
-.if !defined(WITHOUT_JAVA)
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
USE_JAVA= yes
JAVA_VERSION= 1.4
JAVA_BUILD= jdk
@@ -50,8 +50,8 @@ BROKEN= "rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 117
-SNAPDATE= 20050713
+MILESTONE= 120
+SNAPDATE= 20050722
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
DIST_SUBDIR= openoffice.org2.0
@@ -67,16 +67,34 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}-
PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
+.if defined(WITH_GNUGCJ)
+BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
+BROKEN= "still work in progress"
+.else
BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
+
# FIXME (correctly add ccache before gcc and g++)
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
+.if defined(WITH_GNUGCJ)
+CC= ccache gcc41
+CXX= ccache g++41
+.else
CC= ccache gcc-ooo
CXX= ccache g++-ooo
+.endif #WITH_GNUGCJ
+.endif #WITH_CCACHE
+.if !defined(WITH_CCACHE)
+.if defined(WITH_GNUGCJ)
+CC= gcc41
+CXX= g++41
.else
CC= gcc-ooo
CXX= g++-ooo
-.endif
+.endif #WITH_GNUGCJ
+.endif #!WITH_CCACHE
+
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
gcp:${PORTSDIR}/sysutils/coreutils \
@@ -84,9 +102,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bison-devel:${PORTSDIR}/devel/bison-devel \
imake:${X_IMAKE_PORT}
-.if defined(WITHOUT_JAVA)
-LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
-.else
+.if !defined(WITHOUT_JAVA)
BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.endif
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 8043ca6a4d02..81a9b15b988e 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 95630bc570e10a30b8cfd840c321e00b
-SIZE (openoffice.org2.0/OOo_1.9m117_source.tar.bz2) = 227975719
+MD5 (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 9230e6cd7e824a3e3846ccf4a04b92af
+SIZE (openoffice.org2.0/OOo_1.9m120_source.tar.bz2) = 228290473
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index d3b3945207c7..2d30ac8d0b3d 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -2,10 +2,14 @@
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD$
+.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
+.endif
+.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
+CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant
+.endif
.if defined(WITHOUT_JAVA)
CONFIGURE_ARGS+= --without-java
-.else
-CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
.endif
.if defined(WITH_KDE)
@@ -63,36 +67,50 @@ pre-fetch:
@${ECHO} "If you set WITH_DEBUG=2, you add internal"
@${ECHO} "OOo debug support."
.endif
-#XXX currently broken
-#.if !defined(WITHOUT_MOZILLA)
-# @${ECHO}
-# @${ECHO} "You can compile OOo without Mozilla connectivity by"
-# @${ECHO} "make -DWITHOUT_MOZILLA"
-#.endif
+.if !defined(WITHOUT_MOZILLA)
+ @${ECHO}
+ @${ECHO} "You can compile OOo without Mozilla connectivity with"
+ @${ECHO} "make -DWITHOUT_MOZILLA"
+.endif
.if !defined(WITH_TTF_BYTECODE_ENABLED)
@${ECHO}
@${ECHO} "You may get better quality of glyphs"
- @${ECHO} "at small bitmap sizes, If you have"
+ @${ECHO} "at small bitmap sizes if you have"
@${ECHO} "licensed the Apple patents"
- @${ECHO} "US05155805 US05159668 and US05325479, by"
+ @${ECHO} "US05155805 US05159668 and US05325479, with"
@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
@${ECHO} "See http://www.freetype.org/patents.html for details"
.endif
+ @${ECHO}
+ @${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 bn be-BY bg ca cs cy da de el en-GB eo es"
+ @${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN"
+ @${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk"
+ @${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu"
+ @${ECHO}
#XXX currently broken
#.if !defined(WITHOUT_JAVA)
# @${ECHO}
-# @${ECHO} "You can compile OOo without Java support by"
+# @${ECHO} "You can compile OOo without Java support with"
# @${ECHO} "make -DWITHOUT_JAVA"
#.endif
#XXX currently broken
+#.if !defined(WITH_GNUGCJ)
+# @${ECHO}
+# @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+# @${ECHO} "make -DWITH_GNUGCJ"
+#.endif
+#XXX currently broken
#.if !defined(WITH_CUPS)
# @${ECHO}
-# @${ECHO} "You can compile OOo with CUPS support by"
+# @${ECHO} "You can compile OOo with CUPS support with"
# @${ECHO} "make -DWITH_CUPS"
#.endif
.if !defined(WITH_KDE)
@${ECHO}
- @${ECHO} "You can compile OOo to use Qt/KDE vclplug"
+ @${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
@${ECHO} "make -DWITH_KDE"
.endif
@${ECHO}
@@ -102,6 +120,6 @@ pre-fetch:
.if defined(WITH_DEBUG)
@${ECHO} "of free diskspace (~ 18GB)."
.else
- @${ECHO} "of free diskspace (~ 8.5GB)."
+ @${ECHO} "of free diskspace (~ 9GB)."
.endif
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index 6cbd019a2ce4..b34865a14f8c 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -14,6 +14,14 @@ CATEGORIES= arabic
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "bg"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -77,6 +85,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "gu-IN"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "he"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -85,6 +97,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "hr"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "hu"
CATEGORIES= hungarian
LANG_PKGNAME= ${LOCALIZED_LANG}
@@ -138,6 +154,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "pa-IN"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "pl"
CATEGORIES= polish
LANG_PKGNAME= ${LOCALIZED_LANG}
@@ -163,6 +183,11 @@ CATEGORIES= russian
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "rw"
+CATEGORIES= russian
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "sk"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -175,6 +200,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "ta-IN"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "th"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
@@ -187,6 +216,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
################################################################
+.if ${LOCALIZED_LANG} == "vi"
+LANG_PKGNAME= ${LOCALIZED_LANG}
+.endif
+################################################################
.if ${LOCALIZED_LANG} == "xh"
LANG_PKGNAME= ${LOCALIZED_LANG}
.endif
diff --git a/editors/openoffice-3-devel/files/pkg-message.in b/editors/openoffice-3-devel/files/pkg-message.in
index 63e3317a1568..f95a56222371 100644
--- a/editors/openoffice-3-devel/files/pkg-message.in
+++ b/editors/openoffice-3-devel/files/pkg-message.in
@@ -6,27 +6,27 @@ Written by: Martin Blapp <mbr@freebsd.org>
OpenOffice.org %%RELEASE_NR%%m%%MILESTONE%% will soon been installed in
%%PREFIX%%/%%EXECBASE%%
-1 User installation
--------------------
+1. User installation
+--------------------
Just type "%%EXECBASE%%" after you have successfully
installed the package. If there is no installed
OO.org dir in your homedir, you'll be prompted to
-install some files and choose a installed JDK.
+install some files and choose an installed JDK.
The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder
in your homedir.
If the setup tells you there is already an installed
-version, you may look at the file ".sversionrc" in
-your homedir. In this file OpenOffice and StarOffice
-have both a line for each version which is installed.
+version, you may look in the file ".sversionrc" located
+in your homedir. In this file, OpenOffice and StarOffice
+will have a line for each version that is installed.
After removing the problematic line you should be able to
-install again.
+install the package again.
-2 Start OO.org
---------------
+2. Starting OO.org
+------------------
-There are some wrappers installed for fast startup.
+There are some wrappers installed for faster startup.
Add "%%PREFIX%%/bin/" to your PATH and you will be able
to use them.
@@ -43,11 +43,9 @@ to use them.
OO.org does need $LANG to be set to a suitable value.
-3 If you stuck into a trouble
+3. If you run into problems
--------------------------------------------------
-Somehow you can stuck into a trouble.
-To solve this issue, please remove the already installed
-".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir and remove the
-appropriate entry from ".sversionrc". After you have done
-this, redo the user installation and the problem will
-go away.
+If you somehow run into problems, please remove the already installed
+".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir
+along with the appropriate entry in ".sversionrc". Redo the user
+installation and the problems should go away.