3 files changed, 69 insertions, 38 deletions

diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index dc2aeb33343a..7c605ec20464 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -2,44 +2,35 @@
 
 PORTNAME=	okular
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 universal document viewer
 
-LIB_DEPENDS=	djvulibre:${PORTSDIR}/graphics/djvulibre \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		qca:${PORTSDIR}/devel/qca \
-		tiff:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libqca.so:${PORTSDIR}/devel/qca \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		spectre:${PORTSDIR}/print/libspectre \
-		chm:${PORTSDIR}/misc/chmlib \
-		freetype:${PORTSDIR}/print/freetype2 \
-		epub:${PORTSDIR}/textproc/ebook-tools
-
-CONFLICTS=	kdegraphics-4.[0-6].*
-
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz kactivities
-USES=		cmake:outsource pkgconfig
+		libspectre.so:${PORTSDIR}/print/libspectre \
+		libchm.so:${PORTSDIR}/misc/chmlib \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libepub.so:${PORTSDIR}/textproc/ebook-tools \
+		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
+
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz kactivities \
+		libkexiv2
 USE_QT4=	corelib declarative gui opengl xml \
 		qmake_build moc_build uic_build rcc_build
+USES=		cmake:outsource pkgconfig
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 
-MAN1=		okular.1
-
 OPTIONS_DEFINE=	DVI
-DVI_DESC=	Support DVI files (requires teTeX)
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDVI}
-USE_TEX=	latex
-.endif
+DVI_DESC=	Device independent TeX files support (requires teTeX)
+DVI_USE=	TEX=latex
 
 .include <bsd.port.mk>
diff --git a/graphics/okular/distinfo b/graphics/okular/distinfo
index 94e7c3be5a49..845483ace4c5 100644
--- a/graphics/okular/distinfo
+++ b/graphics/okular/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/okular-4.10.5.tar.xz) = 2e5db9235de445ea9985a9ef8c3d2c678a34a15f8c527c7811856bc3c91b6217
-SIZE (KDE/4.10.5/okular-4.10.5.tar.xz) = 1386324
+SHA256 (KDE/4.12.2/okular-4.12.2.tar.xz) = 5dd66c243781e8e74103ad6dff421496e30876b494661d1d46df07d42ab3429c
+SIZE (KDE/4.12.2/okular-4.12.2.tar.xz) = 1579392
diff --git a/graphics/okular/pkg-plist b/graphics/okular/pkg-plist
index 04ce3f4911b1..e401195a27d8 100644
--- a/graphics/okular/pkg-plist
+++ b/graphics/okular/pkg-plist
@@ -8,6 +8,7 @@ include/okular/core/fontinfo.h
 include/okular/core/form.h
 include/okular/core/generator.h
 include/okular/core/global.h
+include/okular/core/observer.h
 include/okular/core/okular_export.h
 include/okular/core/page.h
 include/okular/core/pagesize.h
@@ -16,6 +17,7 @@ include/okular/core/settings_core.h
 include/okular/core/sound.h
 include/okular/core/sourcereference.h
 include/okular/core/textdocumentgenerator.h
+include/okular/core/textdocumentsettings.h
 include/okular/core/textpage.h
 include/okular/core/tile.h
 include/okular/core/utils.h
@@ -39,15 +41,33 @@ lib/kde4/okularGenerator_fax.so
 lib/kde4/okularGenerator_fb.so
 lib/kde4/okularGenerator_ghostview.so
 lib/kde4/okularGenerator_kimgio.so
+lib/kde4/okularGenerator_mobi.so
 lib/kde4/okularGenerator_ooo.so
 lib/kde4/okularGenerator_plucker.so
 lib/kde4/okularGenerator_poppler.so
 lib/kde4/okularGenerator_tiff.so
+lib/kde4/okularGenerator_txt.so
 lib/kde4/okularGenerator_xps.so
 lib/kde4/okularpart.so
 lib/libokularcore.so
-lib/libokularcore.so.2
-lib/libokularcore.so.2.0.0
+lib/libokularcore.so.3
+lib/libokularcore.so.3.0.0
+man/man1/okular.1.gz
+share/applications/kde4/active-documentviewer_chm.desktop
+share/applications/kde4/active-documentviewer_comicbook.desktop
+share/applications/kde4/active-documentviewer_djvu.desktop
+share/applications/kde4/active-documentviewer_dvi.desktop
+share/applications/kde4/active-documentviewer_epub.desktop
+share/applications/kde4/active-documentviewer_fax.desktop
+share/applications/kde4/active-documentviewer_fb.desktop
+share/applications/kde4/active-documentviewer_ghostview.desktop
+share/applications/kde4/active-documentviewer_kimgio.desktop
+share/applications/kde4/active-documentviewer_ooo.desktop
+share/applications/kde4/active-documentviewer_pdf.desktop
+share/applications/kde4/active-documentviewer_plucker.desktop
+share/applications/kde4/active-documentviewer_tiff.desktop
+share/applications/kde4/active-documentviewer_txt.desktop
+share/applications/kde4/active-documentviewer_xps.desktop
 share/applications/kde4/okular.desktop
 share/applications/kde4/okularApplication_chm.desktop
 share/applications/kde4/okularApplication_comicbook.desktop
@@ -58,10 +78,12 @@ share/applications/kde4/okularApplication_fax.desktop
 share/applications/kde4/okularApplication_fb.desktop
 share/applications/kde4/okularApplication_ghostview.desktop
 share/applications/kde4/okularApplication_kimgio.desktop
+share/applications/kde4/okularApplication_mobi.desktop
 share/applications/kde4/okularApplication_ooo.desktop
 share/applications/kde4/okularApplication_pdf.desktop
 share/applications/kde4/okularApplication_plucker.desktop
 share/applications/kde4/okularApplication_tiff.desktop
