Fix some audit warnings

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

7 files changed, 25 insertions, 34 deletions

diff --git a/Library/Formula/libiconv.rb b/Library/Formula/libiconv.rb
index 1bc683481..d573b6889 100644
--- a/Library/Formula/libiconv.rb
+++ b/Library/Formula/libiconv.rb
@@ -13,8 +13,8 @@ class Libiconv < Formula
 
   def patches
     { :p1 => [
-      'http://svn.macports.org/repository/macports/trunk/dports/textproc/libiconv/files/patch-Makefile.devel',
-      'http://svn.macports.org/repository/macports/trunk/dports/textproc/libiconv/files/patch-utf8mac.diff',
+      'https://trac.macports.org/export/89276/trunk/dports/textproc/libiconv/files/patch-Makefile.devel',
+      'https://trac.macports.org/export/89276/trunk/dports/textproc/libiconv/files/patch-utf8mac.diff',
       DATA
     ]}
   end
diff --git a/Library/Formula/liboil.rb b/Library/Formula/liboil.rb
index b9d2a21c6..9a49abe9b 100644
--- a/Library/Formula/liboil.rb
+++ b/Library/Formula/liboil.rb
@@ -8,6 +8,13 @@ class Liboil < Formula
   depends_on 'pkg-config' => :build
   depends_on 'glib'
 
+  def patches
+    { :p0 => [
+      "https://trac.macports.org/export/89276/trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff",
+      "https://trac.macports.org/export/89276/trunk/dports/devel/liboil/files/host_cpu.diff"
+    ]}
+  end
+
   def install
     arch = Hardware.is_64_bit? ? 'x64_64' : 'i386'
     inreplace "configure", "__HOST_CPU__", arch
@@ -15,11 +22,4 @@ class Liboil < Formula
     system "make"
     system "make install"
   end
-
-  def patches
-    {:p0 => [
-      "http://svn.macports.org/repository/macports/trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff",
-      "http://svn.macports.org/repository/macports/trunk/dports/devel/liboil/files/host_cpu.diff"
-    ]}
-  end
 end
diff --git a/Library/Formula/libsgml.rb b/Library/Formula/libsgml.rb
index a4e325bd5..a790faa3f 100644
--- a/Library/Formula/libsgml.rb
+++ b/Library/Formula/libsgml.rb
@@ -6,13 +6,13 @@ class Libsgml < Formula
   md5 'a3ba2f8c19faf1a53182d9c6fab22e58'
 
   def patches
-    macports_patches %w[
-      patch-examples_variant.c.diff
-      patch-src_Variant.c.diff
-      patch-Makefile.in.diff
-      patch-configure.in.diff
-      patch-src_Makefile.in.diff
-    ]
+    { :p0 => [
+      "https://trac.macports.org/export/89276/trunk/dports/textproc/libsgml/files/patch-examples_variant.c.diff",
+      "https://trac.macports.org/export/89276/trunk/dports/textproc/libsgml/files/patch-src_Variant.c.diff",
+      "https://trac.macports.org/export/89276/trunk/dports/textproc/libsgml/files/patch-Makefile.in.diff",
+      "https://trac.macports.org/export/89276/trunk/dports/textproc/libsgml/files/patch-configure.in.diff",
+      "https://trac.macports.org/export/89276/trunk/dports/textproc/libsgml/files/patch-src_Makefile.in.diff"
+      ] }
   end
 
   def install
@@ -22,13 +22,4 @@ class Libsgml < Formula
     system "make"
     system "make install"
   end
-
-  def macports_patches(files)
-    { :p0 => files.collect { |file| macports_patch_url('textproc', file) } }
-  end
-
-  def macports_patch_url(group, file)
-    template = 'http://svn.macports.org/repository/macports/trunk/dports/%s/%s/files/%s'
-    template % [group, name, file]
-  end
 end
diff --git a/Library/Formula/lsdvd.rb b/Library/Formula/lsdvd.rb
index 1bdf97378..61d463c97 100644
--- a/Library/Formula/lsdvd.rb
+++ b/Library/Formula/lsdvd.rb
@@ -8,15 +8,16 @@ class Lsdvd < Formula
   depends_on 'libdvdread'
   depends_on 'libdvdcss' => :optional
 
+  def patches
+    {:p0 => [
+       "https://trac.macports.org/export/89276/trunk/dports/sysutils/lsdvd/files/patch-configure.diff",
+       "https://trac.macports.org/export/89276/trunk/dports/sysutils/lsdvd/files/patch-lsdvd_c.diff"
+    ]}
+  end
+
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
-  def patches
-    {:p0 => [
-       "http://svn.macports.org/repository/macports/trunk/dports/sysutils/lsdvd/files/patch-configure.diff",
-       "http://svn.macports.org/repository/macports/trunk/dports/sysutils/lsdvd/files/patch-lsdvd_c.diff"
-    ]}
-  end
 end
diff --git a/Library/Formula/madplay.rb b/Library/Formula/madplay.rb
index d9af0950f..de5f6ae9c 100644
--- a/Library/Formula/madplay.rb
+++ b/Library/Formula/madplay.rb
@@ -12,7 +12,7 @@ class Madplay < Formula
   depends_on 'libid3tag'
 
   def patches
-    {:p0 => "http://svn.macports.org/repository/macports/trunk/dports/audio/madplay/files/patch-audio_carbon.c"}
+    {:p0 => "https://trac.macports.org/export/89276/trunk/dports/audio/madplay/files/patch-audio_carbon.c"}
   end
 
   def install
diff --git a/Library/Formula/mlton.rb b/Library/Formula/mlton.rb
index 342fa5cf0..3bba2c2cf 100644
--- a/Library/Formula/mlton.rb
+++ b/Library/Formula/mlton.rb
@@ -6,7 +6,6 @@ require 'formula'
 
 class Mlton < Formula
   url 'http://mlton.org/pages/Download/attachments/mlton-20100608-1.amd64-darwin.gmp-static.tgz'
-  version '20100608-1'
   homepage 'http://mlton.org'
   md5 'd32430f2b66f05ac0ef6ff087ea109ca'
 
diff --git a/Library/Formula/proctools.rb b/Library/Formula/proctools.rb
index 8651b1f06..11369f5c0 100644
--- a/Library/Formula/proctools.rb
+++ b/Library/Formula/proctools.rb
@@ -7,7 +7,7 @@ class Proctools < Formula
   md5 '714e4350749c680a7806635632d524b1'
 
   def patches
-    base = "http://svn.macports.org/repository/macports/trunk/dports/sysutils/proctools/files"
+    base = "https://trac.macports.org/export/89276/trunk/dports/sysutils/proctools/files"
     { :p0 => ["patch-pfind-Makefile.diff",
               "patch-pfind-pfind.c.diff",
               "patch-pgrep-Makefile.diff",