okular: update to 18.04.0

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Wed Apr 25 10:09:36 2018 +1200
Changeset:	52d9aebf6a1f0bcc6d027710a680c0f62538157b

Modified Files:
	okular/Makefile
	okular/PLIST
	okular/distinfo
Removed Files:
	okular/hacks.mk

Log Message:
okular: update to 18.04.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=52d9aebf6a1f0bcc6d027710a680c0f62538157b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 okular/Makefile | 11 +++++------
 okular/PLIST    |  9 ++++++---
 okular/distinfo |  8 ++++----
 okular/hacks.mk |  7 -------
 4 files changed, 15 insertions(+), 20 deletions(-)

diffs:
diff --git a/okular/Makefile b/okular/Makefile
index 4e94766767..539f6fa794 100644
--- a/okular/Makefile
+++ b/okular/Makefile
@@ -7,15 +7,14 @@ HOMEPAGE=	https://kde.org/applications/graphics/okular/
 COMMENT=	KDE universal document viewer
 LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
-.include "../../wip/kde5/applications.mk"
+.include "../../meta-pkgs/kde/applications.mk"
 
 BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
-#DEPENDS+=	kactivities5>=5.19.0:../../x11/libkactivities5
 
 USE_TOOLS+=	msgmerge pkg-config
 
 SUBST_CLASSES+=		xdg
-SUBST_STAGE.xdg=	post-patch
+SUBST_STAGE.xdg=	pre-configure
 SUBST_MESSAGE.xdg=	Install via examples dir.
 SUBST_FILES.xdg=	CMakeLists.txt
 SUBST_SED.xdg=		-e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
@@ -38,17 +37,17 @@ SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 .include "../../devel/threadweaver/buildlink3.mk"
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../wip/kdegraphics-mobipocket/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../wip/libkexiv2/buildlink3.mk"
-.include "../../www/kjs/buildlink3.mk"
-.include "../../www/khtml/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-qt5/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/ebook-tools/buildlink3.mk"
+.include "../../www/kjs/buildlink3.mk"
+.include "../../www/khtml/buildlink3.mk"
 .include "../../x11/kactivities5/buildlink3.mk"
 .include "../../x11/kirigami2/buildlink3.mk"
-.include "../../wip/kdegraphics-mobipocket/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/okular/PLIST b/okular/PLIST
index 156cc81516..23e385602a 100644
--- a/okular/PLIST
+++ b/okular/PLIST
@@ -33,8 +33,8 @@ lib/cmake/Okular5/Okular5ConfigVersion.cmake
 lib/cmake/Okular5/Okular5Targets-noconfig.cmake
 lib/cmake/Okular5/Okular5Targets.cmake
 lib/libOkular5Core.so
-lib/libOkular5Core.so.8
-lib/libOkular5Core.so.8.0.0
+lib/libOkular5Core.so.9
+lib/libOkular5Core.so.9.0.0
 man/ca/man1/okular.1
 man/de/man1/okular.1
 man/es/man1/okular.1
@@ -538,6 +538,7 @@ share/locale/fi/LC_MESSAGES/okular_fax.mo
 share/locale/fi/LC_MESSAGES/okular_fictionbook.mo
 share/locale/fi/LC_MESSAGES/okular_ghostview.mo
 share/locale/fi/LC_MESSAGES/okular_kimgio.mo
+share/locale/fi/LC_MESSAGES/okular_markdown.mo
 share/locale/fi/LC_MESSAGES/okular_mobi.mo
 share/locale/fi/LC_MESSAGES/okular_ooo.mo
 share/locale/fi/LC_MESSAGES/okular_plucker.mo
@@ -589,6 +590,7 @@ share/locale/gl/LC_MESSAGES/okular_fax.mo
 share/locale/gl/LC_MESSAGES/okular_fictionbook.mo
 share/locale/gl/LC_MESSAGES/okular_ghostview.mo
 share/locale/gl/LC_MESSAGES/okular_kimgio.mo
