- Update to 4.0.6.

- Support staging.

3 files changed, 23 insertions, 35 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index f03c824de236..956fc6a5946a 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 
 PORTREVISION=	0
@@ -159,20 +158,6 @@ CONFIGURE_ARGS+=	--disable-epm \
 			--without-myspell-dicts \
 			--without-system-mozilla
 
-MAN1=	libreoffice.1 \
-	lobase.1 \
-	localc.1 \
-	lodraw.1 \
-	loffice.1 \
-	lofromtemplate.1 \
-	loimpress.1 \
-	lomath.1 \
-	loweb.1 \
-	lowriter.1 \
-	unopkg.1
-
-MANCOMPRESSED=	yes
-
 OPTIONS_DEFINE=	CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \
 		SYSTRAY TEST WEBDAV
 OPTIONS_DEFAULT=CUPS GTK2
@@ -377,41 +362,43 @@ pre-configure:
 post-configure:
 	@${TOUCH} ${WRKSRC}/src.downloaded
 
+do-build:
+	@cd ${WRKSRC} && ${SETENV} DESTDIR="" ${MAKE_ENV} ${GMAKE}
+
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR="${LODESTDIR}" \
 	    ${GMAKE} distro-pack-install
 
-post-install:
 	@${RM} -f ${PLISTF} ${PLISTD}
 	# It seems that the empty directories are necessary for libreoffice keep them for now
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
 	    -empty -exec ${ECHO_CMD} "@exec ${MKDIR} %D/{}" \; >> ${PLISTD}
 
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s bin lib \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s bin lib \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
 	    -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}
 
 	@${ECHO_CMD} etc/bash_completion.d/libreoffice.sh >> ${PLISTF}
 	@${ECHO_CMD} "@dirrmtry etc/bash_completion.d" >> ${PLISTD}
 
 .for subdir in applications icons mime mimelnk
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s share/${subdir} \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d share/${subdir} -type d \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -d share/${subdir} -type d \
 	    -exec ${ECHO_CMD} "@dirrmtry {}" \; >> ${PLISTD}
 .endfor
 # do not add the subdir itself as dirrmtry
 .for subdir in application-registry mime-info
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s share/${subdir} \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
 .endfor
 
 .if ${PORT_OPTIONS:MSDK}
 .for subdir in include share share/doc share/idl
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
-	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d ${subdir}/libreoffice \
+	@cd ${LODESTDIR}${PREFIX} && ${FIND} -d ${subdir}/libreoffice \
 	    -type d -exec echo "@dirrm {}" \; >> ${PLISTD}
 .endfor
 	@${ECHO_CMD} "@dirrmtry share/idl" >> ${PLISTD}
@@ -423,9 +410,9 @@ post-install:
 	@${GREP} '^@dirrmtry ' ${PLISTD} | ${SORT} -ru | \
 	    ${SED} -e '${PLIST_REINPLACE_DIRRMTRY}' >> ${TMPPLIST}
 
-	@cd ${LODESTDIR}/${PREFIX} ; ${PAX} -rw . ${PREFIX}
-	@${MKDIR} ${PREFIX}/etc/bash_completion.d
+	@cd ${LODESTDIR}${PREFIX} ; ${PAX} -rw . ${STAGEDIR}${PREFIX}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	@${INSTALL_SCRIPT} ${LODESTDIR}/etc/bash_completion.d/libreoffice.sh \
-	    ${PREFIX}/etc/bash_completion.d
+	    ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 
 .include <bsd.port.post.mk>
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 425f40163be1..8dfa011fc7a5 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
-PORTVERSION=	4.0.5
+PORTVERSION=	4.0.6
 RCVER=		2
 #PRERELEASE=	yes
 LOVERSION=	${PORTVERSION}.${RCVER}
@@ -75,15 +75,16 @@ post-extract:
 	done ; \
 
 do-install:
-	@rm -f ${PLISTD} ${PLISTF}
+	@${RM} -f ${PLISTD} ${PLISTF}
 	cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; ${FIND} * -type d -exec ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/{} || ${TRUE}" \; >> ${PLISTD}
 	cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; ${FIND} * \( -type f -o -type l \) -exec ${ECHO_CMD} "lib/${PORTNAME}/{} " \; >> ${PLISTF}
 
 	${SORT} ${PLISTF} >> ${TMPPLIST}
 	${SORT} -r ${PLISTD} >> ${TMPPLIST}
 
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; ${PAX} -rw . ${PREFIX}/lib/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; \
+	    ${PAX} -rw . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .else
 MASTER_SITES+=	http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index 58c7226d6bbb..6cf50cd9617d 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,7 +1,7 @@
-SHA256 (libreoffice/libreoffice-4.0.5.2.tar.xz) = 8a222b7e8c67e58661da97e77e8ab62210e5f7c1ab1b31a83e5dc8b3540cafa4
-SIZE (libreoffice/libreoffice-4.0.5.2.tar.xz) = 104673552
-SHA256 (libreoffice/libreoffice-help-4.0.5.2.tar.xz) = eba8c993fb558eaf970a1411ad968b9bdcad12b528d4ecc306f6e5fc982c4b59
-SIZE (libreoffice/libreoffice-help-4.0.5.2.tar.xz) = 1858248
+SHA256 (libreoffice/libreoffice-4.0.6.2.tar.xz) = 6cd52fb18c5885eeaac921d4c54c3865df58ef20a91b505c61471fdf56a25474
+SIZE (libreoffice/libreoffice-4.0.6.2.tar.xz) = 104753440
+SHA256 (libreoffice/libreoffice-help-4.0.6.2.tar.xz) = f73a53525162df4099e71cc1095df30f39ebcf3ba3683b639446838a5f8784e2
+SIZE (libreoffice/libreoffice-help-4.0.6.2.tar.xz) = 1858200
 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