diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-09-22 01:06:30 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-09-22 01:06:30 +0000 |
| commit | 4746de11caee328db6e54308c180a828fe756326 (patch) | |
| tree | 37e09afebdc8252e42ca29f4b32ffa587ec975fc /editors/openoffice-3-devel | |
| parent | - Update to 1.2.0. (diff) | |
update to svn 1388426.
Diffstat (limited to 'editors/openoffice-3-devel')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/distinfo | 8 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-configure | 23 |
3 files changed, 5 insertions, 29 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index cc50a5a8a521..1762b6fb0232 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -72,7 +72,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= 1386922 +SVNREVISION= 1388426 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -189,7 +189,6 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-poppler \ --with-system-redland \ --with-system-libtextcat \ - --with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \ --with-system-vigra \ --with-system-stdlibs \ --with-system-apr \ diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 976968a356e9..3aaee15e6a98 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1386922.tar.bz2) = af74d80b0b1764f4ca8c2d3865a8ce627f10891bd1e5c7ac1a2850c8820d0e4d -SIZE (openoffice/ApacheOpenOffice.r1386922.tar.bz2) = 292131895 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1386922.tar.bz2) = 3d0117741f7007403bd0f951ead0e19a6f2994683ac7089dcb6dce3325276b27 -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1386922.tar.bz2) = 188808224 +SHA256 (openoffice/ApacheOpenOffice.r1388426.tar.bz2) = 12c6355089ade5b11b7f79a0e2dcc7ce347e5f89ad2618a407ba925b8b25212b +SIZE (openoffice/ApacheOpenOffice.r1388426.tar.bz2) = 292171157 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1388426.tar.bz2) = 7f83593ff35f81cd29eeaae70ad0e9a4c9038c217c233c8203507e051a8f749b +SIZE (openoffice/ApacheOpenOffice.ext_sources.r1388426.tar.bz2) = 175972011 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 deleted file mode 100644 index 265f3532c67c..000000000000 --- a/editors/openoffice-3-devel/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ -$FreeBSD$ - ---- configure.in 2012-09-18 09:35:25.000000000 +0900 -+++ configure.in 2012-09-18 12:31:44.000000000 +0900 -@@ -7088,14 +7088,14 @@ - dnl =================================================================== - RAT_JAR= - AC_MSG_CHECKING([whether to trigger rat scan]) --if test -z "$with_rat_scan" -o "$with_rat_scan" == "no"; then -+if test -z "$with_rat_scan" -o "$with_rat_scan" = "no"; then - AC_MSG_RESULT([no]) - else -- if test "$WITH_JAVA" == "no"; then -+ if test "$WITH_JAVA" = "no"; then - AC_MSG_ERROR([no, java disabled, enable with --with-java]) -- elif test "$enable_saxon" == "no"; then -+ elif test "$enable_saxon" = "no"; then - AC_MSG_ERROR([no, saxon disabled, enable with --enable-category-b]) -- elif test "$with_rat_scan" == "yes"; then -+ elif test "$with_rat_scan" = "yes"; then - AC_MSG_RESULT([yes, use pre-built library]) - RAT_JAR_HOME="BUILD" - BUILD_TYPE="$BUILD_TYPE RAT" |