3 files changed, 8 insertions, 18 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 1ae5c5d58bc1..3758f8caa7a1 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	3
+#PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -101,7 +101,7 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9800\)
-SVNREVISION=	1727463
+SVNREVISION=	1735889
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
@@ -141,7 +141,7 @@ USE_XORG=	ice x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 USES=		autoreconf:autoconf bison compiler:c++11-lib cpe \
 		desktop-file-utils \
 		gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
-		tar:${TARTYPE}
+		shared-mime-info tar:${TARTYPE}
 INSTALLS_ICONS=	yes
 WITHOUT_CPU_CFLAGS=	true
 CPE_PRODUCT=	${PORTNAME:S|apache-||}
@@ -180,6 +180,9 @@ PDFIMPORT_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDI
 
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 
+# Don't run gnome-post-install until after post-install generates the plist
+TARGET_ORDER_OVERRIDE=	710:gnome-post-install
+
 .include <bsd.port.pre.mk>
 
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 87309d8e81a2..6337f71a6b23 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-r1727463-src.tar.xz) = d3592cefb0f890e42d5cf911bab4b73cdb6a1b2b4ad1f808535efb3ce0826130
-SIZE (openoffice/apache-openoffice-r1727463-src.tar.xz) = 215195680
+SHA256 (openoffice/apache-openoffice-r1735889-src.tar.xz) = f249b36ffcf1c653a4abc06c12b6c07fe7a017bcf5357562099e778257d8c533
+SIZE (openoffice/apache-openoffice-r1735889-src.tar.xz) = 215031948
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
diff --git a/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk b/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk
deleted file mode 100644
index 7c80a84efa1e..000000000000
--- a/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- sdext/source/pdfimport/makefile.mk.orig	2014-09-19 18:16:25 UTC
-+++ sdext/source/pdfimport/makefile.mk
-@@ -70,6 +70,10 @@ SHL1STDLIBS=\
- 	$(CPPULIB)			\
- 	$(SALLIB)
- 
-+.IF "$(SYSTEM_BOOST)" == "YES"
-+    SHL1STDLIBS+=-lboost_system
-+.ENDIF
-+
- .IF "$(GUI)" == "UNX"
-     SHL1STDLIBS+=-lbasegfx_s
- .ELSE