diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-09-19 04:38:13 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-09-19 04:38:13 +0000 |
| commit | b3a6321844ff32c7629abfef63a4d4a294e765df (patch) | |
| tree | fe5e8b8c721980f816d6ff9a3a1ee05767627e08 | |
| parent | Upgrade to the latest BIND patch level: (diff) | |
Update to svn 1386922
Notes
Notes:
svn path=/head/; revision=304477
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/distinfo | 8 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-configure | 23 |
3 files changed, 29 insertions, 7 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 3722b8e625ac..cc50a5a8a521 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -7,7 +7,6 @@ PORTNAME= apache-openoffice PORTVERSION= 3.4.${SVNREVISION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors java MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -73,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= 1371027 +SVNREVISION= 1386922 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -215,7 +214,7 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-beanshell \ --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --without-fonts - +# --with-system-jpeg # --with-system-serf \ OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 48367b3022b8..976968a356e9 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1371027.tar.bz2) = 487df9bce4a17f38980a0c47197e8d10cab6b3a227b58d1b27461eb28c9a4521 -SIZE (openoffice/ApacheOpenOffice.r1371027.tar.bz2) = 259094331 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1371027.tar.bz2) = a10fccbce918efe88e2d97dc7afbabedfc23deb5fda8871ff4fa19f3154c93af -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1371027.tar.bz2) = 236250110 +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/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..265f3532c67c --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-configure @@ -0,0 +1,23 @@ +$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" |