From 0e8aa69f626459734a3d4152e5dd71b388961bc3 Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Sat, 30 Apr 2016 19:04:31 +0000 Subject: [PATCH] Revert the part of the change in r408688 that allowed the PDF Import extension to build with boost 1.60, which should have been reverted in r411540. The fix implemented upstream does not require linking with any boost libraries, so return boost to always just being a build dependency. Update TARGET_ORDER_OVERRIDE to for the changes to Uses/gnome.mk in r413768. Don't bother trying to create ${STAGEDIR}${DESKTOPDIR} since it is already handled by mtree. --- editors/openoffice-devel/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index b807a6cd4542..0e7561f0c933 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -#PORTREVISION= 1 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -55,6 +55,7 @@ BUILD_DEPENDS= \ ${LOCALBASE}/bin/unzip:archivers/unzip \ zip:archivers/zip \ ant:devel/apache-ant \ + ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ dmake:devel/dmake \ epm:devel/epm \ ${LOCALBASE}/bin/gperf:devel/gperf \ @@ -175,13 +176,11 @@ MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk PDFIMPORT_CONFIGURE_ENABLE= pdfimport -PDFIMPORT_LIB_DEPENDS= libboost_system.so:devel/boost-libs -PDFIMPORT_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs 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 +# Don't run gnome-post-icons until after post-install generates the plist +TARGET_ORDER_OVERRIDE= 710:gnome-post-icons .include @@ -410,7 +409,6 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ - ${STAGEDIR}${DESKTOPDIR} \ ${STAGEDIR}${PREFIX}/share/mime/packages @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ for i in *.tar.?z ; do \