From owner-svn-ports-all@freebsd.org Fri Nov 11 19:40:51 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A152C3C31E; Fri, 11 Nov 2016 19:40:51 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0AD121C59; Fri, 11 Nov 2016 19:40:50 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uABJeoY8000668; Fri, 11 Nov 2016 19:40:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uABJeorK000665; Fri, 11 Nov 2016 19:40:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201611111940.uABJeorK000665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 11 Nov 2016 19:40:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425906 - in head/sysutils/screenfetch: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2016 19:40:51 -0000 Author: amdmi3 Date: Fri Nov 11 19:40:49 2016 New Revision: 425906 URL: https://svnweb.freebsd.org/changeset/ports/425906 Log: - Fix LICENSE - Add LICENSE_FILE - Add NO_ARCH - Switch to options helpers - Add simple test - Fix FreeBSD detection - Fix screenfetch failures in some cases due to not clearly understood reason: /usr/local/bin/screenfetch: line 4156: /dev/fd/62: Operation not supported /usr/local/bin/screenfetch: line 4157: 3: Bad file descriptor by importing upstream fix. PR: 213854 Submitted by: amdmi3 Approved by: jgh (maintainer) Added: head/sysutils/screenfetch/files/ head/sysutils/screenfetch/files/patch-screenfetch-dev (contents, props changed) Modified: head/sysutils/screenfetch/Makefile Modified: head/sysutils/screenfetch/Makefile ============================================================================== --- head/sysutils/screenfetch/Makefile Fri Nov 11 19:34:35 2016 (r425905) +++ head/sysutils/screenfetch/Makefile Fri Nov 11 19:40:49 2016 (r425906) @@ -4,13 +4,15 @@ PORTNAME= screenFetch PORTVERSION= 3.7.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= LOCAL/jgh/sysutils/${PORTNAME:tl}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Bash Screenshot Information Tool -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash \ xdpyinfo:x11/xdpyinfo @@ -18,6 +20,7 @@ RUN_DEPENDS= bash:shells/bash \ OPTIONS_DEFINE= DOCS NO_BUILD= yes +NO_ARCH= yes USE_GITHUB= yes GH_ACCOUNT= KittyKatt @@ -28,9 +31,14 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME:tl}-dev ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${LN} -fs ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/screenfetch ${INSTALL_MAN} ${WRKSRC}/screenfetch.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor +do-test: + cd ${WRKSRC} && ./${PORTNAME:tl}-dev + .include Added: head/sysutils/screenfetch/files/patch-screenfetch-dev ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/screenfetch/files/patch-screenfetch-dev Fri Nov 11 19:40:49 2016 (r425906) @@ -0,0 +1,33 @@ +--- screenfetch-dev.orig 2015-07-14 12:32:02 UTC ++++ screenfetch-dev +@@ -515,6 +515,14 @@ detectdistro () { + if [ "$distro" == "Unknown" ]; then + if [ $(uname -o 2>/dev/null) ]; then + case "$(uname -o)" in ++ "FreeBSD") ++ distro="FreeBSD" ++ fake_distro="${distro}" ++ ;; ++ "DragonFly") ++ distro="DragonFlyBSD" ++ fake_distro="${distro}" ++ ;; + "Cygwin") + distro="Cygwin" + fake_distro="${distro}" +@@ -4151,11 +4159,10 @@ for i in "${display[@]}"; do + ! [[ $Win_theme ]] && detectwmtheme; + else + if [[ "${display[*]}" =~ "$i" ]]; then +- if [[ "$errorSuppress" == "1" ]]; then detect${i} 2>/dev/null +- else +- exec 3> >(stderrOut) +- detect${i} 2>&3 +- exec 3>&- ++ if [[ "$errorSuppress" == "1" ]]; then ++ detect${i} 2>/dev/null ++ else ++ detect${i} + fi + fi + fi