6 files changed, 57 insertions, 29 deletions

diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index 196fd501b54e..b77925da3798 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -6,20 +6,36 @@
 #
 
 PORTNAME=	apvlv
-PORTVERSION=	0.0.9.8
-PORTREVISION=	2
+PORTVERSION=	0.1.2
 CATEGORIES=	graphics
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://cloud.github.com/downloads/naihe2010/apvlv/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Apvlv is a PDF Viewer Under Linux and its behaviour like Vim
+MAINTAINER=	xors@imap.cc
+COMMENT=	Apvlv is a PDF/DJVU Viewer and its behaviour like Vim
+
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-sysconfdir=${PREFIX}/etc
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc \
+		-DMANDIR=${MANPREFIX}/man \
+		-DDOCDIR=${DOCSDIR} \
+		-DAPVLV_WITH_UMD=OFF
 
 MAN1=		apvlv.1
 
+OPTIONS=	DJVU	"Enable DJVU support"	off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_DJVU)
+CMAKE_ARGS+=	-DAPVLV_WITH_DJVU=OFF
+.else
+CMAKE_ARGS+=	-DAPVLV_WITH_DJVU=ON
+LIB_DEPENDS+=	djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/apvlv/distinfo b/graphics/apvlv/distinfo
index 289bfd05d859..e426fa6f7e8b 100644
--- a/graphics/apvlv/distinfo
+++ b/graphics/apvlv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apvlv-0.0.9.8.tar.gz) = adb2ac18e3e75c51b2a5e378d67837b0c15b87e1e3aad05f3501565c4671f902
-SIZE (apvlv-0.0.9.8.tar.gz) = 219536
+SHA256 (apvlv-0.1.2-Source.tar.gz) = 65f010287dd98644d25997f95054bc95abc22fd8d5e2d7bc3b3b59978fbb470a
+SIZE (apvlv-0.1.2-Source.tar.gz) = 331595
diff --git a/graphics/apvlv/files/patch-src_ApvlvDir.cpp b/graphics/apvlv/files/patch-src_ApvlvDir.cpp
new file mode 100644
index 000000000000..d3e787d87e8d
--- /dev/null
+++ b/graphics/apvlv/files/patch-src_ApvlvDir.cpp
@@ -0,0 +1,11 @@
+--- src/ApvlvDir.cpp.orig	2011-06-24 11:30:12.000000000 +0400
++++ src/ApvlvDir.cpp	2011-10-11 22:07:59.000000000 +0400
+@@ -49,7 +49,7 @@
+   realname = NULL;
+ 
+   GtkTreeIter nitr[1];
+-  gtk_tree_store_append (dir->mStore, itr, ir);
++  gtk_tree_store_append (dir->mStore, nitr, ir);
+   *itr = *nitr;
+ 
+   GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size (iconreg.c_str (), 40,
diff --git a/graphics/apvlv/files/patch-src_ApvlvFile.cpp b/graphics/apvlv/files/patch-src_ApvlvFile.cpp
index ab16c19eac78..1c4609d6e4e6 100644
--- a/graphics/apvlv/files/patch-src_ApvlvFile.cpp
+++ b/graphics/apvlv/files/patch-src_ApvlvFile.cpp
@@ -1,14 +1,14 @@
---- src/ApvlvFile.cpp.orig	2011-08-12 10:22:23.000000000 +0200
-+++ src/ApvlvFile.cpp	2011-08-12 10:24:26.000000000 +0200
-@@ -273,9 +273,9 @@ ApvlvPDF::ApvlvPDF (const char *filename
+--- src/ApvlvFile.cpp.orig	2011-06-24 11:30:12.000000000 +0400
++++ src/ApvlvFile.cpp	2011-10-10 01:01:26.000000000 +0400
+@@ -302,9 +302,9 @@
  
-   bool ApvlvPDF::pagetext (int pn, int x1, int y1, int x2, int y2, char **out)
-   {
--    PopplerRectangle rect = { x1, y1, x2, y2 };
-     PopplerPage *page = poppler_document_get_page (mDoc, pn);
--    *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+    PopplerRectangle rect = { x1, y2, x2, y1 };
-+    *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
-     if (*out != NULL)
-       {
- 	return true;
+ bool ApvlvPDF::pagetext (int pn, int x1, int y1, int x2, int y2, char **out)
+ {
+-  PopplerRectangle rect = { x1, y1, x2, y2 };
+   PopplerPage *page = poppler_document_get_page (mDoc, pn);
+-  *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
++  PopplerRectangle rect = { x1, y2, x2, y1 };
++  *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
+   if (*out != NULL)
+     {
+       return true;
diff --git a/graphics/apvlv/pkg-descr b/graphics/apvlv/pkg-descr
index 0a8dc5e757fe..37f717befccc 100644
--- a/graphics/apvlv/pkg-descr
+++ b/graphics/apvlv/pkg-descr
@@ -1,3 +1,3 @@
-Apvlv is a PDF Viewer and its behaviour like Vim.
+Apvlv is a PDF/DJVU Viewer and its behaviour like Vim.
 
-WWW: http://code.google.com/p/apvlv/
+WWW: http://naihe2010.github.com/apvlv/
diff --git a/graphics/apvlv/pkg-plist b/graphics/apvlv/pkg-plist
index 25e0ecc84c5d..bae4a8ceb5d4 100644
--- a/graphics/apvlv/pkg-plist
+++ b/graphics/apvlv/pkg-plist
@@ -1,9 +1,10 @@
 bin/apvlv
 etc/apvlvrc
-%%DOCSDIR%%/apvlvrc.example
-%%DOCSDIR%%/reg.png
-%%DOCSDIR%%/dir.png
-%%DOCSDIR%%/pdf.png
 %%DOCSDIR%%/Startup.pdf
 %%DOCSDIR%%/Startup.tex
+%%DOCSDIR%%/apvlvrc.example
+%%DOCSDIR%%/icons/dir.png
+%%DOCSDIR%%/icons/pdf.png
+%%DOCSDIR%%/icons/reg.png
+@dirrm %%DOCSDIR%%/icons
 @dirrm %%DOCSDIR%%