From 5c35e3668950486a3347551a361ca0bcced00811 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Fri, 21 Feb 2020 18:06:23 +0000 Subject: [PATCH] Switch djview-4.10.6 from Qt4 to Qt5 OK jca@, merci --- graphics/djview4/Makefile | 21 +++++++++++---------- graphics/djview4/pkg/PLIST | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index d5fa453a1f8..998e97b3d4d 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.37 2019/07/12 20:46:57 sthen Exp $ +# $OpenBSD: Makefile,v 1.38 2020/02/21 18:06:23 rsadowski Exp $ COMMENT= portable DjVu viewer and browser plugin DISTNAME= djview-4.10.6 PKGNAME= ${DISTNAME:S/djview/djview4/} -REVISION= 6 +REVISION= 7 CATEGORIES= graphics print HOMEPAGE= http://djvu.sourceforge.net/djview4.html @@ -12,15 +12,13 @@ HOMEPAGE= http://djvu.sourceforge.net/djview4.html # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += GL ICE QtGui QtNetwork QtOpenGL SM X11 Xext Xi Xinerama -WANTLIB += Xrender c djvulibre fontconfig freetype glib-2.0 iconv intl m -WANTLIB += pcre pthread ${COMPILER_LIBCXX} tiff - -COMPILER = base-clang ports-gcc base-gcc +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL +WANTLIB += Qt5PrintSupport Qt5Widgets c djvulibre glib-2.0 iconv +WANTLIB += intl m pcre tiff MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} -MODULES= x11/qt4 +MODULES= x11/qt5 LIB_DEPENDS= graphics/djvulibre @@ -28,9 +26,12 @@ RUN_DEPENDS= devel/desktop-file-utils \ x11/gtk+3,-guic USE_GMAKE= Yes + CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --with-tiff=${LOCALBASE} -CONFIGURE_ENV+= QTDIR="${MODQT4_QTDIR}" \ + +CONFIGURE_ARGS= -with-tiff=${LOCALBASE} + +CONFIGURE_ENV+= QTDIR="${MODQT_QTDIR}" \ CPPFLAGS="-I${X11BASE}/include" MAKE_ENV+= V=1 diff --git a/graphics/djview4/pkg/PLIST b/graphics/djview4/pkg/PLIST index 4c4dfcdba50..20b0239d183 100644 --- a/graphics/djview4/pkg/PLIST +++ b/graphics/djview4/pkg/PLIST @@ -1,9 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.10 2018/06/29 22:16:16 espie Exp $ +@comment $OpenBSD: PLIST,v 1.11 2020/02/21 18:06:23 rsadowski Exp $ @bin bin/djview lib/mozilla/ lib/mozilla/plugins/ @comment lib/mozilla/plugins/nsdejavu.la -lib/mozilla/plugins/nsdejavu.so +@so lib/mozilla/plugins/nsdejavu.so @man man/man1/djview.1 @man man/man1/nsdejavu.1 share/applications/djvulibre-djview4.desktop