summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/feh/Makefile24
-rw-r--r--graphics/feh/PLIST16
-rw-r--r--graphics/feh/distinfo16
-rw-r--r--graphics/feh/patches/patch-aa13
-rw-r--r--graphics/feh/patches/patch-ab15
-rw-r--r--graphics/feh/patches/patch-ac16
-rw-r--r--graphics/feh/patches/patch-ad13
-rw-r--r--graphics/feh/patches/patch-ae12
-rw-r--r--graphics/feh/patches/patch-af24
-rw-r--r--graphics/feh/patches/patch-config.mk13
-rw-r--r--graphics/feh/patches/patch-src_getopt.c12
11 files changed, 52 insertions, 122 deletions
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 1e655fa254d..e6d05ecc530 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.41 2011/01/13 13:38:01 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2011/05/25 19:44:26 gls Exp $
#
-DISTNAME= feh-1.3.4
-PKGREVISION= 8
+DISTNAME= feh-1.14.1
CATEGORIES= graphics
-MASTER_SITES= http://linuxbrit.co.uk/downloads/
+MASTER_SITES= http://feh.finalrewind.org/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://linuxbrit.co.uk/feh/
+HOMEPAGE= http://feh.finalrewind.org/
COMMENT= Advanced image viewer
+LICENSE= mit
PKG_DESTDIR_SUPPORT= user-destdir
-DEPENDS+= wget-[0-9]*:../../net/wget
-
-GNU_CONFIGURE= YES
+#GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --program-transform-name=s,cam,feh_cam,
-USE_TOOLS+= bash:run perl:run
+USE_TOOLS+= bash:run perl:run gmake
+
+REPLACE_BASH= cam/gen-cam-menu
+REPLACE_PERL= scripts/*.pl cam/feh-cam
-REPLACE_BASH= cam/gen_cam_menu.sh
-REPLACE_PERL= cam/cam
+CFLAGS+= -std=c99
LDFLAGS.SunOS+= -lnsl -lsocket
@@ -30,6 +31,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../mk/jpeg.buildlink3.mk"
.include "../../devel/giblib/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
diff --git a/graphics/feh/PLIST b/graphics/feh/PLIST
index bd241bb9077..a21b4c41817 100644
--- a/graphics/feh/PLIST
+++ b/graphics/feh/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/05/25 19:44:26 gls Exp $
bin/feh
-bin/feh_cam
-bin/gen_feh_cam_menu.sh
+bin/feh-cam
+bin/gen-cam-menu
+man/man1/feh-cam.1
man/man1/feh.1
+man/man1/gen-cam-menu.1
share/doc/feh/AUTHORS
share/doc/feh/ChangeLog
share/doc/feh/README
share/doc/feh/TODO
+share/doc/feh/examples/keys
+share/doc/feh/examples/themes
share/feh/fonts/black.style
share/feh/fonts/menu.style
share/feh/fonts/yudit.ttf
-share/feh/images/about.png
+share/feh/images/logo.svg
share/feh/images/menubg_aluminium.png
share/feh/images/menubg_aqua.png
share/feh/images/menubg_black.png
-share/feh/images/menubg_britney.png
share/feh/images/menubg_brushed.png
-share/feh/images/menubg_chrome.png
share/feh/images/menubg_default.png
-share/feh/images/menubg_pastel.png
share/feh/images/menubg_sky.png
-share/feh/images/menubg_wood.png
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index b32b71d8dfa..c7c97e399fe 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.18 2011/01/15 22:42:48 tnn Exp $
+$NetBSD: distinfo,v 1.19 2011/05/25 19:44:26 gls Exp $
-SHA1 (feh-1.3.4.tar.gz) = cf02fd48325ba02467c7f791634a28e98edbe801
-RMD160 (feh-1.3.4.tar.gz) = 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c
-Size (feh-1.3.4.tar.gz) = 409530 bytes
-SHA1 (patch-aa) = 745c9ca77355a0beaacbe32bc33174e8dc057cbd
-SHA1 (patch-ab) = 1899f65deb3a5c3d9825b381298b752f0bec54cc
-SHA1 (patch-ac) = a0c76aebd0d38c990e12259d7ceb9e4d75920401
-SHA1 (patch-ad) = 7a3a5a5a88ffa65942606501181e6e9c09af5a56
-SHA1 (patch-ae) = 45c0a837c53393597d0617ff64bdf7fbf5aaa814
-SHA1 (patch-af) = f664f257c7466295e83e76eb9b13710aff2a360c
+SHA1 (feh-1.14.1.tar.bz2) = 4d35b14c41cd8a753e6d8d334bab216c69361688
+RMD160 (feh-1.14.1.tar.bz2) = e83879baa77910ca8181abe7514c80926ee3bd77
+Size (feh-1.14.1.tar.bz2) = 2229518 bytes
+SHA1 (patch-config.mk) = e2af53c04595f7e55645ba9da816eff5da70e3de
+SHA1 (patch-src_getopt.c) = 337fd15564c1d5b5596fe7d0d2f9bd6b0ca44ca7
diff --git a/graphics/feh/patches/patch-aa b/graphics/feh/patches/patch-aa
deleted file mode 100644
index acd5f7afae6..00000000000
--- a/graphics/feh/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 10:52:18 rh Exp $
-
---- Makefile.in.orig Thu Aug 16 01:44:40 2001
-+++ Makefile.in
-@@ -82,7 +82,7 @@
- man_MANS = feh.1
-
- docs_DATA = README AUTHORS ChangeLog TODO
--docsdir = $(prefix)/doc/feh
-+docsdir = $(prefix)/share/doc/feh
-
- EXTRA_DIST = feh.spec feh.1 $(docs_DATA)
-
diff --git a/graphics/feh/patches/patch-ab b/graphics/feh/patches/patch-ab
deleted file mode 100644
index 78c27b8d6c3..00000000000
--- a/graphics/feh/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/11/25 20:00:05 snj Exp $
-
---- src/Makefile.in.orig 2004-10-28 15:36:32.000000000 -0700
-+++ src/Makefile.in 2004-11-25 11:52:32.000000000 -0800
-@@ -77,8 +77,8 @@ XINERAMA_LIBS = @XINERAMA_LIBS@
-
- MAINTAINERCLEANFILES = Makefile.in
-
--LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
--INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir)/src -I/usr/local/include/libpng -DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-+LDFLAGS = @LDFLAGS@
-+INCLUDES = @CFLAGS@ $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir)/src -DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-
- LIBOBJS = @LIBOBJS@
-
diff --git a/graphics/feh/patches/patch-ac b/graphics/feh/patches/patch-ac
deleted file mode 100644
index c1294950dda..00000000000
--- a/graphics/feh/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/05/22 13:01:38 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/slideshow.c.orig Sun May 1 01:11:31 2005
-+++ src/slideshow.c Sun May 22 14:58:08 2005
-@@ -353,8 +353,8 @@ feh_action_run(feh_file * file, char *ac
- 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/patches/patch-ad b/graphics/feh/patches/patch-ad
deleted file mode 100644
index c6bbc2f022d..00000000000
--- a/graphics/feh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/02 14:47:38 drochner Exp $
-
---- src/support.c.orig 2005-08-02 16:10:57.000000000 +0200
-+++ src/support.c
-@@ -233,7 +233,7 @@ feh_wm_set_bg(char *fil, Imlib_Image im,
- char *path;
- path = estrjoin("/", home, ".fehbg", NULL);
- if ((fp = fopen(path, "w")) == NULL) {
-- wprintf("Can't open %s for write", path);
-+ weprintf("Can't open %s for write", path);
- } else {
- fprintf(fp, "%s\n", fehbg);
- fclose(fp);
diff --git a/graphics/feh/patches/patch-ae b/graphics/feh/patches/patch-ae
deleted file mode 100644
index 28d880d16e5..00000000000
--- a/graphics/feh/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/02/26 21:37:19 joerg Exp $
-
---- src/filelist.c.orig 2006-02-23 20:17:53.000000000 +0000
-+++ src/filelist.c
-@@ -30,7 +30,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE
- gib_list *filelist = NULL;
- int filelist_len = 0;
- gib_list *current_file = NULL;
--extern int errno;
-
- static gib_list *rm_filelist = NULL;
-
diff --git a/graphics/feh/patches/patch-af b/graphics/feh/patches/patch-af
deleted file mode 100644
index e54118a0b6d..00000000000
--- a/graphics/feh/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/01/15 22:42:49 tnn Exp $
-
-Be compatible with png>=1.5.
-
---- src/feh_png.c.orig 2005-07-14 11:59:03.000000000 +0000
-+++ src/feh_png.c
-@@ -68,7 +68,7 @@ feh_png_read_comments(char *file)
- return hash;
- }
-
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- fclose(fp);
-@@ -129,7 +129,7 @@ feh_png_write_png(Imlib_Image image, cha
- return 0;
- }
-
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- fclose(fp);
- png_destroy_write_struct(&png_ptr, &info_ptr);
diff --git a/graphics/feh/patches/patch-config.mk b/graphics/feh/patches/patch-config.mk
new file mode 100644
index 00000000000..ad9a851102a
--- /dev/null
+++ b/graphics/feh/patches/patch-config.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-config.mk,v 1.1 2011/05/25 19:44:27 gls Exp $
+
+--- config.mk.orig 2011-05-19 20:36:13.000000000 +0000
++++ config.mk
+@@ -6,7 +6,7 @@ PREFIX ?= /usr/local
+
+ # Directories for manuals, executables, docs, data, etc.
+ main_dir = ${DESTDIR}${PREFIX}
+-man_dir = ${main_dir}/share/man
++man_dir = ${main_dir}/man
+ bin_dir = ${main_dir}/bin
+ doc_dir = ${main_dir}/share/doc/feh
+ image_dir = ${main_dir}/share/feh/images
diff --git a/graphics/feh/patches/patch-src_getopt.c b/graphics/feh/patches/patch-src_getopt.c
new file mode 100644
index 00000000000..33401439429
--- /dev/null
+++ b/graphics/feh/patches/patch-src_getopt.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_getopt.c,v 1.1 2011/05/25 19:44:27 gls Exp $
+
+--- src/getopt.c.orig 2011-05-19 20:36:13.000000000 +0000
++++ src/getopt.c
+@@ -36,6 +36,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <string.h>
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 14:10:40 +0000