aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2012-06-26 20:18:03 +0000
committerChris Rees <crees@FreeBSD.org>2012-06-26 20:18:03 +0000
commitfe0512fec78fcdbd8de0c8c7c97912a9a66ee626 (patch)
tree041a179d744bd12ef48b0b654d76226d920a7e98
parent28cba339875efa371055d5f2ef142bdde6def76d (diff)
downloadports-fe0512fec78fcdbd8de0c8c7c97912a9a66ee626.tar.gz
ports-fe0512fec78fcdbd8de0c8c7c97912a9a66ee626.zip
Import upstream fix for pkgng users-- failed on tc Setup if perl was installed
via pkgng Approved by: itetcu (maintainer)
Notes
Notes: svn path=/head/; revision=300041
-rw-r--r--ports-mgmt/tinderbox-devel/Makefile1
-rw-r--r--ports-mgmt/tinderbox-devel/files/patch-lib-tinderlib.sh16
2 files changed, 17 insertions, 0 deletions
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 5e92b49e806d..996f374cb7a9 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= tinderbox
DISTVERSION= 3.4${SNAP}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= ports-mgmt
MASTER_SITES= http://tinderbox.marcuscom.com/ \
diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib-tinderlib.sh b/ports-mgmt/tinderbox-devel/files/patch-lib-tinderlib.sh
new file mode 100644
index 000000000000..9f856eb7db11
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-lib-tinderlib.sh
@@ -0,0 +1,16 @@
+Index: lib/tinderlib.sh
+===================================================================
+RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/lib/tinderlib.sh,v
+retrieving revision 1.69
+diff -u -r1.69 tinderlib.sh
+--- lib/tinderlib.sh 20 Jun 2012 20:47:42 -0000 1.69
++++ lib/tinderlib.sh 26 Jun 2012 19:42:23 -0000
+@@ -664,7 +664,7 @@
+
+ for r in ${reqs} ; do
+ if [ "${use_pkgng}" = "yes" ]; then
+- if [ -z $(pkg info -q ${r}) ]; then
++ if [ -z $(pkg info -qgO ${r}) ]; then
+ missing="${missing} ${r}"
+ error=1
+ fi