- Update to 1.5

- Chase new upstream location
- Update my maintainer address while here

PR:		ports/145856 (sort of)
Submitted by:	baptiste.daroussin at gmail.com
Feature safe:	yes

6 files changed, 24 insertions, 79 deletions

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index b7070f2f6de3..3f0993723b16 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -6,47 +6,38 @@
 #
 
 PORTNAME=	feh
-PORTVERSION=	1.3.4
-PORTREVISION=	8
+PORTVERSION=	1.5
 CATEGORIES=	graphics
-MASTER_SITES=	http://linuxbrit.co.uk/downloads/
+MASTER_SITES=	http://www.chaosdorf.de/~derf/feh/ \
+		http://people.freebsd.org/~uqs/distfiles/
 
-MAINTAINER=	uspoerlein@gmail.com
+MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	An image viewer that utilizes Imlib2
 
 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_PERL5_RUN=	yes
+USE_GMAKE=	yes
+USE_BZIP2=	yes
 
-MAN1=		feh.1
+MAN1=		feh.1 feh-cam.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
+CFLAGS=		-I${LOCALBASE}/include -std=c99
 LDFLAGS=	-L${LOCALBASE}/lib
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 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
+	@${REINPLACE_CMD} 's#/bin/bash#/bin/sh#' ${WRKSRC}/cam/gen-cam-menu
 
 post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/feh ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/feh.1 ${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/cam/feh-cam ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/cam/gen-cam-menu ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/feh-cam.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS ChangeLog README TODO
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 126ba9ad7b34..a331c08ce76a 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -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.5.tar.bz2) = aee156f0a82582108c5a56fbe85319ae
+SHA256 (feh-1.5.tar.bz2) = f6833936b3f78b7a34bdd1beb75018daefe449a576d93b3e4eb98f8d43f51a66
+SIZE (feh-1.5.tar.bz2) = 258129
diff --git a/graphics/feh/files/patch-src-slideshow.c b/graphics/feh/files/patch-src-slideshow.c
deleted file mode 100644
index 86d63cbeb199..000000000000
--- a/graphics/feh/files/patch-src-slideshow.c
+++ /dev/null
@@ -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 --git a/graphics/feh/files/patch-src-winwidget.c b/graphics/feh/files/patch-src-winwidget.c
deleted file mode 100644
index cbc57f07ee12..000000000000
--- a/graphics/feh/files/patch-src-winwidget.c
+++ /dev/null
@@ -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 --git a/graphics/feh/pkg-descr b/graphics/feh/pkg-descr
index d52b9693f098..2a7597b266f4 100644
--- a/graphics/feh/pkg-descr
+++ b/graphics/feh/pkg-descr
@@ -4,4 +4,4 @@ from simple single file viewing, to multiple file modes using
 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 --git a/graphics/feh/pkg-plist b/graphics/feh/pkg-plist
index 8298e0227daa..87582a8295cb 100644
--- a/graphics/feh/pkg-plist
+++ b/graphics/feh/pkg-plist
@@ -1,7 +1,7 @@
 @comment $FreeBSD$
-bin/cam
 bin/feh
-bin/gen_cam_menu.sh
+bin/feh-cam
+bin/gen-cam-menu
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -13,7 +13,6 @@ bin/gen_cam_menu.sh
 %%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