Remove two patches/chunks for ancient problems.

Update patch status for the ones that are in upstream releases/will be
included soon.

16 files changed, 53 insertions, 65 deletions

diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 633bb8e22eb..cec608f0c8c 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,29 +1,28 @@
-$NetBSD: distinfo,v 1.89 2014/08/21 21:01:58 wiz Exp $
+$NetBSD: distinfo,v 1.90 2014/08/25 08:23:22 wiz Exp $
 
 SHA1 (netpbm-10.35.93.tgz) = fe80f0e1ccf182a614cfaab617cf486892c5f9fb
 RMD160 (netpbm-10.35.93.tgz) = 9e4bf4c66584e928e399a4b44b11a06a7daae77a
 Size (netpbm-10.35.93.tgz) = 2557610 bytes
 SHA1 (patch-aa) = fd533685c5b0058f19d1b4525a4b2b9f2b239627
-SHA1 (patch-ab) = 4d6508ad837d455ea3f8ebaa704f33f9e089f6e0
-SHA1 (patch-ac) = 11c029673a53e9344a477db6cfcb46f32e9f6a93
-SHA1 (patch-ad) = c9ed6aed9d503a94c94a39c8ee088f9ba2a6dd25
+SHA1 (patch-ac) = 9ca2e6ba91dc1552aed51835c952c4f35251c88b
+SHA1 (patch-ad) = 29d58c6c9eb05deaf40a31c5439dacb30f9d34d1
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
-SHA1 (patch-ag) = 093fe392a3e6156cc55f225a6f139842c0d00570
+SHA1 (patch-ag) = 4c59c79164d8718dbd329765f99f327a78e7f59f
 SHA1 (patch-ai) = 083ddf8b36a74ca39508b6a3b0c35956ac19fbb7
-SHA1 (patch-aj) = 44521e88f446a9a4eea6d9ffeb20ceba4653faca
-SHA1 (patch-ak) = f1e06e236442c96670b1f1829d4e67d051ecb776
-SHA1 (patch-al) = 3a7c804f608dd3e24070a76b8ad8e9b5e1ab958e
-SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3
-SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777
-SHA1 (patch-ax) = d50e56191192b4caf423ed081581868bb1a63de8
-SHA1 (patch-ay) = 60ab532de6d6ec498ada140f795bba327a562e13
-SHA1 (patch-cb) = b1be33ae6acfe57bf2f407cd48a6b140c3ddea85
-SHA1 (patch-converter_other_pngtopnm.c) = d0054e042e616758c4a2787d7e9b35c8f232c40f
+SHA1 (patch-aj) = 130910b88e22c57314fd2cecbb07b0a03ea560e7
+SHA1 (patch-ak) = 6c358f811cd5f5632efdf2c7a2512e51b155a04b
+SHA1 (patch-al) = 00c29f69faa24d6bb0c9021291f73dea60020e6b
+SHA1 (patch-ao) = 20bd6ac29b9e2ee25f22a24f3758dca2a01f7bd5
+SHA1 (patch-aw) = 7c1fde7b578f93e5a075bd941c46b34a43d5d3c3
+SHA1 (patch-ax) = 91deefdd6c7eb263b43c9313725268a4d627d525
+SHA1 (patch-ay) = 8d75488d897853b7ecbf9b836bb92f720f8f75ae
+SHA1 (patch-cb) = 25b53b56f9fa4de70f863a7ef8b5fcc4e0a8941a
+SHA1 (patch-converter_other_pngtopnm.c) = 43db1eeee8d077bc4b3c8b6e12e5ccec031ede48
 SHA1 (patch-converter_ppm_ppmtompeg_psocket.c) = ebb11ea1867ed401a0299eeb907aad70276ce843
 SHA1 (patch-da) = 8ae329469bf0bd55b671dffeb4253b8d14621f5c
 SHA1 (patch-db) = 23a05e54043ee84a0b7ec507a383d5cd8adfcca5
 SHA1 (patch-dc) = affd0ca1b437a6c5b10f1ffacff5d0ed9185cda7
 SHA1 (patch-dd) = 9f9c53959f5afd444ce427b782f9ba2c73068f27
