ports/84069: Update port: graphics/feh to 1.3.4

[KATO Tsuguru]

>Number:         84069
>Category:       ports
>Synopsis:       Update port: graphics/feh to 1.3.4
>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:   Mon Jul 25 15:10:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 1.3.4

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/feh/Makefile graphics/feh/Makefile
--- /usr/ports/graphics/feh/Makefile	Mon Jun  6 01:28:18 2005
+++ graphics/feh/Makefile	Sat Jul 23 17:31:32 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	feh
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 
@@ -14,20 +14,39 @@
 COMMENT=	An image viewer that utilizes Imlib2
 
 LIB_DEPENDS=	giblib.1:${PORTSDIR}/graphics/giblib
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		feh.1
 
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+
 post-patch:
-	@${PERL} -pi.bak -e 's|^LDFLAGS =.*$$|LDFLAGS = \@LDFLAGS\@|g ; \
-		 s|^INCLUDES =.*$$|INCLUDES = -I. -I$$(includedir)|g ; \
-		 s|-man install-docsDATA|-man|g' ${WRKSRC}/Makefile.in
+	@${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|#!${LOCALBASE}/bin|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
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -urN /usr/ports/graphics/feh/distinfo graphics/feh/distinfo
--- /usr/ports/graphics/feh/distinfo	Mon Jun  6 01:28:18 2005
+++ graphics/feh/distinfo	Sat Jul 23 16:36:12 2005
@@ -1,2 +1,2 @@
-MD5 (feh-1.3.3.tar.gz) = d2aead74629fd04f26928f6af74b993b
-SIZE (feh-1.3.3.tar.gz) = 377159
+MD5 (feh-1.3.4.tar.gz) = 3d35ba3d2f0693b019800787f1103891
+SIZE (feh-1.3.4.tar.gz) = 409530
>Release-Note:
>Audit-Trail:
>Unformatted: