diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-07-17 21:23:48 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-07-17 21:23:48 +0000 |
| commit | 59c3c3fce963477ce3d729bc518957a89e926bdc (patch) | |
| tree | 3b8efab2dabc7aa295841d3e7da030b74c807ce9 /editors/koffice-kde4/Makefile | |
| parent | Bring this port back from the dead and assume maintainership of it. (diff) | |
- Depend on the embedded wv2 instead of the one from ports.
- Correctly link to iconv in the wv2 tests. [1]
- Add conflict with the yet-to-come calligra port.
- Bump PORTREVISION.
This fix finally enables the build of the msword-odf filter.
Reported by: Axel Gonzalez <loox@e-shell.net> [1]
Submitted by: Raphael Kubo da Costa <kubito@gmail.com> via area51
Notes
Notes:
svn path=/head/; revision=277870
Diffstat (limited to 'editors/koffice-kde4/Makefile')
| -rw-r--r-- | editors/koffice-kde4/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index af0d570691fe..ed8733b6c347 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/ @@ -33,7 +33,6 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \ tiff.4:${PORTSDIR}/graphics/tiff \ gsl.16:${PORTSDIR}/math/gsl \ - wv2.4:${PORTSDIR}/textproc/wv2 \ freetype.9:${PORTSDIR}/print/freetype2 \ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ @@ -41,6 +40,8 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ dcmdata.3:${PORTSDIR}/devel/dcmtk RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30 +CONFLICTS= calligra-[0-9]* + USE_BZIP2= yes USE_CMAKE= yes USE_ICONV= yes @@ -110,10 +111,6 @@ post-patch: ${PATCH_WRKSRC}/cmake/modules/FindImageMagick.cmake ${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \ ${PATCH_WRKSRC}/cmake/modules/FindWPD.cmake - ${REINPLACE_CMD} -e 's|-DHAVE_ICONV_H|-DHAVE_ICONV_H -L${LOCALBASE}/lib -liconv -Wl,-rpath -Wl,${LOCALBASE}/lib -liconv|' \ - ${PATCH_WRKSRC}/filters/kword/CMakeLists.txt - ${REINPLACE_CMD} -e '/add_subdirectory(wv2)/d' \ - ${PATCH_WRKSRC}/filters/kword/msword-odf/CMakeLists.txt post-install: @-update-mime-database ${PREFIX}/share/mime |