-SHA1 (patch-lib_libpbm3.c) = 42e7d49fecb559fb1d55345e5053337e60f7458b
-SHA1 (patch-lib_libsystem.c) = a140994267e62a90dd63667a0f87c65a2278ed0f
+SHA1 (patch-lib_libpbm3.c) = bdca78193847cf28cde1255d05a3a01ae3bfef22
+SHA1 (patch-lib_libsystem.c) = 2f634cc295f696d270054fcc4badf4e37025691b
 SHA1 (patch-ppmdraw) = d901a690f8f21a1af940129d1edef509b369ea1a
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
deleted file mode 100644
index ead4350d688..00000000000
--- a/graphics/netpbm/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.21 2010/07/13 06:08:23 adam Exp $
-
---- converter/other/Makefile.orig	2009-09-18 19:04:37.000000000 +0000
-+++ converter/other/Makefile
-@@ -135,6 +135,13 @@ all:	$(BINARIES) $(SUBDIRS:%=%/all)
- 
- include $(SRCDIR)/Makefile.common
- 
-+# XXX sparc64 gcc 3.3.x toolchain bug; compile exif.o without optimisation
-+ifeq ($(MACHINE),sparc64)
-+exif.o: exif.c
-+	$(CC) -c $(INCLUDES2) -DNDEBUG \
-+	    $(CPPFLAGS) $(CFLAGS:-O2=) $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
-+endif
-+
- ifeq ($(NEED_RUNTIME_PATH),Y)
-   LIBOPTR = -runtime
- else
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
index a6ef9cbc656..e7396739f9a 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.22 2011/01/15 18:37:46 tron Exp $
+$NetBSD: patch-ac,v 1.23 2014/08/25 08:23:22 wiz Exp $
 
 Fix build with png-1.5.
+Already included in Advanced release.
 
 --- converter/other/pnmtopng.c.orig	2010-12-10 18:19:40.000000000 +0000
 +++ converter/other/pnmtopng.c	2011-01-15 11:15:25.000000000 +0000
diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad
index a8629231b8f..98ebbbf5099 100644
--- a/graphics/netpbm/patches/patch-ad
+++ b/graphics/netpbm/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.21 2014/07/17 15:52:26 ryoon Exp $
+$NetBSD: patch-ad,v 1.22 2014/08/25 08:23:22 wiz Exp $
 
 --- converter/ppm/ppmtompeg/parallel.c.orig	2006-08-19 03:12:28.000000000 +0000
 +++ converter/ppm/ppmtompeg/parallel.c
@@ -13,19 +13,3 @@ $NetBSD: patch-ad,v 1.21 2014/07/17 15:52:26 ryoon Exp $
  /* _ALL_SOURCE is needed on AIX to make the C library include the 
     socket services (e.g. define struct sockaddr) 
  
-@@ -27,6 +30,7 @@
- */
- 
- 
-+#include <sys/types.h>
- #include <stdarg.h>
- #include <time.h>
- #include <unistd.h>
-@@ -36,7 +40,6 @@
- #include <signal.h>
- #include <netdb.h>
- #include <assert.h>
--#include <sys/types.h>
- #include <sys/times.h>
- 
- #include "mallocvar.h"
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
index 51ae120521d..ae45f0ec0d4 100644
--- a/graphics/netpbm/patches/patch-ag
+++ b/graphics/netpbm/patches/patch-ag
@@ -1,4 +1,7 @@
-$NetBSD: patch-ag,v 1.20 2010/10/28 07:09:13 adam Exp $
+$NetBSD: patch-ag,v 1.21 2014/08/25 08:23:22 wiz Exp $
+
+Use LDFLAGS from environment.
+Similar fix already in current Advanced release.
 
 --- buildtools/Makefile.orig	2010-10-28 07:01:24.000000000 +0000
 +++ buildtools/Makefile
diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj
index dd233908dd1..08eecac5aee 100644
--- a/graphics/netpbm/patches/patch-aj
+++ b/graphics/netpbm/patches/patch-aj
@@ -1,6 +1,7 @@
-$NetBSD: patch-aj,v 1.13 2011/01/14 21:51:59 tron Exp $
+$NetBSD: patch-aj,v 1.14 2014/08/25 08:23:22 wiz Exp $
 
 Fix build with png-1.5.
