diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-07-05 06:11:09 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-07-05 06:11:09 +0000 |
| commit | ef1300ddc3494336889dbbac9d15d2b7ae4b84d0 (patch) | |
| tree | 0ef0a8962d34838b597f8974fca4171bdb2ae9e7 /editors/openoffice-3-devel | |
| parent | - Update to latest, numerous fixes (diff) | |
* update to svn 1356713.
* use system fonts instead of internal ones[1]
Submitted by: pfg@ [1]
Diffstat (limited to 'editors/openoffice-3-devel')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 13 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/distinfo | 8 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-configure | 11 |
3 files changed, 23 insertions, 9 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index f0acf7a6b3c4..dcac7a942931 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -73,7 +73,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= 1347855 +SVNREVISION= 1356713 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -96,7 +96,11 @@ RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hico ${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 \ + ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf \ + ${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g \ + ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \ + ${LOCALBASE}/lib/X11/fonts/gentium-basic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache @@ -172,8 +176,6 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-curl \ --with-system-poppler \ --with-system-redland \ - --with-system-libtextcat \ - --with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \ --with-system-vigra \ --with-system-stdlibs \ --with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \ @@ -193,7 +195,8 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-saxon \ --with-saxon-jar=${JAVALIBDIR}/saxon9.jar \ --with-system-beanshell \ - --with-beanshell-jar=${JAVALIBDIR}/bsh.jar + --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ + --without-fonts OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 1b62bbe6bfb4..172173dcb311 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1347855.tar.bz2) = 8efe3fd90b6323e6142d7d5e87ceec1bbf0d684c4180ae266e9ce77ae42cc83a -SIZE (openoffice/ApacheOpenOffice.r1347855.tar.bz2) = 251624518 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1347855.tar.bz2) = df577086a92401275a6badd9781a05249b683825efe0000b9bf93365864efbec -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1347855.tar.bz2) = 223305907 +SHA256 (openoffice/ApacheOpenOffice.r1356713.tar.bz2) = 5828fd511bd45b31d7119f707f530fe9fce306ca3cc6a1dd7d294af922619c28 +SIZE (openoffice/ApacheOpenOffice.r1356713.tar.bz2) = 251891339 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1356713.tar.bz2) = 64ba0dbca6e1f855bb10d6283daa8f2064197dda516e5ed5dbcdb63e126051bb +SIZE (openoffice/ApacheOpenOffice.ext_sources.r1356713.tar.bz2) = 223485318 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-configure b/editors/openoffice-3-devel/files/patch-configure new file mode 100644 index 000000000000..5b83e717e028 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.in~ 2012-07-03 22:57:24.000000000 +0900 ++++ configure.in 2012-07-05 11:37:45.000000000 +0900 +@@ -6856,7 +6856,7 @@ + dnl =================================================================== + WITH_CATB_FONTS= + AC_MSG_CHECKING([whether to include category B fonts]) +-if test "x$enable_category_b_fonts" = "xyes"; then ++if test "x$enable_category_b_fonts" = "xyes" && test "x$with_fonts" != "xno"; then + AC_MSG_RESULT([yes]) + BUILD_TYPE="$BUILD_TYPE CATB_FONTS" + WITH_CATB_FONTS=YES |