Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Sep 2013 14:07:09 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328362 - head/graphics/apvlv
Message-ID:  <201309261407.r8QE79He055091@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <xors mailup.net> (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 <bsd.port.options.mk>
+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 <bsd.port.mk>

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



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