diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-devel/Makefile | 7 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 3f777893e3f7..8aa157c36711 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= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -55,7 +55,6 @@ BUILD_DEPENDS= \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip \ ant:${PORTSDIR}/devel/apache-ant \ - ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ dmake:${PORTSDIR}/devel/dmake \ epm:${PORTSDIR}/devel/epm \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ @@ -149,7 +148,7 @@ CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT SDK WIKI_PUBLISHER CCACHE -OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER +OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress @@ -176,6 +175,8 @@ MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk PDFIMPORT_CONFIGURE_ENABLE= pdfimport +PDFIMPORT_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs +PDFIMPORT_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher diff --git a/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk b/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk new file mode 100644 index 000000000000..7c80a84efa1e --- /dev/null +++ b/editors/openoffice-devel/files/patch-sdext_source_pdfimport_makefile.mk @@ -0,0 +1,13 @@ +--- 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 |