diff options
Diffstat (limited to 'editors/openoffice-3-devel')
-rw-r--r-- | editors/openoffice-3-devel/Makefile | 26 | ||||
-rw-r--r-- | editors/openoffice-3-devel/distinfo | 8 | ||||
-rw-r--r-- | editors/openoffice-3-devel/files/patch-coinmp | 175 |
3 files changed, 21 insertions, 188 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 2ff1dfa26ac7..b2c153688e9f 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -19,7 +19,7 @@ EXTRACT_ONLY= ${OOOSRC} ${EXTSRC} MAINTAINER= office@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version) -#LICENSE= AL2 +LICENSE= AL2 NO_LATEST_LINK= yes @@ -56,7 +56,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX} EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX} OOODIR= openoffice.org3 -SVNREVISION= 1244320 +SVNREVISION= 1245861 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -76,11 +76,10 @@ PKGNAMESUFFIX= -${LANG_SUFFIX} .endif RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ - ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ - ${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \ + ${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache @@ -144,6 +143,7 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-gperf=${LOCALBASE}/bin/gperf \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}lib \ + --with-system-libxml \ --with-system-libxslt \ --with-system-cairo --enable-cairo \ --with-system-boost \ @@ -154,7 +154,6 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-curl \ --with-system-poppler \ --with-system-redland \ - --with-system-hunspell \ --with-system-libtextcat \ --with-system-vigra \ --with-system-stdlibs \ @@ -162,11 +161,7 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \ --with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \ --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \ - --with-system-saxon \ - --with-saxon-jar=${JAVALIBDIR}/saxon9.jar \ --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ - --with-system-beanshell \ - --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --with-package-format="archive" \ --enable-gstreamer \ --enable-minimizer \ @@ -175,8 +170,16 @@ CONFIGURE_ARGS+= --enable-verbose \ --enable-dbus \ --enable-opengl \ --enable-category-b \ + --with-system-hunspell \ + --with-system-saxon \ + --with-saxon-jar=${JAVALIBDIR}/saxon9.jar \ + --with-system-beanshell \ + --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --without-stlport +# stlport_gcc.5:${PORTSDIR}/devel/stlport +# --with-stlport=${LOCALBASE} + OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt @@ -262,6 +265,11 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter @${ECHO_CMD} "" > ${TMPPLIST} + @${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} + @${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} + @${ECHO_CMD} "share/licenses/${PKGNAME}/AL2" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index cc1a29b7b3f3..ca8218b6cfdd 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1244320.tar.bz2) = 2077d31bbc4d09e3b1119ad8fbbb2553f41415309fade7eeda6da6b935010540 -SIZE (openoffice/ApacheOpenOffice.r1244320.tar.bz2) = 250829719 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1244320.tar.bz2) = ea780bf29b78528a93bf052cc19a9fb03e41601cf416fde5b4dec17ed59c009b -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1244320.tar.bz2) = 215141007 +SHA256 (openoffice/ApacheOpenOffice.r1245861.tar.bz2) = 46eb06c4c927c02673e4393a6ebf7924bc5faa8b4bfb536354c43543f72b2f7d +SIZE (openoffice/ApacheOpenOffice.r1245861.tar.bz2) = 250905951 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1245861.tar.bz2) = a94233e6ea773be6adb2ebf6ec481110783c1dbe7f175ed8c8ea74d563dc30ee +SIZE (openoffice/ApacheOpenOffice.ext_sources.r1245861.tar.bz2) = 215140993 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-coinmp b/editors/openoffice-3-devel/files/patch-coinmp deleted file mode 100644 index 97f624f2295b..000000000000 --- a/editors/openoffice-3-devel/files/patch-coinmp +++ /dev/null @@ -1,175 +0,0 @@ ---- ../ext_libraries/coinmp/coinmp-1.6.0.patch.org 2012-02-14 12:01:15.000000000 +0900 -+++ ../ext_libraries/coinmp/coinmp-1.6.0.patch 2012-02-14 12:50:05.000000000 +0900 -@@ -21,3 +21,172 @@ - generalMessageHandler->message(CLP_GENERAL, generalMessages) - << generalPrint - << CoinMessageEol; -+ -+--- misc/CoinMP-1.6.0/Cbc/ltmain.sh 2010-06-14 02:52:10.000000000 +0900 -++++ misc/build/CoinMP-1.6.0/Cbc/ltmain.sh 2012-02-14 12:43:54.000000000 +0900 -+@@ -3186,12 +3186,12 @@ -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+- darwin|linux|osf|windows) -++ darwin|linux|osf|windows|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+- freebsd-aout|freebsd-elf|sunos) -++ freebsd-aout|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+@@ -3267,8 +3267,8 @@ -+ ;; -+ -+ freebsd-elf) -+- major=".$current" -+- versuffix=".$current"; -++ major=.`expr $current - $age` -++ versuffix="$major" -+ ;; -+ -+ irix | nonstopux) -+--- misc/CoinMP-1.6.0/Cgl/ltmain.sh 2010-06-14 02:52:57.000000000 +0900 -++++ misc/build/CoinMP-1.6.0/Cgl/ltmain.sh 2012-02-14 12:47:44.000000000 +0900 -+@@ -3186,12 +3186,12 @@ -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+- darwin|linux|osf|windows) -++ darwin|linux|osf|windows|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+- freebsd-aout|freebsd-elf|sunos) -++ freebsd-aout|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+@@ -3267,8 +3267,8 @@ -+ ;; -+ -+ freebsd-elf) -+- major=".$current" -+- versuffix=".$current"; -++ major=.`expr $current - $age` -++ versuffix="$major" -+ ;; -+ -+ irix | nonstopux) -+--- misc/CoinMP-1.6.0/Clp/ltmain.sh 2010-06-14 02:53:25.000000000 +0900 -++++ misc/build/CoinMP-1.6.0/Clp/ltmain.sh 2012-02-14 12:47:52.000000000 +0900 -+@@ -3186,12 +3186,12 @@ -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+- darwin|linux|osf|windows) -++ darwin|linux|osf|windows|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+- freebsd-aout|freebsd-elf|sunos) -++ freebsd-aout|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+@@ -3267,8 +3267,8 @@ -+ ;; -+ -+ freebsd-elf) -+- major=".$current" -+- versuffix=".$current"; -++ major=.`expr $current - $age` -++ versuffix="$major" -+ ;; -+ -+ irix | nonstopux) -+--- misc/CoinMP-1.6.0/CoinMP/ltmain.sh 2011-08-08 00:09:46.000000000 +0900 -++++ misc/build/CoinMP-1.6.0/CoinMP/ltmain.sh 2012-02-14 12:48:03.000000000 +0900 -+@@ -3186,12 +3186,12 @@ -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+- darwin|linux|osf|windows) -++ darwin|linux|osf|windows|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+- freebsd-aout|freebsd-elf|sunos) -++ freebsd-aout|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+@@ -3267,8 +3267,8 @@ -+ ;; -+ -+ freebsd-elf) -+- major=".$current" -+- versuffix=".$current"; -++ major=.`expr $current - $age` -++ versuffix="$major" -+ ;; -+ -+ irix | nonstopux) -+--- misc/CoinMP-1.6.0/CoinUtils/ltmain.sh 2010-06-14 02:53:51.000000000 +0900 -++++ misc/build/CoinMP-1.6.0/CoinUtils/ltmain.sh 2012-02-14 12:48:08.000000000 +0900 -+@@ -3186,12 +3186,12 @@ -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+- darwin|linux|osf|windows) -++ darwin|linux|osf|windows|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+- freebsd-aout|freebsd-elf|sunos) -++ freebsd-aout|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+@@ -3267,8 +3267,8 @@ -+ ;; -+ -+ freebsd-elf) -+- major=".$current" -+- versuffix=".$current"; -++ major=.`expr $current - $age` -++ versuffix="$major" -+ ;; -+ -+ irix | nonstopux) -+--- misc/CoinMP-1.6.0/Osi/ltmain.sh 2010-06-14 02:59:18.000000000 +0900 -++++ misc/build/CoinMP-1.6.0/Osi/ltmain.sh 2012-02-14 12:48:24.000000000 +0900 -+@@ -3186,12 +3186,12 @@ -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+- darwin|linux|osf|windows) -++ darwin|linux|osf|windows|freebsd-elf) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+- freebsd-aout|freebsd-elf|sunos) -++ freebsd-aout|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+@@ -3267,8 +3267,8 @@ -+ ;; -+ -+ freebsd-elf) -+- major=".$current" -+- versuffix=".$current"; -++ major=.`expr $current - $age` -++ versuffix="$major" -+ ;; -+ -+ irix | nonstopux) |