Date: Mon, 19 Apr 2010 19:29:25 +0200 From: Bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: uspoerlein@gmail.com Subject: ports/145856: [PATCH] graphics/feh: update to 1.4.2 Message-ID: <d22cb@azathoth.lan> Resent-Message-ID: <201004191730.o3JHU2BF064397@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145856 >Category: ports >Synopsis: [PATCH] graphics/feh: update to 1.4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Apr 19 17:30:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Bapt >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD azathoth.lan 8.0-STABLE FreeBSD 8.0-STABLE #3: Sun Jan 10 20:39:38 CET 2010 >Description: has the new master site for feh is in https and is not fetchable using fetch(1), I mirrored the distfile. feh (current version in the ports and the new one) should depend on perl for some provided scripts, so I optionified the port. And because feh supports http downloading through either wget or a builtin http client I add an option to get wget as a run_depends dependency. - Update to 1.4.2 Removed file(s): - files/patch-src-slideshow.c - files/patch-src-winwidget.c Port maintainer (uspoerlein@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- feh-1.4.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/feh.orig/Makefile /usr/ports/graphics/feh/Makefile --- /usr/ports/graphics/feh.orig/Makefile 2010-04-19 15:05:59.595486000 +0200 +++ /usr/ports/graphics/feh/Makefile 2010-04-19 19:03:40.426130798 +0200 @@ -6,10 +6,9 @@ # PORTNAME= feh -PORTVERSION= 1.3.4 -PORTREVISION= 8 +PORTVERSION= 1.4.2 CATEGORIES= graphics -MASTER_SITES= http://linuxbrit.co.uk/downloads/ +MASTER_SITES= http://baptux.free.fr/distfiles/ MAINTAINER= uspoerlein@gmail.com COMMENT= An image viewer that utilizes Imlib2 @@ -17,36 +16,48 @@ LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib USE_XORG= x11 xt xinerama -USE_PERL5= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - +USE_BZIP2= yes MAN1= feh.1 +USE_GMAKE= yes + +CFLAGS+= -I${LOCALBASE}/include -std=c99 +LDFLAGS+= -L${LOCALBASE}/lib + +MAKE_ENV+= LDFLAGS="${LDFLAGS}" + +ALL_TARGET= default + +OPTIONS= CAM "Perl Wrapper to simplify webcams support" off \ + WGET "HTTP images support using wget" off -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +.include <bsd.port.pre.mk> +.if defined(WITH_WGET) +RUN_DEPENDS+= wget:${PORTSDIR}/ftp/wget +.endif + +.if defined(WITH_CAM) +USE_PERL5_RUN= yes +MAN1+= feh-cam.1 +PLIST_SUB+= CAM="" +.else +PLIST_SUB+= CAM="@comment " +.endif post-patch: - @${PERL} -pi.bak -e \ - 's|^CFLAGS="-I|#CFLAGS="-I|g ; \ - s|^LIBS="-L|#LIBS="-L|g' ${WRKSRC}/configure - @${PERL} -pi.bak -e \ - 's|-man install-docsDATA|-man|g' ${WRKSRC}/Makefile.in - @${PERL} -pi.bak -e \ - 's|^#!/bin/bash|#!/bin/sh|g' ${WRKSRC}/cam/gen_cam_menu.sh - @${PERL} -pi.bak -e \ - 's|^LDFLAGS.*$$|LDFLAGS = \@LDFLAGS\@|g ; \ - s|-I/usr/X11R6/include||g ; \ - s|-I/usr/local/include/libpng||g ; \ - s| getopt\.[cho]||g ; \ - s| getopt1\.[co]||g ; \ - s|^getopt|#getopt|g' ${WRKSRC}/src/Makefile.in - @${PERL} -pi.bak -e \ - 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/src/feh.h - @${PERL} -pi.bak -e \ - 's|wprintf|weprintf|g' ${WRKSRC}/src/support.c + @${REINPLACE_CMD} 's#share/man#man#' ${WRKSRC}/config.mk + @${REINPLACE_CMD} 's#install-man install-doc install-bin##' ${WRKSRC}/Makefile +.if defined(WITH_CAM) + @${REINPLACE_CMD} 's/bash/sh/' ${WRKSRC}/cam/gen-cam-menu +.endif post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/feh ${LOCALBASE}/bin + ${INSTALL_MAN} ${WRKSRC}/man/feh.1 ${LOCALBASE}/man/man1 +.if defined(WITH_CAM) + ${INSTALL_SCRIPT} ${WRKSRC}/cam/feh-cam ${LOCALBASE}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/cam/gen-cam-menu ${LOCALBASE}/bin + ${INSTALL_MAN} ${WRKSRC}/man/feh-cam.1 ${LOCALBASE}/man/man1 +.endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for file in AUTHORS ChangeLog README TODO @@ -54,4 +65,4 @@ .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/graphics/feh.orig/distinfo /usr/ports/graphics/feh/distinfo --- /usr/ports/graphics/feh.orig/distinfo 2006-01-22 13:34:48.000000000 +0100 +++ /usr/ports/graphics/feh/distinfo 2010-04-19 15:09:06.302939469 +0200 @@ -1,3 +1,3 @@ -MD5 (feh-1.3.4.tar.gz) = 3d35ba3d2f0693b019800787f1103891 -SHA256 (feh-1.3.4.tar.gz) = 81b9f2bbc15ffda4640958701753447b95cd2cbf11bc8e85dd00fdd2a2f83124 -SIZE (feh-1.3.4.tar.gz) = 409530 +MD5 (feh-1.4.2.tar.bz2) = 19906a6e319e99e0d98856f64324fed8 +SHA256 (feh-1.4.2.tar.bz2) = 5090f646c9508f8380ee6f5d7e6704abc548aaf79d81db7777d9a4b8ec95226e +SIZE (feh-1.4.2.tar.bz2) = 257278 diff -ruN --exclude=CVS /usr/ports/graphics/feh.orig/files/patch-src-slideshow.c /usr/ports/graphics/feh/files/patch-src-slideshow.c --- /usr/ports/graphics/feh.orig/files/patch-src-slideshow.c 2005-06-05 15:01:17.000000000 +0200 +++ /usr/ports/graphics/feh/files/patch-src-slideshow.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ ---- src/slideshow.c.orig Sun May 1 08:11:31 2005 -+++ src/slideshow.c Sun May 1 20:01:03 2005 -@@ -353,8 +353,8 @@ - D_ENTER(4); - if (action) - { -- D(3, ("Running action %s\n", action)); - char *sys; -+ D(3, ("Running action %s\n", action)); - sys = feh_printf(action, file); - - if (opt.verbose && !opt.list && !opt.customlist) diff -ruN --exclude=CVS /usr/ports/graphics/feh.orig/files/patch-src-winwidget.c /usr/ports/graphics/feh/files/patch-src-winwidget.c --- /usr/ports/graphics/feh.orig/files/patch-src-winwidget.c 2009-03-16 22:01:00.000000000 +0100 +++ /usr/ports/graphics/feh/files/patch-src-winwidget.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ ---- src/winwidget.c.orig 2005-07-14 13:59:03.000000000 +0200 -+++ src/winwidget.c 2009-03-11 21:46:33.000000000 +0100 -@@ -158,6 +158,7 @@ - int h) - { - XSetWindowAttributes attr; -+ XEvent ev; - XClassHint *xch; - MWMHints mwmhints; - Atom prop = None; -@@ -256,6 +257,22 @@ - XChangeProperty(disp, ret->win, prop, prop, 32, PropModeReplace, - (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS); - } -+ if (ret->full_screen) { -+ Atom prop_fs = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN", False); -+ Atom prop_state = XInternAtom(disp, "_NET_WM_STATE", False); -+ -+ memset(&ev, 0, sizeof(ev)); -+ ev.xclient.type = ClientMessage; -+ ev.xclient.message_type = prop_state; -+ ev.xclient.display = disp; -+ ev.xclient.window = ret->win; -+ ev.xclient.format = 32; -+ ev.xclient.data.l[0] = (ret->full_screen ? 1 : 0); -+ ev.xclient.data.l[1] = prop_fs; -+ -+ XChangeProperty(disp, ret->win, prop_state, XA_ATOM, 32, -+ PropModeReplace, &prop_fs, 1); -+ } - - XSetWMProtocols(disp, ret->win, &wmDeleteWindow, 1); - winwidget_update_title(ret); diff -ruN --exclude=CVS /usr/ports/graphics/feh.orig/pkg-descr /usr/ports/graphics/feh/pkg-descr --- /usr/ports/graphics/feh.orig/pkg-descr 2005-06-05 15:01:16.000000000 +0200 +++ /usr/ports/graphics/feh/pkg-descr 2010-04-19 19:25:03.153045852 +0200 @@ -4,4 +4,4 @@ a slideshow or multiple windows. feh supports the creation of montages as index prints with many user-configurable options. -WWW: http://www.linuxbrit.co.uk/feh/ +WWW: https://derf.homelinux.org/~derf/projects/feh/ diff -ruN --exclude=CVS /usr/ports/graphics/feh.orig/pkg-plist /usr/ports/graphics/feh/pkg-plist --- /usr/ports/graphics/feh.orig/pkg-plist 2004-10-12 12:01:08.000000000 +0200 +++ /usr/ports/graphics/feh/pkg-plist 2010-04-19 19:01:02.597918488 +0200 @@ -1,7 +1,7 @@ @comment $FreeBSD: ports/graphics/feh/pkg-plist,v 1.7 2004/10/12 10:01:08 krion Exp $ -bin/cam +%%CAM%%bin/feh-cam bin/feh -bin/gen_cam_menu.sh +%%CAM%%bin/gen-cam-menu %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README @@ -13,7 +13,6 @@ %%DATADIR%%/images/menubg_aluminium.png %%DATADIR%%/images/menubg_aqua.png %%DATADIR%%/images/menubg_black.png -%%DATADIR%%/images/menubg_britney.png %%DATADIR%%/images/menubg_brushed.png %%DATADIR%%/images/menubg_chrome.png %%DATADIR%%/images/menubg_default.png --- feh-1.4.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d22cb>