diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-11-11 19:40:49 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-11-11 19:40:49 +0000 |
| commit | 17b4fb8b1636d2b0ca48859a06e04da053ac6100 (patch) | |
| tree | b16e2a4cc0b85745b9b87758c1b2746e68791b72 /sysutils | |
| parent | Fix build with gcc 4.9 (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=425906
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/screenfetch/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/screenfetch/files/patch-screenfetch-dev | 33 |
2 files changed, 42 insertions, 1 deletions
diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index 68d3ba5f3faf..7c86eba5ed1e 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -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 <bsd.port.mk> diff --git a/sysutils/screenfetch/files/patch-screenfetch-dev b/sysutils/screenfetch/files/patch-screenfetch-dev new file mode 100644 index 000000000000..da70f6bfc9e7 --- /dev/null +++ b/sysutils/screenfetch/files/patch-screenfetch-dev @@ -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 |