apvlv: Update wip/apvlv to apvlv-0.1.5.

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Oct 24 16:46:36 2015 +0200
Changeset:	1629d7bd526d0a14ba0634bd5ad946e202e0d9f3

Modified Files:
	apvlv/DESCR
	apvlv/Makefile
	apvlv/PLIST
	apvlv/distinfo
Added Files:
	apvlv/patches/patch-src_ApvlvPdf.cc
Removed Files:
	apvlv/patches/patch-aa

Log Message:
apvlv: Update wip/apvlv to apvlv-0.1.5.

pkgsrc changes:
o Update DESCR, COMMENT and GITHUB-ify the package to reflect current
  reality.

Changes:
apvlv 0.1.4
===========
Add TXT format support

apvlv 0.1.3
===========
Add HTML format support

apvlv 0.1.2
===========
Just swaped source from svn to git

apvlv 0.1.1
===========
News features
   * add '[int]s' to support skip some pages for some document
   * sorted in dir mode by filename
   * using 't' to open file in new tab window
   * using 'T' to open directory in new tab window

apvlv 0.1.0
===========
News features
   * UMD file support
   * using CMake for auto build tool
   * add rpm and deb installation package

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

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

diffstat:
 apvlv/DESCR                         |  3 ++-
 apvlv/Makefile                      | 21 ++++++++++++++-------
 apvlv/PLIST                         | 11 +++++++----
 apvlv/distinfo                      |  9 +++++----
 apvlv/patches/patch-aa              | 17 -----------------
 apvlv/patches/patch-src_ApvlvPdf.cc | 14 ++++++++++++++
 6 files changed, 42 insertions(+), 33 deletions(-)

diffs:
diff --git a/apvlv/DESCR b/apvlv/DESCR
index 1d51254..78d6a03 100644
--- a/apvlv/DESCR
+++ b/apvlv/DESCR
@@ -1 +1,2 @@
-apvlv is a PDF Viewer Under Linux and its behaviour like Vim.
+apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux and its behaviour like
+Vim.
diff --git a/apvlv/Makefile b/apvlv/Makefile
index ea12469..723ce99 100644
--- a/apvlv/Makefile
+++ b/apvlv/Makefile
@@ -1,20 +1,27 @@
 # $NetBSD: Makefile,v 1.8 2012/09/24 16:56:38 asau Exp $
 #
 
-DISTNAME=	apvlv-0.0.9.2
-PKGREVISION=	1
+DISTNAME=	apvlv-0.1.5
 CATEGORIES=	print
-MASTER_SITES=	http://apvlv.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=naihe2010/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://apvlv.googlecode.com/
-COMMENT=	PDF Viewer which behaves like Vim
+HOMEPAGE=	http://naihe2010.github.io/apvlv/
+COMMENT=	PDF/DJVU/UMD/TXT Viewer which behaves like Vim
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
+SUBST_CLASSES+=			cmakelists
+SUBST_STAGE.cmakelists=		pre-configure
+SUBST_MESSAGE.cmakelists=	Fixing CMakeLists.txt
+SUBST_FILES.cmakelists=		CMakeLists.txt
+SUBST_SED.cmakelists+=		-e 's,share/man,${PKGMANDIR},g'
+
 .include "../../print/poppler-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/apvlv/PLIST b/apvlv/PLIST
index caa3cd0..b9e2791 100644
--- a/apvlv/PLIST
+++ b/apvlv/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/24 20:24:48 leot1990 Exp $
+@comment $NetBSD$
 bin/apvlv
 man/man1/apvlv.1
+share/applications/apvlv.desktop
 share/doc/apvlv/Startup.pdf
+share/doc/apvlv/Startup.tex
 share/doc/apvlv/apvlvrc.example
-share/doc/apvlv/dir.png
-share/doc/apvlv/pdf.png
-share/doc/apvlv/reg.png
+share/doc/apvlv/icons/dir.png
+share/doc/apvlv/icons/pdf.png
+share/doc/apvlv/icons/reg.png
+share/doc/apvlv/main_menubar.glade
diff --git a/apvlv/distinfo b/apvlv/distinfo
index e6256b0..b782c89 100644
--- a/apvlv/distinfo
+++ b/apvlv/distinfo
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.3 2010/01/24 12:42:23 leot1990 Exp $
 
-SHA1 (apvlv-0.0.9.2.tar.gz) = 64dcc808f36f699adb40a453466d78ed4dd0702f
-RMD160 (apvlv-0.0.9.2.tar.gz) = 04d6e9f4c5466b8a8691de887cdcaedcf1ec173f
-Size (apvlv-0.0.9.2.tar.gz) = 211694 bytes
-SHA1 (patch-aa) = 64aaafa86f5037ab45d3e8252e478aeefac47c50
+SHA1 (apvlv-0.1.5.tar.gz) = 96e6e71e3c03957d48e540c63f15a8a1ae00c3d6
+RMD160 (apvlv-0.1.5.tar.gz) = 5b9c491ec036d7b8720718033d3f683abb98a446
+SHA512 (apvlv-0.1.5.tar.gz) = 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
+Size (apvlv-0.1.5.tar.gz) = 4254177 bytes
+SHA1 (patch-src_ApvlvPdf.cc) = 3bdbe4fac3b3e1c7da7398598553d3d44f7df83f
diff --git a/apvlv/patches/patch-aa b/apvlv/patches/patch-aa
deleted file mode 100644
index f7fa735..0000000
--- a/apvlv/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/01/24 12:42:23 leot1990 Exp $
-
-According to wait(2) to use wait4() <sys/resource.h> and <sys/wait.h> should
-be included.
-
---- src/ApvlvUtil.cpp.orig	2010-01-20 05:52:51.000000000 +0100
-+++ src/ApvlvUtil.cpp
-@@ -30,7 +30,8 @@
- 
- #include <stdlib.h>
- #ifndef WIN32
--#include <wait.h>
-+#include <sys/resource.h>
-+#include <sys/wait.h>
- #endif
- #include <gtk/gtk.h>
- 
diff --git a/apvlv/patches/patch-src_ApvlvPdf.cc b/apvlv/patches/patch-src_ApvlvPdf.cc
new file mode 100644
index 0000000..1a9659d
--- /dev/null
+++ b/apvlv/patches/patch-src_ApvlvPdf.cc
@@ -0,0 +1,14 @@
+$NetBSD$
+
+goo/gtypes.h is not exported and seems not strictly needed by ApvlvPdf.cc.
+
+--- src/ApvlvPdf.cc.orig	2015-01-10 14:04:24.000000000 +0000
++++ src/ApvlvPdf.cc
+@@ -29,7 +29,6 @@
+ #include "ApvlvPdf.h"
+ 
+ #ifndef POPPLER_WITH_GDK
+-#include <goo/gtypes.h>
+ 
+ static void
+ copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,