Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Apr 2012 01:40:45 +0600 (BDT)
From:      Muhammad Moinur Rahman <5u623l20@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        zeising@daemonic.se
Subject:   ports/167110: [PATCH] graphics/feh: update to 2.5
Message-ID:  <201204191940.q3JJejfL087597@bofh.telnet.net.bd>
Resent-Message-ID: <201204191950.q3JJo8QG074497@freefall.freebsd.org>

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

>Number:         167110
>Category:       ports
>Synopsis:       [PATCH] graphics/feh: update to 2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 19 19:50:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Muhammad Moinur Rahman
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD bofh.telnet.net.bd 9.0-STABLE FreeBSD 9.0-STABLE #0: Fri Mar  2 02:21:51 BDT
>Description:
- Update to 2.5

Added file(s):
- files/patch-config.mk

For Committer's reference:
http://tb.s.ubze.ro//logs/7.4-FreeBSD-i386/feh-2.5.log
http://tb.s.ubze.ro//logs/7.4-FreeBSD-amd64/feh-2.5.log
http://tb.s.ubze.ro//logs/8.2-FreeBSD-i386/feh-2.5.log
http://tb.s.ubze.ro//logs/8.2-FreeBSD-amd64/feh-2.5.log
http://tb.s.ubze.ro//logs/9.0-FreeBSD-i386/feh-2.5.log
http://tb.s.ubze.ro//logs/9.0-FreeBSD-amd64/feh-2.5.log

Port maintainer (zeising@daemonic.se) is cc'd.

Generated with FreeBSD Port Tools 0.99_5 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- feh-2.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/feh/Makefile ./Makefile
--- /usr/ports/graphics/feh/Makefile	2012-02-10 14:22:22.000000000 +0600
+++ ./Makefile	2012-04-19 19:17:41.809899839 +0600
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	feh
-PORTVERSION=	2.3
+PORTVERSION=	2.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/ \
 		${MASTER_SITE_LOCAL}
@@ -31,17 +31,18 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
+PORTDOCS=	AUTHORS ChangeLog README TODO
+
 post-patch:
-	@${REINPLACE_CMD} 's#share/man#man#' ${WRKSRC}/config.mk
-	@${REINPLACE_CMD} 's#install-man install-doc install-bin#install-doc#' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's#/bin/bash#/bin/sh#' ${WRKSRC}/cam/gen-cam-menu
+	@${REINPLACE_CMD} 's#/install-man install-doc#install-man#' ${WRKSRC}/Makefile
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/feh ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cam/feh-cam ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cam/gen-cam-menu ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/feh.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/feh-cam.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/gen-cam-menu.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/feh/distinfo ./distinfo
--- /usr/ports/graphics/feh/distinfo	2012-02-10 14:22:22.000000000 +0600
+++ ./distinfo	2012-04-19 17:49:40.373896101 +0600
@@ -1,2 +1,2 @@
-SHA256 (feh-2.3.tar.bz2) = d8ba59cbae2d73d06c6be6f8fc3e9601acff7fdd475b192341e16bcaef3e5177
-SIZE (feh-2.3.tar.bz2) = 2226269
+SHA256 (feh-2.5.tar.bz2) = 529a6a349bfec87a8a07b17752686149b702cf2468ac56d7306b2f0400f077aa
+SIZE (feh-2.5.tar.bz2) = 2227722
diff -ruN --exclude=CVS /usr/ports/graphics/feh/files/patch-config.mk ./files/patch-config.mk
--- /usr/ports/graphics/feh/files/patch-config.mk	1970-01-01 06:00:00.000000000 +0600
+++ ./files/patch-config.mk	2012-04-19 19:07:37.190895468 +0600
@@ -0,0 +1,17 @@
+--- config.mk.orig	2012-04-19 19:06:22.083888852 +0600
++++ config.mk	2012-04-19 19:06:44.350893457 +0600
+@@ -6,12 +6,12 @@
+ 
+ # 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
+ font_dir = ${main_dir}/share/feh/fonts
+-example_dir = ${main_dir}/share/doc/feh/examples
++example_dir = ${main_dir}/share/examples/feh
+ 
+ # default CFLAGS
+ CFLAGS ?= -g -O2
diff -ruN --exclude=CVS /usr/ports/graphics/feh/pkg-plist ./pkg-plist
--- /usr/ports/graphics/feh/pkg-plist	2011-10-22 22:16:52.000000000 +0600
+++ ./pkg-plist	2012-04-20 01:26:01.175890767 +0600
@@ -1,13 +1,9 @@
 bin/feh
 bin/feh-cam
 bin/gen-cam-menu
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/examples/buttons
-%%DOCSDIR%%/examples/keys
-%%DOCSDIR%%/examples/themes
+%%EXAMPLESDIR%%/buttons
+%%EXAMPLESDIR%%/keys
+%%EXAMPLESDIR%%/themes
 %%DATADIR%%/fonts/black.style
 %%DATADIR%%/fonts/menu.style
 %%DATADIR%%/fonts/yudit.ttf
@@ -21,5 +17,4 @@
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%
--- feh-2.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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