Date: Mon, 22 Jul 2013 00:31:31 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323425 - in head/sysutils/screenfetch: . files Message-ID: <201307220031.r6M0VVuj088738@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Mon Jul 22 00:31:31 2013 New Revision: 323425 URL: http://svnweb.freebsd.org/changeset/ports/323425 Log: - fix testing of pkg totals (thanks bdrewery@ !) - bump portrevision Tested by: kentas@hush.com (legacy pkg tools) Modified: head/sysutils/screenfetch/Makefile head/sysutils/screenfetch/files/patch-screenfetch-dev Modified: head/sysutils/screenfetch/Makefile ============================================================================== --- head/sysutils/screenfetch/Makefile Sun Jul 21 23:42:04 2013 (r323424) +++ head/sysutils/screenfetch/Makefile Mon Jul 22 00:31:31 2013 (r323425) @@ -3,6 +3,7 @@ PORTNAME= screenFetch PORTVERSION= 3.0.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= LOCAL/jgh/sysutils/${PORTNAME:L}/ \ GH Modified: head/sysutils/screenfetch/files/patch-screenfetch-dev ============================================================================== --- head/sysutils/screenfetch/files/patch-screenfetch-dev Sun Jul 21 23:42:04 2013 (r323424) +++ head/sysutils/screenfetch/files/patch-screenfetch-dev Mon Jul 22 00:31:31 2013 (r323425) @@ -1,6 +1,6 @@ ---- ./screenfetch-dev.orig 2013-07-19 23:33:57.000000000 -0700 -+++ ./screenfetch-dev 2013-07-19 23:35:46.000000000 -0700 -@@ -686,13 +686,16 @@ +--- ./screenfetch-dev.orig 2013-07-16 21:08:11.000000000 -0700 ++++ ./screenfetch-dev 2013-07-21 17:13:42.000000000 -0700 +@@ -686,13 +686,17 @@ pkgs=$((${pkgs} + ${brew_pkgs})) fi ;; @@ -12,8 +12,9 @@ pkgs=$((${pkgs} + ${ports})) fi ;; -+ 'FreeBSD') -+ pkgs=$(pkg info |wc -l|awk '{print $1}' || pkg_info | wc -l | awk '{sub(" ", "");print $1}') ++ 'FreeBSD') ++ pkgs=$(if TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexistent pkg info pkg >/dev/null 2>&1; then ++ pkg info | wc -l | awk '{print $1}'; else pkg_info | wc -l | awk '{sub(" ", "");print $1}'; fi) + ;; 'Cygwin') cygfix=2; pkgs=$(($(cygcheck -cd | wc -l)-$cygfix)) ;; esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307220031.r6M0VVuj088738>