From owner-svn-ports-all@FreeBSD.ORG Thu Sep 26 14:07:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DCD84F14; Thu, 26 Sep 2013 14:07:09 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B0DFE2C21; Thu, 26 Sep 2013 14:07:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QE79Ig055093; Thu, 26 Sep 2013 14:07:09 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QE79He055091; Thu, 26 Sep 2013 14:07:09 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201309261407.r8QE79He055091@svn.freebsd.org> From: William Grzybowski Date: Thu, 26 Sep 2013 14:07:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328362 - head/graphics/apvlv X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Sep 2013 14:07:10 -0000 Author: wg Date: Thu Sep 26 14:07:08 2013 New Revision: 328362 URL: http://svnweb.freebsd.org/changeset/ports/328362 Log: graphics/apvlv: allow staging - Allow staging [1] - Use options helpers [1] - Convert lib depends to new format PR: ports/182383 [1] Submitted by: Maxim Samsonov (maintainer) [1] Modified: head/graphics/apvlv/Makefile head/graphics/apvlv/pkg-plist Modified: head/graphics/apvlv/Makefile ============================================================================== --- head/graphics/apvlv/Makefile Thu Sep 26 13:59:42 2013 (r328361) +++ head/graphics/apvlv/Makefile Thu Sep 26 14:07:08 2013 (r328362) @@ -12,7 +12,7 @@ COMMENT= PDF/DJVU Viewer that behaves li LICENSE= GPLv2 -LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib +LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib USE_GNOME= gtk20 USES= cmake pkgconfig @@ -22,28 +22,16 @@ CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc -DAPVLV_WITH_UMD=OFF \ -DAPVLV_WITH_TXT=ON -MAN1= apvlv.1 - OPTIONS_DEFINE= DJVU WEBKIT -DJVU_DESC= Build with DjVu support -WEBKIT_DESC= Build with WebKit support - -NO_STAGE= yes -.include +DJVU_DESC= DjVu document support -.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 +DJVU_CMAKE_ON= -DAPVLV_WITH_DJVU=ON +DJVU_CMAKE_OFF= -DAPVLV_WITH_DJVU=OFF +DJVU_LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre + +WEBKIT_CMAKE_ON= -DAPVLV_WITH_HTML=ON +WEBKIT_CMAKE_OFF= -DAPVLV_WITH_HTML=OFF +WEBKIT_LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 .include Modified: head/graphics/apvlv/pkg-plist ============================================================================== --- head/graphics/apvlv/pkg-plist Thu Sep 26 13:59:42 2013 (r328361) +++ head/graphics/apvlv/pkg-plist Thu Sep 26 14:07:08 2013 (r328362) @@ -1,5 +1,6 @@ bin/apvlv etc/apvlvrc +man/man1/apvlv.1.gz %%DOCSDIR%%/Startup.pdf %%DOCSDIR%%/Startup.tex %%DOCSDIR%%/apvlvrc.example