aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjgh <jgh@FreeBSD.org>2013-07-22 08:31:31 +0800
committerjgh <jgh@FreeBSD.org>2013-07-22 08:31:31 +0800
commit7d9fbd96e04dbb178f1573b5472e9d8edf6625b0 (patch)
treec35655429a573eae89ba900a6159c84083d89758
parent3af3b0b167a1a85ad682116f992ab0f19384edca (diff)
downloadfreebsd-ports-gnome-7d9fbd96e04dbb178f1573b5472e9d8edf6625b0.tar.gz
freebsd-ports-gnome-7d9fbd96e04dbb178f1573b5472e9d8edf6625b0.tar.zst
freebsd-ports-gnome-7d9fbd96e04dbb178f1573b5472e9d8edf6625b0.zip
- fix testing of pkg totals (thanks bdrewery@ !)
- bump portrevision Tested by: kentas@hush.com (legacy pkg tools)
-rw-r--r--sysutils/screenfetch/Makefile1
-rw-r--r--sysutils/screenfetch/files/patch-screenfetch-dev11
2 files changed, 7 insertions, 5 deletions
diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile
index 59954b6d4946..1ddd99b3a214 100644
--- a/sysutils/screenfetch/Makefile
+++ b/sysutils/screenfetch/Makefile
@@ -3,6 +3,7 @@
PORTNAME= screenFetch
PORTVERSION= 3.0.5
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= LOCAL/jgh/sysutils/${PORTNAME:L}/ \
GH
diff --git a/sysutils/screenfetch/files/patch-screenfetch-dev b/sysutils/screenfetch/files/patch-screenfetch-dev
index 8b51d3717a34..235111afb50f 100644
--- a/sysutils/screenfetch/files/patch-screenfetch-dev
+++ b/sysutils/screenfetch/files/patch-screenfetch-dev
@@ -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