cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to feh-2.0

Browse Source
This commit is contained in:
dcoppa 2011-10-11 07:49:07 +00:00
parent bf9f94cb6a
commit 18452329c0
7 changed files with 89 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/feh/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.30 2011/09/26 18:01:26 dcoppa Exp $
# $OpenBSD: Makefile,v 1.31 2011/10/11 07:49:07 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-1.16.2
DISTNAME= feh-2.0
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics
@ -39,6 +39,8 @@ USE_GMAKE= Yes
NO_REGRESS= Yes
post-configure:
${SUBST_CMD} ${WRKSRC}/src/keyevents.c ${WRKSRC}/src/options.c
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
${WRKSRC}/src/events.c ${WRKSRC}/src/keyevents.c \
${WRKSRC}/src/options.c
.include <bsd.port.mk>

10
graphics/feh/distinfo
View File

@ -1,5 +1,5 @@
MD5 (feh-1.16.2.tar.bz2) = rpRjHbpS/pmcjYRgcMlJ1Q==
RMD160 (feh-1.16.2.tar.bz2) = owN9/BfbNnpBz7qCo2iPHZ3buLE=
SHA1 (feh-1.16.2.tar.bz2) = u7Uw8bypFABABSFkw/eSiQEcRfE=
SHA256 (feh-1.16.2.tar.bz2) = qc5Y0aLBRQuzLGF4xo0/J5Ig7rRN9k4GPtNWZpR3ht4=
SIZE (feh-1.16.2.tar.bz2) = 2223378
MD5 (feh-2.0.tar.bz2) = Z/AbiMxMupF2xbok759CcA==
RMD160 (feh-2.0.tar.bz2) = ckff+OJ+KsGOEaZr/lS9FshmQXo=
SHA1 (feh-2.0.tar.bz2) = iQ5Pc0PnwhV/JfEBGnVoitz2w/I=
SHA256 (feh-2.0.tar.bz2) = xckKPhStgLYmgcYy2XexAGzVtj6N5LKMbuqRCOJSmUY=
SIZE (feh-2.0.tar.bz2) = 2239916

38
graphics/feh/patches/patch-examples_themes Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-examples_themes,v 1.1 2011/10/11 07:49:07 dcoppa Exp $
--- examples/themes.orig Tue Oct 11 09:33:25 2011
+++ examples/themes Tue Oct 11 09:36:41 2011
@@ -1,6 +1,6 @@
# Feh themes configuration file.
# Lines starting with # are comments. Midline comments are not supported.
-# Place this as either ~/.config/feh/themes or /etc/feh/themes
+# Place this as either ~/.config/feh/themes or ${SYSCONFDIR}/feh/themes
# Options are defined in theme_name/options pairs.
# Separate themename and options by whitespace.
@@ -42,9 +42,9 @@ booth --full-screen --hide-pointer --slideshow-delay 2
screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer
# Different menus
-aqua --menu-bg /usr/share/feh/images/menubg_aqua.png
-sky --menu-bg /usr/share/feh/images/menubg_sky.png
-black --menu-bg /usr/share/feh/images/menubg_black.png
+aqua --menu-bg ${TRUEPREFIX}/share/feh/images/menubg_aqua.png
+sky --menu-bg ${TRUEPREFIX}/share/feh/images/menubg_sky.png
+black --menu-bg ${TRUEPREFIX}/share/feh/images/menubg_black.png
# Some more examples, used by the feh developer
@@ -53,11 +53,11 @@ fs --full-screen --hide-pointer --auto-zoom --sort fi
thumb_s --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \
--limit-width 1024 --sort filename \
- --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8
+ --fontpath ${X11BASE}/lib/X11/fonts/TTF/ --font DejaVuSans/8
thumb_b --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \
--limit-width 1024 --sort filename \
- --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8
+ --fontpath ${X11BASE}/lib/X11/fonts/TTF/ --font DejaVuSans/8
thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \
--limit-width 1024 --sort filename --index-name 0

26
graphics/feh/patches/patch-man_feh_pre
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-man_feh_pre,v 1.7 2011/09/26 18:01:26 dcoppa Exp $
$OpenBSD: patch-man_feh_pre,v 1.8 2011/10/11 07:49:07 dcoppa Exp $
fix typo
--- man/feh.pre.orig Mon Sep 26 19:54:00 2011
+++ man/feh.pre Mon Sep 26 19:54:21 2011
@@ -167,7 +167,7 @@ the caption will be looked for in
--- man/feh.pre.orig Mon Oct 10 12:31:30 2011
+++ man/feh.pre Tue Oct 11 09:32:56 2011
@@ -169,7 +169,7 @@ the caption will be looked for in
Don't display images, print image info according to
.Ar format
instead. See
@ -13,3 +13,21 @@ fix typo
.
.It Cm --cycle-once
.
@@ -801,7 +801,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
-.Pa /etc/feh/ .
+.Pa ${SYSCONFDIR}/feh/ .
.Pp
All config files treat lines starting with a
.Qq #
@@ -1293,7 +1293,7 @@ order it finds them on the hard disk, which is usually
.
Show 128x128 pixel thumbnails, limit window width to 1024 pixels.
.
-.It feh -t -Sfilename -E 128 -y 128 -W 1024 -P -C /usr/share/fonts/truetype/ttf-dejavu/ -e DejaVuSans/8 /opt/images
+.It feh -t -Sfilename -E 128 -y 128 -W 1024 -P -C ${X11BASE}/lib/X11/fonts/TTF/ -e DejaVuSans/8 /opt/images
.
Same as above, but enable thumbnail caching in ~/.thumbnails and use a smaller
font.

12
graphics/feh/patches/patch-src_events_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_events_c,v 1.3 2011/10/11 07:49:07 dcoppa Exp $
--- src/events.c.orig Tue Oct 11 09:21:18 2011
+++ src/events.c Tue Oct 11 09:23:17 2011
@@ -121,7 +121,7 @@ void init_buttonbindings(void)
free(confpath);
- if (!conf && ((conf = fopen("/etc/feh/buttons", "r")) == NULL))
+ if (!conf && ((conf = fopen("${SYSCONFDIR}/feh/buttons", "r")) == NULL))
return;
while (fgets(line, sizeof(line), conf)) {

8
graphics/feh/patches/patch-src_options_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_options_c,v 1.4 2011/09/26 18:01:27 dcoppa Exp $
--- src/options.c.orig Mon Sep 26 09:37:05 2011
+++ src/options.c Mon Sep 26 19:52:05 2011
@@ -168,7 +168,7 @@ static void feh_load_options_for_theme(char *theme)
$OpenBSD: patch-src_options_c,v 1.5 2011/10/11 07:49:07 dcoppa Exp $
--- src/options.c.orig Mon Oct 10 12:31:30 2011
+++ src/options.c Tue Oct 11 09:11:11 2011
@@ -152,7 +152,7 @@ static void feh_load_options_for_theme(char *theme)
free(oldrcpath);

4
graphics/feh/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2011/05/20 10:57:57 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.8 2011/10/11 07:49:07 dcoppa Exp $
@bin bin/feh
bin/feh-cam
bin/gen-cam-menu
@ -12,6 +12,8 @@ share/doc/feh/README
share/doc/feh/TODO
share/examples/feh/
@sample ${SYSCONFDIR}/feh/
share/examples/feh/buttons
@sample ${SYSCONFDIR}/feh/buttons
share/examples/feh/keys
@sample ${SYSCONFDIR}/feh/keys
share/examples/feh/themes