aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2013-01-28 09:24:55 +0800
committerswills <swills@FreeBSD.org>2013-01-28 09:24:55 +0800
commitfcf722db8fdb65829047bba76ca32c535cf47df2 (patch)
treee855cd64a66f126727f19e2c96853a937d5e13f0
parentc1599098d593aa9fa221ff978b4bf2d7ea1bf0d8 (diff)
downloadfreebsd-ports-gnome-fcf722db8fdb65829047bba76ca32c535cf47df2.tar.gz
freebsd-ports-gnome-fcf722db8fdb65829047bba76ca32c535cf47df2.tar.zst
freebsd-ports-gnome-fcf722db8fdb65829047bba76ca32c535cf47df2.zip
- Revert previous change to patch file. The goal was to prevent a warning with
Ruby 1.9, but this just caused problems with Ruby 1.8. PR: ports/175558
-rw-r--r--sysutils/puppet/Makefile2
-rw-r--r--sysutils/puppet/files/optpatch-package_origin4
2 files changed, 3 insertions, 3 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 520a97b73e51..c8812a0cd310 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -3,7 +3,7 @@
PORTNAME= puppet
PORTVERSION= 3.0.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
diff --git a/sysutils/puppet/files/optpatch-package_origin b/sysutils/puppet/files/optpatch-package_origin
index 92756545efce..971cb41066a3 100644
--- a/sysutils/puppet/files/optpatch-package_origin
+++ b/sysutils/puppet/files/optpatch-package_origin
@@ -30,8 +30,8 @@
- def self.listcmd
- command(:pkginfo)
-+ class_variable_set(:@@lock, Mutex.new)
-+ class_variable_set(:@@ports_index, new)
++ @@lock = Mutex.new
++ @@ports_index = nil
+
+ # fix bug in URI::FTP merge method that tries to set typecode
+ # even when other is a string.