+share/locale/gl/LC_MESSAGES/okular_markdown.mo
 share/locale/gl/LC_MESSAGES/okular_mobi.mo
 share/locale/gl/LC_MESSAGES/okular_ooo.mo
 share/locale/gl/LC_MESSAGES/okular_plucker.mo
@@ -658,6 +660,7 @@ share/locale/ia/LC_MESSAGES/okular_poppler.mo
 share/locale/ia/LC_MESSAGES/okular_txt.mo
 share/locale/ia/LC_MESSAGES/okular_xps.mo
 share/locale/ia/LC_MESSAGES/org.kde.active.documentviewer.mo
+share/locale/id/LC_MESSAGES/okular.mo
 share/locale/is/LC_MESSAGES/okular.mo
 share/locale/is/LC_MESSAGES/okular_chm.mo
 share/locale/is/LC_MESSAGES/okular_comicbook.mo
@@ -941,7 +944,6 @@ share/locale/pt_BR/LC_MESSAGES/okular_fax.mo
 share/locale/pt_BR/LC_MESSAGES/okular_fictionbook.mo
 share/locale/pt_BR/LC_MESSAGES/okular_ghostview.mo
 share/locale/pt_BR/LC_MESSAGES/okular_kimgio.mo
-share/locale/pt_BR/LC_MESSAGES/okular_markdown.mo
 share/locale/pt_BR/LC_MESSAGES/okular_mobi.mo
 share/locale/pt_BR/LC_MESSAGES/okular_ooo.mo
 share/locale/pt_BR/LC_MESSAGES/okular_plucker.mo
@@ -1012,6 +1014,7 @@ share/locale/sl/LC_MESSAGES/okular_fax.mo
 share/locale/sl/LC_MESSAGES/okular_fictionbook.mo
 share/locale/sl/LC_MESSAGES/okular_ghostview.mo
 share/locale/sl/LC_MESSAGES/okular_kimgio.mo
+share/locale/sl/LC_MESSAGES/okular_markdown.mo
 share/locale/sl/LC_MESSAGES/okular_mobi.mo
 share/locale/sl/LC_MESSAGES/okular_ooo.mo
 share/locale/sl/LC_MESSAGES/okular_plucker.mo
diff --git a/okular/distinfo b/okular/distinfo
index d9df627c3d..c336773647 100644
--- a/okular/distinfo
+++ b/okular/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.12 2017/01/19 09:25:49 markd Exp $
 
-SHA1 (okular-17.12.1.tar.xz) = 8eddb59efa630e859471ce4c775a725a54073048
-RMD160 (okular-17.12.1.tar.xz) = ea7faded7117351601d1530adf7f02c02236251f
-SHA512 (okular-17.12.1.tar.xz) = 875254e9a7e7832535f832900b74628db72c60dd0e49ba171aa5e1d5baea3cdf593148d693d1fd986cbe99f2b0519ab8c1b357d98d2dde846f128d9729cef614
-Size (okular-17.12.1.tar.xz) = 5720272 bytes
+SHA1 (okular-18.04.0.tar.xz) = cc4ba0fc464d1e9795916514252d301687fd2fdf
+RMD160 (okular-18.04.0.tar.xz) = 73270c6530590286722b30d07add083624033494
+SHA512 (okular-18.04.0.tar.xz) = 01ae6f4f4370e16fe67b04837e2ff4000d12d0934ae4c442d137cc99ade2dfca376b4b630aecb85a8efd727801f13fbef432ec37a08dec86739c994e202c79a9
+Size (okular-18.04.0.tar.xz) = 5777760 bytes
 SHA1 (patch-ui_pageview.cpp) = 15651ffbcd74727e64b34215fa507c8851462358
diff --git a/okular/hacks.mk b/okular/hacks.mk
deleted file mode 100644
index 9c686b8489..0000000000
--- a/okular/hacks.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2018/01/17 20:00:21 markd Exp $
-
-# linking -lQt5Widgets on NetBSD with gcc produces
-# ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
-# /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
-# unless -lexecinfo preceeds -lQt5Widgets
-BUILDLINK_TRANSFORM.NetBSD+=	l:Qt5Widgets:execinfo:Qt5Widgets