+Already included in Advanced release.
 
 --- converter/other/pngtxt.h.orig	2006-08-19 04:12:28.000000000 +0100
 +++ converter/other/pngtxt.h	2011-01-14 21:39:26.000000000 +0000
diff --git a/graphics/netpbm/patches/patch-ak b/graphics/netpbm/patches/patch-ak
index 2041e5e51ff..479dd2a1f2a 100644
--- a/graphics/netpbm/patches/patch-ak
+++ b/graphics/netpbm/patches/patch-ak
@@ -1,6 +1,7 @@
-$NetBSD: patch-ak,v 1.9 2011/01/14 21:51:59 tron Exp $
+$NetBSD: patch-ak,v 1.10 2014/08/25 08:23:22 wiz Exp $
 
 Fix build with png-1.5.
+Already included in Advanced release.
 
 --- converter/other/pngtxt.c.orig	2006-08-19 04:12:28.000000000 +0100
 +++ converter/other/pngtxt.c	2011-01-14 21:28:09.000000000 +0000
diff --git a/graphics/netpbm/patches/patch-al b/graphics/netpbm/patches/patch-al
index 44e2bec9c1c..4d402c825c0 100644
--- a/graphics/netpbm/patches/patch-al
+++ b/graphics/netpbm/patches/patch-al
@@ -1,6 +1,7 @@
-$NetBSD: patch-al,v 1.5 2011/01/15 18:37:46 tron Exp $
+$NetBSD: patch-al,v 1.6 2014/08/25 08:23:22 wiz Exp $
 
 Fix build with png-1.5.
+Already included in Advanced release.
 
 --- converter/other/pamrgbatopng.c.orig	2006-08-19 04:12:28.000000000 +0100
 +++ converter/other/pamrgbatopng.c	2011-01-15 18:24:36.000000000 +0000
diff --git a/graphics/netpbm/patches/patch-ao b/graphics/netpbm/patches/patch-ao
index 7ce566e0e33..e629bcf330e 100644
--- a/graphics/netpbm/patches/patch-ao
+++ b/graphics/netpbm/patches/patch-ao
@@ -1,4 +1,7 @@
-$NetBSD: patch-ao,v 1.4 2010/02/19 18:25:44 drochner Exp $
+$NetBSD: patch-ao,v 1.5 2014/08/25 08:23:22 wiz Exp $
+
+Add missing header.
+Already included in current Advanced release.
 
 --- converter/ppm/ppmtompeg/headers/frames.h.orig	2006-10-18 18:29:13.000000000 +0000
 +++ converter/ppm/ppmtompeg/headers/frames.h
diff --git a/graphics/netpbm/patches/patch-aw b/graphics/netpbm/patches/patch-aw
index fdc9f7df3a7..e9d4799fd12 100644
--- a/graphics/netpbm/patches/patch-aw
+++ b/graphics/netpbm/patches/patch-aw
@@ -1,4 +1,7 @@
-$NetBSD: patch-aw,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+$NetBSD: patch-aw,v 1.4 2014/08/25 08:23:22 wiz Exp $
+
+Use CPPFLAGS from environment.
+Already included in current Advanced release.
 
 --- lib/Makefile.orig	2006-10-03 20:55:25.000000000 +0200
 +++ lib/Makefile	2006-10-03 20:55:56.000000000 +0200
diff --git a/graphics/netpbm/patches/patch-ax b/graphics/netpbm/patches/patch-ax
index 8eb6f796864..1b6b6f59354 100644
--- a/graphics/netpbm/patches/patch-ax
+++ b/graphics/netpbm/patches/patch-ax
@@ -1,4 +1,7 @@
-$NetBSD: patch-ax,v 1.3 2006/11/19 15:50:59 tron Exp $
+$NetBSD: patch-ax,v 1.4 2014/08/25 08:23:22 wiz Exp $
+
+Fix unportablet test(1) construct.
+Will be included in next Advanced release.
 
 --- converter/ppm/hpcdtoppm/pcdovtoppm.orig	2004-10-23 00:12:12.000000000 +0100
 +++ converter/ppm/hpcdtoppm/pcdovtoppm	2006-11-19 15:46:03.000000000 +0000
