Applying patch by trombik to fix #628.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2614 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 3 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8b9c8c7e7..221c73fb0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+    Applied patches by trombik to fix FreeBSD ports (#624 and #628).
+
     Fixed the CA server so that it refuses to send back a certificate
     whose public key doesn't match the CSR.  Instead, it tells the
     user to run 'puppetca --clean'.
diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb
index 529dc7544..c17e47674 100755
--- a/lib/puppet/provider/package/ports.rb
+++ b/lib/puppet/provider/package/ports.rb
@@ -49,7 +49,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         match = $2
         info = $3
 
-        unless pkgstuff =~ /^(\w+)-([0-9].+)$/
+        unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
             raise Puppet::PackageError,
                 "Could not match package info '%s'" % pkgstuff
         end