From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 3 12:00:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTPS id CE4A760D for ; Thu, 3 Apr 2014 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB005272 for ; Thu, 3 Apr 2014 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s33C00JU095036 for ; Thu, 3 Apr 2014 12:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s33C00sd095035; Thu, 3 Apr 2014 12:00:00 GMT (envelope-from gnats) Resent-Date: Thu, 3 Apr 2014 12:00:00 GMT Resent-Message-Id: <201404031200.s33C00sd095035@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mikhail Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08BF85C7 for ; Thu, 3 Apr 2014 11:59:09 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF70A262 for ; Thu, 3 Apr 2014 11:59:08 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s33Bx8KV048065 for ; Thu, 3 Apr 2014 11:59:08 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s33Bx8fP048064; Thu, 3 Apr 2014 11:59:08 GMT (envelope-from nobody) Message-Id: <201404031159.s33Bx8fP048064@cgiserv.freebsd.org> Date: Thu, 3 Apr 2014 11:59:08 GMT From: Mikhail To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/188222: update: graphics/feh X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 12:00:00 -0000 >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 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 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: