Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Oct 2012 11:29:24 +0000 (UTC)
From:      Carlo Strub <cs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305459 - in head/graphics/apvlv: . files
Message-ID:  <201210071129.q97BTOWS089313@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cs
Date: Sun Oct  7 11:29:24 2012
New Revision: 305459
URL: http://svn.freebsd.org/changeset/ports/305459

Log:
  - Update to 0.1.4
  - Convert to new options framework
  - Update maintainer's e-mail address
  - Cleanup COMMENT and pkg-descr
  
  PR:		ports/172360
  Submitted by:	Maxim Samsonov <xors@imap.cc> (maintainer)

Added:
  head/graphics/apvlv/files/patch-src_CMakeLists.txt   (contents, props changed)
Deleted:
  head/graphics/apvlv/files/patch-poppler-0.18
  head/graphics/apvlv/files/patch-src_ApvlvDir.cpp
  head/graphics/apvlv/files/patch-src_ApvlvFile.cpp
Modified:
  head/graphics/apvlv/Makefile
  head/graphics/apvlv/distinfo
  head/graphics/apvlv/pkg-descr

Modified: head/graphics/apvlv/Makefile
==============================================================================
--- head/graphics/apvlv/Makefile	Sun Oct  7 11:29:06 2012	(r305458)
+++ head/graphics/apvlv/Makefile	Sun Oct  7 11:29:24 2012	(r305459)
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	apvlv
-PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTVERSION=	0.1.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://cloud.github.com/downloads/naihe2010/apvlv/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
-MAINTAINER=	xors@imap.cc
-COMMENT=	Apvlv is a PDF/DJVU Viewer and its behaviour like Vim
+MAINTAINER=	xors@mailup.net
+COMMENT=	PDF/DJVU Viewer that behaves like Vim
 
 LICENSE=	GPLv2
 
@@ -25,19 +24,30 @@ MAKE_JOBS_SAFE=	yes
 CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc \
 		-DMANDIR=${MANPREFIX}/man \
 		-DDOCDIR=${DOCSDIR} \
-		-DAPVLV_WITH_UMD=OFF
+		-DAPVLV_WITH_UMD=OFF \
+		-DAPVLV_WITH_TXT=ON
 
 MAN1=		apvlv.1
 
-OPTIONS=	DJVU	"Enable DJVU support"	off
+OPTIONS_DEFINE=	DJVU WEBKIT
+
+DJVU_DESC=	Build with DjVu support
+WEBKIT_DESC=	Build with WebKit support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_DJVU)
-CMAKE_ARGS+=	-DAPVLV_WITH_DJVU=OFF
-.else
+.if ${PORT_OPTIONS:MDJVU}
 CMAKE_ARGS+=	-DAPVLV_WITH_DJVU=ON
 LIB_DEPENDS+=	djvulibre:${PORTSDIR}/graphics/djvulibre
+.else
+CMAKE_ARGS+=	-DAPVLV_WITH_DJVU=OFF
+.endif
+
+.if ${PORT_OPTIONS:MWEBKIT}
+CMAKE_ARGS+=	-DAPVLV_WITH_HTML=ON
+LIB_DEPENDS+=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+.else
+CMAKE_ARGS+=	-DAPVLV_WITH_HTML=OFF
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/apvlv/distinfo
==============================================================================
--- head/graphics/apvlv/distinfo	Sun Oct  7 11:29:06 2012	(r305458)
+++ head/graphics/apvlv/distinfo	Sun Oct  7 11:29:24 2012	(r305459)
@@ -1,2 +1,2 @@
-SHA256 (apvlv-0.1.2-Source.tar.gz) = 65f010287dd98644d25997f95054bc95abc22fd8d5e2d7bc3b3b59978fbb470a
-SIZE (apvlv-0.1.2-Source.tar.gz) = 331595
+SHA256 (apvlv-0.1.4-Source.tar.gz) = f803de89aed82fea08f9386a6d6ddec999d0c96bb68c85e4cd527803838d17cd
+SIZE (apvlv-0.1.4-Source.tar.gz) = 337182

Added: head/graphics/apvlv/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/apvlv/files/patch-src_CMakeLists.txt	Sun Oct  7 11:29:24 2012	(r305459)
@@ -0,0 +1,43 @@
+--- src/CMakeLists.txt.orig	2012-06-13 07:44:28.000000000 +0400
++++ src/CMakeLists.txt	2012-10-05 01:07:49.000000000 +0400
+@@ -17,17 +17,14 @@
+ PKG_CHECK_MODULES (GTK2 gtk+-2.0 REQUIRED)
+ PKG_CHECK_MODULES (GLIB2 glib-2.0 REQUIRED)
+ PKG_CHECK_MODULES (GTHREAD2 gthread-2.0 REQUIRED)
+-PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 QUIET)
+ INCLUDE_DIRECTORIES (${FREETYPE2_INCLUDE_DIRS} 
+                      ${GTK2_INCLUDE_DIRS} 
+                      ${GLIB2_INCLUDE_DIRS} 
+-                     ${GTHREAD2_INCLUDE_DIRS}
+-                     ${WEBKIT1_INCLUDE_DIRS})
++                     ${GTHREAD2_INCLUDE_DIRS})
+ LINK_DIRECTORIES (${FREETYPE2_LIBRARY_DIRS}
+                   ${GTK2_LIBRARY_DIRS} 
+                   ${GLIB2_LIBRARY_DIRS} 
+-                  ${GTHREAD2_LIBRARY_DIRS}
+-                  ${WEBKIT1_LIBRARY_DIRS})
++                  ${GTHREAD2_LIBRARY_DIRS})
+ 
+ IF (WIN32)
+         SET (POPPLER_DIR ${CMAKE_HOME_DIRECTORY}/win32/poppler-src)
+@@ -128,6 +125,12 @@
+ IF (APVLV_WITH_HTML)
+         ADD_DEFINITIONS (-DAPVLV_WITH_HTML)
+ 
++        PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 REQUIRED)
++        INCLUDE_DIRECTORIES (${WEBKIT1_INCLUDE_DIRS})
++        LINK_DIRECTORIES (${WEBKIT1_LIBRARY_DIRS})
++        SET (APVLV_REQ_LIBRARIES ${WEBKIT1_LIBRARIES}
++             ${APVLV_REQ_LIBRARIES})
++
+         SET (HEADERS ${HEADERS} ApvlvHtm.h)
+         SET (SOURCES ${SOURCES} ApvlvHtm.cc)
+ ENDIF (APVLV_WITH_HTML)
+@@ -138,7 +141,6 @@
+                        ${GTK2_LIBRARIES} 
+                        ${GLIB2_LIBRARIES} 
+                        ${GTHREAD2_LIBRARIES}
+-                       ${WEBKIT1_LIBRARIES}
+                        ${APVLV_REQ_LIBRARIES})
+ 
+ IF (WIN32)
\ No newline at end of file

Modified: head/graphics/apvlv/pkg-descr
==============================================================================
--- head/graphics/apvlv/pkg-descr	Sun Oct  7 11:29:06 2012	(r305458)
+++ head/graphics/apvlv/pkg-descr	Sun Oct  7 11:29:24 2012	(r305459)
@@ -1,3 +1,3 @@
-Apvlv is a PDF/DJVU Viewer and its behaviour like Vim.
+Apvlv is a PDF/DJVU Viewer and its behaviour is like Vim's.
 
 WWW: http://naihe2010.github.com/apvlv/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210071129.q97BTOWS089313>