From 70ba1f4c9b26aaa7298bcf2cea8ca0284e348c25 Mon Sep 17 00:00:00 2001
From: nibbles 2bits
Date: Tue, 30 Oct 2012 10:53:22 -0700
Subject: netpbm: use Advanced and Trunk branches, redact stable

- Neither super-stable nor stable compile due to our new libpng.
- So swith to using the netpbm advanced and trunk branches.
- Upgrade to the newer advanced revision 1755, version 10.60.02.
- Remove the patches for devel and HEAD that have been merged.
- Works with superenv

Fixes #15677.
Closes #15762.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/netpbm.rb | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/netpbm.rb b/Library/Formula/netpbm.rb
index b948f5f7d..c96a49207 100644
--- a/Library/Formula/netpbm.rb
+++ b/Library/Formula/netpbm.rb
@@ -2,35 +2,18 @@ require 'formula'
 
 class Netpbm < Formula
   homepage 'http://netpbm.sourceforge.net'
-  url 'http://sourceforge.net/projects/netpbm/files/super_stable/10.35.86/netpbm-10.35.86.tgz'
-  sha1 '45b5dacdd844dfd9f2b02a1ba0e59e6a3bddb885'
+  url 'svn+http://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced/', :revision => 1755
+  version '10.60.02'
 
   head 'http://netpbm.svn.sourceforge.net/svnroot/netpbm/trunk'
 
-  devel do
-    url 'svn+http://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced/',
-      :revision => 1724
-    version '10.59.02'
-  end
-
   depends_on "libtiff"
   depends_on "jasper"
   depends_on :libpng
 
-  def patches; { :p0 => %W[
-    https://trac.macports.org/export/95870/trunk/dports/graphics/netpbm/files/patch-clang-sse-workaround.diff
-    https://trac.macports.org/export/95870/trunk/dports/graphics/netpbm/files/patch-converter-other-giftopnm.c-strcaseeq.diff
-    ]}
-  end unless build.stable?
-
   def install
-    if build.stable?
-      system "cp", "Makefile.config.in", "Makefile.config"
-      config = "Makefile.config"
-    else
-      system "cp", "config.mk.in", "config.mk"
-      config = "config.mk"
-    end
+    system "cp", "config.mk.in", "config.mk"
+    config = "config.mk"
 
     inreplace config do |s|
       s.remove_make_var! "CC"
-- 
cgit v1.2.3