Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 07 Nov 2012 14:57:38 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        zeising@FreeBSD.org
Subject:   ports/173443: [PATCH] graphics/feh: OptionsNG, removed not needed patch
Message-ID:  <20121107135741.97C193C8@hub.freebsd.org>
Resent-Message-ID: <201211071400.qA7E00Qt045774@freefall.freebsd.org>

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

>Number:         173443
>Category:       ports
>Synopsis:       [PATCH] graphics/feh: OptionsNG, removed not needed patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 07 14:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:
+.include <bsd.port.options.mk>

Removed because is in cam/gen-cam-menu already #!/bin/sh
-	@${REINPLACE_CMD} 's#/bin/bash#/bin/sh#' ${WRKSRC}/cam/gen-cam-menu
# changed to more usuall |

+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}

Port maintainer (zeising@FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks usual.

port test: clean

Build log

https://redports.org/buildarchive/20121107013753-61480/

>Fix:

--- feh-2.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/feh/Makefile ./Makefile
--- /usr/ports/graphics/feh/Makefile	2012-11-03 21:55:24.000000000 +0100
+++ ./Makefile	2012-11-07 02:32:15.000000000 +0100
@@ -29,16 +29,15 @@
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} 's#/bin/bash#/bin/sh#' ${WRKSRC}/cam/gen-cam-menu
-	@${REINPLACE_CMD} 's#/install-man install-doc#install-man#' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's|/install-man install-doc|install-man|' ${WRKSRC}/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
--- feh-2.7.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?20121107135741.97C193C8>