diff --git a/graphics/netpbm/patches/patch-ay b/graphics/netpbm/patches/patch-ay
index 74c15b44313..e046ddff6f9 100644
--- a/graphics/netpbm/patches/patch-ay
+++ b/graphics/netpbm/patches/patch-ay
@@ -1,7 +1,8 @@
-$NetBSD: patch-ay,v 1.3 2007/01/13 01:16:17 dmcmahill Exp $
+$NetBSD: patch-ay,v 1.4 2014/08/25 08:23:22 wiz Exp $
 
 This is needed for some non-gcc compilers such as the Sun 
-Studio c-compiler
+Studio c-compiler.
+Will be included in next Super Stable release.
 
 --- lib/ppm.h.orig	2006-04-29 18:13:01.000000000 -0400
 +++ lib/ppm.h
diff --git a/graphics/netpbm/patches/patch-cb b/graphics/netpbm/patches/patch-cb
index b67aafc6d07..68a03ddb1d4 100644
--- a/graphics/netpbm/patches/patch-cb
+++ b/graphics/netpbm/patches/patch-cb
@@ -1,4 +1,7 @@
-$NetBSD: patch-cb,v 1.1 2006/10/11 18:44:25 rillig Exp $
+$NetBSD: patch-cb,v 1.2 2014/08/25 08:23:22 wiz Exp $
+
+Fix unportablet test(1) construct.
+Will be included in next Advanced release.
 
 --- buildtools/installosf.orig	2002-01-29 05:03:15.000000000 +0100
 +++ buildtools/installosf	2006-10-11 20:41:35.000000000 +0200
diff --git a/graphics/netpbm/patches/patch-converter_other_pngtopnm.c b/graphics/netpbm/patches/patch-converter_other_pngtopnm.c
index de8127fb2ce..c49e187a379 100644
--- a/graphics/netpbm/patches/patch-converter_other_pngtopnm.c
+++ b/graphics/netpbm/patches/patch-converter_other_pngtopnm.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-converter_other_pngtopnm.c,v 1.1 2014/08/21 20:58:23 wiz Exp $
+$NetBSD: patch-converter_other_pngtopnm.c,v 1.2 2014/08/25 08:23:22 wiz Exp $
 
 Fix build with png-1.5 and newer.
+Already included in Advanced release.
 
 --- converter/other/pngtopnm.c.orig	2011-11-25 00:15:46.000000000 +0000
 +++ converter/other/pngtopnm.c
diff --git a/graphics/netpbm/patches/patch-lib_libpbm3.c b/graphics/netpbm/patches/patch-lib_libpbm3.c
index d357b486917..0193b4cbd96 100644
--- a/graphics/netpbm/patches/patch-lib_libpbm3.c
+++ b/graphics/netpbm/patches/patch-lib_libpbm3.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-lib_libpbm3.c,v 1.1 2011/04/04 09:17:24 adam Exp $
+$NetBSD: patch-lib_libpbm3.c,v 1.2 2014/08/25 08:23:22 wiz Exp $
 
 Clang does not support SSE extensions at the moment.
+Different patch having same effect already in current Advanced release.
 
 --- lib/libpbm3.c.orig	2011-03-29 09:31:31.000000000 +0000
 +++ lib/libpbm3.c
diff --git a/graphics/netpbm/patches/patch-lib_libsystem.c b/graphics/netpbm/patches/patch-lib_libsystem.c
index a5b3974c1d9..b9ee012f35f 100644
--- a/graphics/netpbm/patches/patch-lib_libsystem.c
+++ b/graphics/netpbm/patches/patch-lib_libsystem.c
@@ -1,7 +1,8 @@
-$NetBSD: patch-lib_libsystem.c,v 1.2 2014/07/17 15:52:26 ryoon Exp $
+$NetBSD: patch-lib_libsystem.c,v 1.3 2014/08/25 08:23:22 wiz Exp $
 
 * For SIGWINCH and SIGIO, _XOPEN_SOURCE should not be defined under OpenBSD 5.5
 * SCO OpenServer 5.0.7/3.2 has no SIGURG and SIGIO.
+  This chunk will be included in next Super Stable release.
 
 --- lib/libsystem.c.orig	2010-07-10 01:38:01.000000000 +0000
 +++ lib/libsystem.c