Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Jan 2002 10:45:19 -0600 (CST)
From:      Jeremy Norris <ishmael27x@yahoo.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/34334: Update port graphics/feh
Message-ID:  <200201271645.g0RGjJW26809@babylon.merseine.nu>

next in thread | raw e-mail | index | archive | help

>Number:         34334
>Category:       ports
>Synopsis:       Update port graphics/feh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 27 08:50:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Norris
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
None
>Environment:
System: FreeBSD babylon.merseine.nu 4.4-STABLE FreeBSD 4.4-STABLE #0: Sun Dec 2 19:23:18 CST 2001 ishmael@babylon.merseine.nu:/usr/obj/usr/src/sys/BABYLON i386

>Description:
Update port graphics/feh to latest version, 1.1.1.
Update MAINTAINER address.
Respect NOPORTDOCS.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/feh/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	29 Aug 2001 04:29:41 -0000	1.5
+++ Makefile	27 Jan 2002 16:15:17 -0000
@@ -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_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
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/feh/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	29 Aug 2001 04:29:41 -0000	1.3
+++ distinfo	26 Jan 2002 16:48:52 -0000
@@ -1 +1 @@
-MD5 (feh-1.1.0.tar.gz) = ba39dde9998996b9728c074869ba75db
+MD5 (feh-1.1.1.tar.gz) = f4f3785ae2c8e710b7b5ba2a1ac9786a
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/feh/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	18 Aug 2001 23:30:02 -0000	1.2
+++ pkg-plist	27 Jan 2002 16:18:37 -0000
@@ -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_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
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/graphics/feh/files/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- files/patch-aa	3 Nov 2000 08:21:36 -0000	1.1
+++ files/patch-aa	27 Jan 2002 16:14:17 -0000
@@ -1,6 +1,9 @@
---- Makefile.in.orig	Sat Jun 24 16:22:59 2000
-+++ Makefile.in	Mon Oct 16 20:30:48 2000
-@@ -76,7 +76,7 @@
+
+$FreeBSD$
+
+--- 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 +12,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)
Index: files/patch-src::imlib.c
===================================================================
RCS file: files/patch-src::imlib.c
diff -N files/patch-src::imlib.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src::imlib.c	26 Jan 2002 16:58:58 -0000
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- 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);
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201271645.g0RGjJW26809>