Date: Thu, 3 Apr 2014 11:59:08 GMT From: Mikhail <mp39590@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188222: update: graphics/feh Message-ID: <201404031159.s33Bx8fP048064@cgiserv.freebsd.org> Resent-Message-ID: <201404031200.s33C00sd095035@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188222 >Category: ports >Synopsis: update: graphics/feh >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 03 12:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Mikhail >Release: 10.0-RELEASE >Organization: >Environment: FreeBSD edge 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Attached patch do the following: - update from 2.9.3 to 2.10 - convert to new format of LIB_DEPENDS - moves PORTDOCS to pkg-plist and changes doc install method - add staging support >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN feh.orig/Makefile feh/Makefile --- feh.orig/Makefile 2014-04-03 14:30:37.000000000 +0400 +++ feh/Makefile 2014-04-03 15:45:07.000000000 +0400 @@ -2,8 +2,7 @@ # $FreeBSD: head/graphics/feh/Makefile 327733 2013-09-20 18:35:44Z bapt $ PORTNAME= feh -PORTVERSION= 2.9.3 -PORTREVISION= 2 +PORTVERSION= 2.10 CATEGORIES= graphics MASTER_SITES= http://feh.finalrewind.org/ \ ${MASTER_SITE_LOCAL} @@ -14,23 +13,18 @@ LICENSE= MIT -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - giblib.1:${PORTSDIR}/graphics/giblib +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libgiblib.so:${PORTSDIR}/graphics/giblib USE_XORG= x11 xt xinerama USES= gmake perl5 USE_PERL5= run USE_BZIP2= yes -MAN1= feh.1 feh-cam.1 gen-cam-menu.1 - CPPFLAGS+= -I${LOCALBASE}/include -std=c99 LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= LDFLAGS="${LDFLAGS}" -PORTDOCS= AUTHORS ChangeLog README TODO - -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -38,9 +32,7 @@ ${WRKSRC}/Makefile post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog README TODO" ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff -urN feh.orig/distinfo feh/distinfo --- feh.orig/distinfo 2014-04-03 14:30:37.000000000 +0400 +++ feh/distinfo 2014-04-03 14:31:49.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (feh-2.9.3.tar.bz2) = b4e8d603033af12afa77ae8020bcf4ff51c6950b9a6880a0fe32b04fdf7290f2 -SIZE (feh-2.9.3.tar.bz2) = 2082188 +SHA256 (feh-2.10.tar.bz2) = bc782a884eedd7a73284804d8145238f140fa59fed8d483102d1d25e8144ca83 +SIZE (feh-2.10.tar.bz2) = 2082905 diff -urN feh.orig/pkg-plist feh/pkg-plist --- feh.orig/pkg-plist 2014-04-03 14:30:37.000000000 +0400 +++ feh/pkg-plist 2014-04-03 15:37:02.000000000 +0400 @@ -2,9 +2,13 @@ bin/feh-cam bin/gen-cam-menu share/applications/feh.desktop -%%EXAMPLESDIR%%/buttons -%%EXAMPLESDIR%%/keys -%%EXAMPLESDIR%%/themes +man/man1/feh-cam.1.gz +man/man1/feh.1.gz +man/man1/gen-cam-menu.1.gz +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttons +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/themes %%DATADIR%%/fonts/black.style %%DATADIR%%/fonts/menu.style %%DATADIR%%/fonts/yudit.ttf @@ -16,7 +20,12 @@ %%DATADIR%%/images/menubg_brushed.png %%DATADIR%%/images/menubg_default.png %%DATADIR%%/images/menubg_sky.png +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%% @dirrm %%EXAMPLESDIR%% +@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404031159.s33Bx8fP048064>