svn commit: r357864 - head/graphics/feh

[Niclas Zeising]

Author: zeising
Date: Sun Jun 15 10:26:46 2014
New Revision: 357864
URL: http://svnweb.freebsd.org/changeset/ports/357864
QAT: https://qat.redports.org/buildarchive/r357864/

Log:
  Update to 2.12 [1]
  
  Add CAM option, controlling the install of feh-cam and gen-cam-menu, on by
  default.
  
  Changelog:	http://feh.finalrewind.org/archive/2.12/
  
  PR:		190618 [1]
  Submitted by:	<mp39590 at gmail.com> [1]

Modified:
  head/graphics/feh/Makefile
  head/graphics/feh/distinfo
  head/graphics/feh/pkg-plist

Modified: head/graphics/feh/Makefile
==============================================================================
--- head/graphics/feh/Makefile	Sun Jun 15 10:03:38 2014	(r357863)
+++ head/graphics/feh/Makefile	Sun Jun 15 10:26:46 2014	(r357864)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	feh
-PORTVERSION=	2.10
+PORTVERSION=	2.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/ \
 		${MASTER_SITE_LOCAL}
@@ -13,20 +13,33 @@ COMMENT=	Image viewer that utilizes Imli
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgiblib.so:${PORTSDIR}/graphics/giblib
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USE_XORG=	x11 xt xinerama
 USES=		gmake perl5 tar:bzip2 shebangfix desktop-file-utils
+USE_EFL=	imlib2
 USE_PERL5=	run
-SHEBANG_FILES=	${WRKSRC}/cam/feh-cam
 
 CPPFLAGS+=	-I${LOCALBASE}/include -std=c99
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
+OPTIONS_DEFINE=	CAM
+CAM_DESC=	Install feh-cam and related tools
+OPTIONS_DEFAULT=CAM
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCAM}
+MAKE_ENV+=	cam=1
+SHEBANG_FILES=	${WRKSRC}/cam/feh-cam
+PLIST_SUB=	CAM=""
+.else
+MAKE_ENV+=	cam=0
+PLIST_SUB=	CAM="@comment "
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh
 
-
 .include <bsd.port.mk>

Modified: head/graphics/feh/distinfo
==============================================================================
--- head/graphics/feh/distinfo	Sun Jun 15 10:03:38 2014	(r357863)
+++ head/graphics/feh/distinfo	Sun Jun 15 10:26:46 2014	(r357864)
@@ -1,2 +1,2 @@
-SHA256 (feh-2.10.tar.bz2) = bc782a884eedd7a73284804d8145238f140fa59fed8d483102d1d25e8144ca83
-SIZE (feh-2.10.tar.bz2) = 2082905
+SHA256 (feh-2.12.tar.bz2) = 60e07a0f545f6fb7af7b6c0d2ce1ba6bacfa65380e83cbbc2c54e8aa6b8b7032
+SIZE (feh-2.12.tar.bz2) = 2090538

Modified: head/graphics/feh/pkg-plist
==============================================================================
--- head/graphics/feh/pkg-plist	Sun Jun 15 10:03:38 2014	(r357863)
+++ head/graphics/feh/pkg-plist	Sun Jun 15 10:26:46 2014	(r357864)
@@ -1,10 +1,10 @@
 bin/feh
-bin/feh-cam
-bin/gen-cam-menu
+%%CAM%%bin/feh-cam
+%%CAM%%bin/gen-cam-menu
 share/applications/feh.desktop
-man/man1/feh-cam.1.gz
+%%CAM%%man/man1/feh-cam.1.gz
 man/man1/feh.1.gz
-man/man1/gen-cam-menu.1.gz
+%%CAM%%man/man1/gen-cam-menu.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttons
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys