Update to 1.1.1

Respect NOPORTDOCS
Update maintainer email

PR:		34334
Submitted by:	maintainer

5 files changed, 52 insertions, 11 deletions

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 270d387940da..e4c72764270b 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	feh
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 
-MAINTAINER=	ishmael27@home.com
+MAINTAINER=	ishmael27x@yahoo.com
 
 LIB_DEPENDS=	Imlib2.1:${PORTSDIR}/graphics/imlib2
 
@@ -19,6 +19,11 @@ USE_PERL5=	yes
 USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LIBS="-L${X11BASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+.if defined(NOPORTDOCS)
+MAKE_ENV=	NO_DOC=yes
+.endif
 
 MAN1=		feh.1
 
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 7e3cf6b279e3..f00221af6b21 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1 +1 @@
-MD5 (feh-1.1.0.tar.gz) = ba39dde9998996b9728c074869ba75db
+MD5 (feh-1.1.1.tar.gz) = f4f3785ae2c8e710b7b5ba2a1ac9786a
diff --git a/graphics/feh/files/patch-aa b/graphics/feh/files/patch-aa
index a2200317e450..336ba614d08c 100644
--- a/graphics/feh/files/patch-aa
+++ b/graphics/feh/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Jun 24 16:22:59 2000
-+++ Makefile.in	Mon Oct 16 20:30:48 2000
-@@ -76,7 +76,7 @@
+--- Makefile.in.orig	Thu Jan 17 16:52:38 2002
++++ Makefile.in	Sat Jan 26 10:49:00 2002
+@@ -82,7 +82,7 @@
  man_MANS = feh.1
  
  docs_DATA = README AUTHORS ChangeLog TODO
@@ -9,3 +9,19 @@
  
  EXTRA_DIST =  feh.spec feh.1 $(docs_DATA)
  
+@@ -195,6 +195,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+ 
+ install-docsDATA: $(docs_DATA)
++.if !defined(NO_DOC)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(docsdir)
+ 	@list='$(docs_DATA)'; for p in $$list; do \
+@@ -206,6 +207,7 @@
+ 	    $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p; \
+ 	  fi; fi; \
+ 	done
++.endif
+ 
+ uninstall-docsDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/feh/files/patch-src::imlib.c b/graphics/feh/files/patch-src::imlib.c
new file mode 100644
index 000000000000..ccb8a4abab96
--- /dev/null
+++ b/graphics/feh/files/patch-src::imlib.c
@@ -0,0 +1,19 @@
+--- src/imlib.c.orig	Sun Jan 13 15:03:52 2002
++++ src/imlib.c	Sat Jan 26 10:58:25 2002
+@@ -34,6 +34,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <stdio.h>
+ 
+ Display *disp = NULL;
+ Visual *vis = NULL;
+@@ -758,7 +759,7 @@
+     feh_imlib_free_image(old);
+     feh_reload_image(w, 1);
+   } else {
+-    wprintf("failed to load image from disk to edit it in place\n");
++    printf("failed to load image from disk to edit it in place\n");
+   }
+   
+   D_RETURN_(4);
diff --git a/graphics/feh/pkg-plist b/graphics/feh/pkg-plist
index 394ed3333b88..01bf2dea314b 100644
--- a/graphics/feh/pkg-plist
+++ b/graphics/feh/pkg-plist
@@ -1,10 +1,11 @@
+@comment $FreeBSD$
 bin/cam
 bin/feh
 bin/gen_cam_menu.sh
-share/doc/feh/AUTHORS
-share/doc/feh/ChangeLog
-share/doc/feh/README
-share/doc/feh/TODO
+%%PORTDOCS%%share/doc/feh/AUTHORS
+%%PORTDOCS%%share/doc/feh/ChangeLog
+%%PORTDOCS%%share/doc/feh/README
+%%PORTDOCS%%share/doc/feh/TODO
 share/feh/fonts/20thcent.ttf
 share/feh/fonts/cinema.ttf
 share/feh/fonts/droid.ttf
@@ -23,7 +24,7 @@ share/feh/images/menubg_brushed.png
 share/feh/images/menubg_chrome.png
 share/feh/images/menubg_pastel.png
 share/feh/images/menubg_wood.png
-@dirrm share/doc/feh
+%%PORTDOCS%%@dirrm share/doc/feh
 @dirrm share/feh/fonts
 @dirrm share/feh/images
 @dirrm share/feh