Fix qpdfview.

Don't use DESTDIR in qpdfview.pri since this makes qpdfview look for
it's plugins under ${DESTDIR}${PREFIX} when it should look under
${PREFIX} .
Use INSTALL_ROOT to install into DESTDIR.
Use environment variables instead of the substitution framework to set
PREFIX and PKGMANDIR.
Bump PKGREVISION.

3 files changed, 15 insertions, 19 deletions

diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index f96a0be339a..f48955ced9c 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2016/04/15 14:42:53 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/04/22 09:35:00 nros Exp $
 
 VER=		0.4.16
 DISTNAME=	qpdfview-${VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	https://launchpad.net/qpdfview/trunk/${VER}/+download/
 
@@ -14,18 +14,14 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	poppler-data-[0-9]*:../../print/poppler-data
 DEPENDS+=	qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
 
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	pre-configure
-SUBST_MESSAGE.prefix=	Fix install path
-SUBST_FILES.prefix+=	qpdfview.pri
-SUBST_VARS.prefix+=	DESTDIR PREFIX PKGMANDIR
-
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 USE_LIBTOOL=	yes
 
+INSTALL_MAKE_FLAGS+=    INSTALL_ROOT=${DESTDIR}
+
 do-configure:
-	cd ${WRKSRC} && QTDIR=${QTDIR} \
+	cd ${WRKSRC} && env ${CONFIGURE_ENV} PKGMANDIR=${PKGMANDIR} \
 		${QTDIR}/bin/qmake qpdfview.pro
 
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
diff --git a/print/qpdfview/distinfo b/print/qpdfview/distinfo
index f91842720b1..90d0afd1fc0 100644
--- a/print/qpdfview/distinfo
+++ b/print/qpdfview/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/03/09 17:45:51 nros Exp $
+$NetBSD: distinfo,v 1.5 2016/04/22 09:35:00 nros Exp $
 
 SHA1 (qpdfview-0.4.16.tar.gz) = aa6c8445c23ab9188b2dc2b7dccb500bd11f1c21
 RMD160 (qpdfview-0.4.16.tar.gz) = a52cd6c1bb62fec56f2eea28e4ab6ae74ef49d6a
 SHA512 (qpdfview-0.4.16.tar.gz) = d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
 Size (qpdfview-0.4.16.tar.gz) = 636095 bytes
 SHA1 (patch-application.pro) = 3c8c1482e1a10d0460e8adbd6b249f8ee8e7adf9
-SHA1 (patch-qpdfview.pri) = 8d43bc2009d5ce5f6fffdebfb5c4dd5be42a72e6
+SHA1 (patch-qpdfview.pri) = a9f51b2031a734abc2f1c68efa49e0aa043fc107
diff --git a/print/qpdfview/patches/patch-qpdfview.pri b/print/qpdfview/patches/patch-qpdfview.pri
index 3d1d32e8457..a83cba1dfd2 100644
--- a/print/qpdfview/patches/patch-qpdfview.pri
+++ b/print/qpdfview/patches/patch-qpdfview.pri
@@ -1,4 +1,4 @@
-$NetBSD: patch-qpdfview.pri,v 1.3 2016/03/09 17:45:52 nros Exp $
+$NetBSD: patch-qpdfview.pri,v 1.4 2016/04/22 09:35:00 nros Exp $
 
 * Set install places
 
@@ -14,13 +14,13 @@ $NetBSD: patch-qpdfview.pri,v 1.3 2016/03/09 17:45:52 nros Exp $
 -isEmpty(ICON_INSTALL_PATH):ICON_INSTALL_PATH = /usr/share/icons/hicolor/scalable/apps
 -isEmpty(LAUNCHER_INSTALL_PATH):LAUNCHER_INSTALL_PATH = /usr/share/applications
 -isEmpty(APPDATA_INSTALL_PATH):APPDATA_INSTALL_PATH = /usr/share/appdata
-+isEmpty(TARGET_INSTALL_PATH):TARGET_INSTALL_PATH = @DESTDIR@@PREFIX@/bin
-+isEmpty(PLUGIN_INSTALL_PATH):PLUGIN_INSTALL_PATH = @DESTDIR@@PREFIX@/lib/qpdfview
-+isEmpty(DATA_INSTALL_PATH):DATA_INSTALL_PATH = @DESTDIR@@PREFIX@/share/qpdfview
-+isEmpty(MANUAL_INSTALL_PATH):MANUAL_INSTALL_PATH = @DESTDIR@@PREFIX@/@PKGMANDIR@/man1
-+isEmpty(ICON_INSTALL_PATH):ICON_INSTALL_PATH = @DESTDIR@@PREFIX@/share/icons/hicolor
-+isEmpty(LAUNCHER_INSTALL_PATH):LAUNCHER_INSTALL_PATH = @DESTDIR@@PREFIX@/share/applications
-+isEmpty(APPDATA_INSTALL_PATH):APPDATA_INSTALL_PATH = @DESTDIR@@PREFIX@/share/appdata
++isEmpty(TARGET_INSTALL_PATH):TARGET_INSTALL_PATH = $$(PREFIX)/bin
++isEmpty(PLUGIN_INSTALL_PATH):PLUGIN_INSTALL_PATH = $$(PREFIX)/lib/qpdfview
++isEmpty(DATA_INSTALL_PATH):DATA_INSTALL_PATH = $$(PREFIX)/share/qpdfview
++isEmpty(MANUAL_INSTALL_PATH):MANUAL_INSTALL_PATH = $$(PREFIX)/$$(PKGMANDIR)/man1
++isEmpty(ICON_INSTALL_PATH):ICON_INSTALL_PATH = $$(PREFIX)/share/icons/hicolor
++isEmpty(LAUNCHER_INSTALL_PATH):LAUNCHER_INSTALL_PATH = $$(PREFIX)/share/applications
++isEmpty(APPDATA_INSTALL_PATH):APPDATA_INSTALL_PATH = $$(PREFIX)/share/appdata
  
  win32:include(qpdfview_win32.pri)
  os2:include(qpdfview_os2.pri)