aboutsummaryrefslogtreecommitdiff
path: root/editors/libreoffice
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-06-19 20:52:13 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-06-19 20:52:13 +0000
commit2bf17ab7d11a8557c13795b02a5486b55e910a9d (patch)
tree9de5eed69126d7eb62d37cf084ed9d26447914f3 /editors/libreoffice
parentcba21faa21391ce39bb3e6816b6e17a3cece412e (diff)
downloadports-2bf17ab7d11a8557c13795b02a5486b55e910a9d.tar.gz
ports-2bf17ab7d11a8557c13795b02a5486b55e910a9d.zip
Update to 4.0.4.
Notes
Notes: svn path=/head/; revision=321324
Diffstat (limited to 'editors/libreoffice')
-rw-r--r--editors/libreoffice/Makefile13
-rw-r--r--editors/libreoffice/Makefile.common4
-rw-r--r--editors/libreoffice/distinfo8
3 files changed, 9 insertions, 16 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index a246db6fe825..af3365e58be5 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -89,7 +89,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}
CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
GPERF=${LOCALBASE}/bin/gperf \
PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
- PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
+ PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \
+ TMPDIR=${WRKDIR}
CONFIGURE_ARGS+= --disable-dependency-tracking \
--disable-fetch-external \
@@ -100,7 +101,7 @@ CONFIGURE_ARGS+= --disable-dependency-tracking \
--with-gnu-patch=${LOCALBASE}/bin/gpatch \
--with-os-version=${OSVERSION} \
--with-parallelism=${MAKE_JOBS_NUMBER} \
- --with-solver-and-workdir-root=${TMPDIR}/lobuild \
+ --with-solver-and-workdir-root=${WRKDIR} \
--with-unix-wrapper="libreoffice" \
--with-vendor="FreeBSD ports ${PKGVERSION}"
@@ -376,12 +377,8 @@ MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}"
MAKE_ENV+= LANG=C LC_ALL=C
MAKE_ENV+= SED="${LOCALBASE}/bin/gsed" USE_GMAKE=1
-TMPDIR?= /tmp
-
pre-configure:
@${TOUCH} ${WRKSRC}/autogen.lastrun
- @${MKDIR} ${WRKDIR}/lobuild
- @${LN} -fs ${WRKDIR}/lobuild ${TMPDIR}
post-configure:
@${TOUCH} ${WRKSRC}/src.downloaded
@@ -446,8 +443,4 @@ post-install:
@${LOCALBASE}/bin/update-desktop-database 2>/dev/null || ${TRUE}
.endif
-post-clean:
- @${RM} -f ${TMPDIR}/lobuild
- @${RM} -fr ${TMPDIR}/LibreOffice ${TMPDIR}/LibreOffice_SDK
-
.include <bsd.port.post.mk>
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 9505a03a4cea..b1d524ef8d77 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= libreoffice
-PORTVERSION= 4.0.3
-RCVER= 3
+PORTVERSION= 4.0.4
+RCVER= 2
#PRERELEASE= yes
LOVERSION= ${PORTVERSION}.${RCVER}
CATEGORIES?= editors
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index 1a9b3565a431..50954f8f1284 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,7 +1,7 @@
-SHA256 (libreoffice/libreoffice-4.0.3.3.tar.xz) = b490517aba0c7b52c4b537910bb63af01304512342c3d5e553a14eba5f5641a1
-SIZE (libreoffice/libreoffice-4.0.3.3.tar.xz) = 104219900
-SHA256 (libreoffice/libreoffice-help-4.0.3.3.tar.xz) = 7a31dc0cdc69137b3be4c439f961df0d0d12b048f8ae6553f967082d2b16b6ac
-SIZE (libreoffice/libreoffice-help-4.0.3.3.tar.xz) = 1855496
+SHA256 (libreoffice/libreoffice-4.0.4.2.tar.xz) = 5336734757f721139d6615eefed0249be1461e428e2e64f592ce3c36a661b154
+SIZE (libreoffice/libreoffice-4.0.4.2.tar.xz) = 104213468
+SHA256 (libreoffice/libreoffice-help-4.0.4.2.tar.xz) = 9d7f732760b24b6916266903913d7684d9b933640174b1e041d729914beb5a4e
+SIZE (libreoffice/libreoffice-help-4.0.4.2.tar.xz) = 1855588
SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370