From cb1da0787245925770692d1e9d26f3de5e43b630 Mon Sep 17 00:00:00 2001 From: Niclas Zeising Date: Wed, 12 Jul 2017 18:55:25 +0000 Subject: [PATCH] Update to 2.19 Make DOC option work, and add EXAMPLES and EXIF options, and make use of OPTIONS_SUB [0] ChangeLog: https://feh.finalrewind.org/archive/2.19/ PR: 217802 [0] Submitted by: Piotr Kubaj [0] --- graphics/feh/Makefile | 26 +++++++++++++++++++------- graphics/feh/distinfo | 6 +++--- graphics/feh/pkg-plist | 16 ++++++++-------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index 976644a9354c..b130d51d5bd3 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= feh -PORTVERSION= 2.18 +PORTVERSION= 2.19 CATEGORIES= graphics MASTER_SITES= http://feh.finalrewind.org/ \ LOCAL/uqs @@ -26,21 +26,33 @@ CPPFLAGS+= -I${LOCALBASE}/include -std=c99 LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= LDFLAGS="${LDFLAGS}" -OPTIONS_DEFINE= CAM DOCS +OPTIONS_DEFINE= CAM DOCS EXAMPLES EXIF CAM_DESC= Install feh-cam and related tools -OPTIONS_DEFAULT=CAM +EXIF_DESC= Support EXIF tags +OPTIONS_DEFAULT=CAM EXIF +OPTIONS_SUB= yes + +EXIF_LIB_DEPENDS= libexif.so:graphics/libexif .include .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 +.if ${PORT_OPTIONS:MEXIF} +MAKE_ENV+= exif=1 +.endif + +post-patch-DOCS-off: + @${REINPLACE_CMD} -e 's|install-doc||' \ + ${WRKSRC}/Makefile + +post-patch-EXAMPLES-off: + @${REINPLACE_CMD} -e 's|install-examples||' \ + ${WRKSRC}/Makefile + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo index 839f51f59280..4955b5f9029d 100644 --- a/graphics/feh/distinfo +++ b/graphics/feh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481670680 -SHA256 (feh-2.18.tar.bz2) = 9daebf5195511a5bde8061c932b5585b956c81193dfc00abcd758316d07ed40c -SIZE (feh-2.18.tar.bz2) = 2127627 +TIMESTAMP = 1499798030 +SHA256 (feh-2.19.tar.bz2) = cebe25d8393a07aa79a6b2f99beb133d8de0cbc00d46bccc4df276248cc9d0e9 +SIZE (feh-2.19.tar.bz2) = 2128358 diff --git a/graphics/feh/pkg-plist b/graphics/feh/pkg-plist index e3ad2cd307ef..c6bc96a50687 100644 --- a/graphics/feh/pkg-plist +++ b/graphics/feh/pkg-plist @@ -1,14 +1,16 @@ bin/feh %%CAM%%bin/feh-cam %%CAM%%bin/gen-cam-menu -share/applications/feh.desktop -share/icons/hicolor/48x48/apps/feh.png -share/icons/hicolor/scalable/apps/feh.svg %%CAM%%man/man1/feh-cam.1.gz man/man1/feh.1.gz %%CAM%%man/man1/gen-cam-menu.1.gz -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres +share/applications/feh.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttons +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys %%PORTEXAMPLES%%%%EXAMPLESDIR%%/themes %%DATADIR%%/fonts/black.style @@ -22,7 +24,5 @@ man/man1/feh.1.gz %%DATADIR%%/images/menubg_brushed.png %%DATADIR%%/images/menubg_default.png %%DATADIR%%/images/menubg_sky.png -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/TODO +share/icons/hicolor/48x48/apps/feh.png +share/icons/hicolor/scalable/apps/feh.svg