+share/applications/kde4/okularApplication_txt.desktop
 share/applications/kde4/okularApplication_xps.desktop
 share/apps/kconf_update/okular.upd
 share/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
@@ -77,6 +99,8 @@ share/apps/okular/pics/insert.png
 share/apps/okular/pics/key.png
 share/apps/okular/pics/newparagraph.png
 share/apps/okular/pics/note.png
+share/apps/okular/pics/okular-epub-movie.png
+share/apps/okular/pics/okular-epub-sound-icon.png
 share/apps/okular/pics/paperclip.png
 share/apps/okular/pics/paragraph.png
 share/apps/okular/pics/pushpin.png
@@ -84,17 +108,13 @@ share/apps/okular/pics/rightarrow.png
 share/apps/okular/pics/rightpointer.png
 share/apps/okular/pics/stamps.svg
 share/apps/okular/pics/star.png
-share/apps/okular/pics/tool-ellipse-okular.png
-share/apps/okular/pics/tool-highlighter-okular.png
-share/apps/okular/pics/tool-ink-okular.png
-share/apps/okular/pics/tool-line-okular.png
-share/apps/okular/pics/tool-note-inline-okular.png
+share/apps/okular/pics/tool-base-okular.png
+share/apps/okular/pics/tool-highlighter-okular-colorizable.png
+share/apps/okular/pics/tool-ink-okular-colorizable.png
+share/apps/okular/pics/tool-note-inline-okular-colorizable.png
 share/apps/okular/pics/tool-note-inline.png
-share/apps/okular/pics/tool-note-okular.png
+share/apps/okular/pics/tool-note-okular-colorizable.png
 share/apps/okular/pics/tool-note.png
-share/apps/okular/pics/tool-polygon-okular.png
-share/apps/okular/pics/tool-stamp-okular.png
-share/apps/okular/pics/tool-underline-okular.png
 share/apps/okular/pics/uparrow.png
 share/apps/okular/pics/upleftarrow.png
 share/apps/okular/shell.rc
@@ -102,13 +122,20 @@ share/apps/okular/tools.xml
 share/config.kcfg/gssettings.kcfg
 share/config.kcfg/okular.kcfg
 share/config.kcfg/okular_core.kcfg
+share/config.kcfg/pdfsettings.kcfg
 share/doc/HTML/en/okular/annotation-properties.png
 share/doc/HTML/en/okular/annotations.png
 share/doc/HTML/en/okular/bookmark-management.png
 share/doc/HTML/en/okular/common
+share/doc/HTML/en/okular/configure-annotations.png
+share/doc/HTML/en/okular/configure-backends.png
 share/doc/HTML/en/okular/configure-editor.png
 share/doc/HTML/en/okular/configure.png
 share/doc/HTML/en/okular/embedded-files-bar.png
+share/doc/HTML/en/okular/enhance-lowcontrast.png
+share/doc/HTML/en/okular/enhance-shape.png
+share/doc/HTML/en/okular/enhance-solid.png
+share/doc/HTML/en/okular/enhance-thinline.png
 share/doc/HTML/en/okular/forms-bar.png
 share/doc/HTML/en/okular/index.cache.bz2
 share/doc/HTML/en/okular/index.docbook
@@ -116,6 +143,15 @@ share/doc/HTML/en/okular/mainwindow.png
 share/doc/HTML/en/okular/man-okular.1.docbook
 share/doc/HTML/en/okular/presentation.png
 share/doc/HTML/en/okular/rating.png
+share/doc/HTML/en/okular/tool-ellipse-okular.png
+share/doc/HTML/en/okular/tool-highlighter-okular.png
+share/doc/HTML/en/okular/tool-ink-okular.png
+share/doc/HTML/en/okular/tool-line-okular.png
+share/doc/HTML/en/okular/tool-note-inline-okular.png
+share/doc/HTML/en/okular/tool-note-okular.png
+share/doc/HTML/en/okular/tool-polygon-okular.png
+share/doc/HTML/en/okular/tool-stamp-okular.png
+share/doc/HTML/en/okular/tool-underline-okular.png
 share/icons/hicolor/128x128/apps/okular.png
 share/icons/hicolor/16x16/apps/okular.png
 share/icons/hicolor/22x22/apps/okular.png
@@ -132,10 +168,12 @@ share/kde4/services/libokularGenerator_fax.desktop
 share/kde4/services/libokularGenerator_fb.desktop
 share/kde4/services/libokularGenerator_ghostview.desktop
 share/kde4/services/libokularGenerator_kimgio.desktop
+share/kde4/services/libokularGenerator_mobi.desktop
 share/kde4/services/libokularGenerator_ooo.desktop
 share/kde4/services/libokularGenerator_plucker.desktop
 share/kde4/services/libokularGenerator_poppler.desktop
 share/kde4/services/libokularGenerator_tiff.desktop
+share/kde4/services/libokularGenerator_txt.desktop
 share/kde4/services/libokularGenerator_xps.desktop
 share/kde4/services/msits.protocol
 share/kde4/services/okularChm.desktop
@@ -147,10 +185,12 @@ share/kde4/services/okularFax.desktop
 share/kde4/services/okularFb.desktop
 share/kde4/services/okularGhostview.desktop
 share/kde4/services/okularKimgio.desktop
+share/kde4/services/okularMobi.desktop
 share/kde4/services/okularOoo.desktop
 share/kde4/services/okularPlucker.desktop
 share/kde4/services/okularPoppler.desktop
 share/kde4/services/okularTiff.desktop
+share/kde4/services/okularTxt.desktop
 share/kde4/services/okularXps.desktop
 share/kde4/services/okular_part.desktop
 share/kde4/servicetypes/okularGenerator.desktop