Update to 3.5.10.

3.5.10:
This minor maintenance release includes compiler warning fixes,
build configuration improvements, and other janitorial cleanups.

3.5.9:
This minor maintenance release provides a large collection of
build configuration improvements and other janitorial cleanups.

5 files changed, 21 insertions, 22 deletions

diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 668b3fa453c..58846300b4d 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2011/04/22 13:45:13 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/06/03 17:35:38 wiz Exp $
 #
 
-DISTNAME=		libXpm-3.5.8
-PKGREVISION=		1
+DISTNAME=		libXpm-3.5.10
 CATEGORIES=		graphics x11
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo
index 2194a5b688a..4b6ab1f1ee7 100644
--- a/x11/libXpm/distinfo
+++ b/x11/libXpm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/01/15 18:39:00 tnn Exp $
+$NetBSD: distinfo,v 1.5 2012/06/03 17:35:38 wiz Exp $
 
-SHA1 (libXpm-3.5.8.tar.bz2) = 3bfc833ed4527f74b1c66c386da62271d0313413
-RMD160 (libXpm-3.5.8.tar.bz2) = 3b2bd291c0037d646042cb502dfffa1ee62c237e
-Size (libXpm-3.5.8.tar.bz2) = 392021 bytes
-SHA1 (patch-aa) = f34c3f66f0062020366a07c2611955645976f359
-SHA1 (patch-ab) = 93505bd7e3591bd4c94ed835d7c8c91b5d246f6b
-SHA1 (patch-ac) = 43cc51e6214e233b02d81c2dd3cfef23a3a9e30e
+SHA1 (libXpm-3.5.10.tar.bz2) = eca9dbfa6253f7d6cc7d593dc83110c6c4876d7c
+RMD160 (libXpm-3.5.10.tar.bz2) = bc6c0911fb2117ab2a168fafa584a6cb34cdc1ef
+Size (libXpm-3.5.10.tar.bz2) = 431310 bytes
+SHA1 (patch-aa) = c3def60e8162eb5d48056cd27154648eb6ba5e02
+SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919
+SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e
diff --git a/x11/libXpm/patches/patch-aa b/x11/libXpm/patches/patch-aa
index e098d6b5d3b..7eb86d17306 100644
--- a/x11/libXpm/patches/patch-aa
+++ b/x11/libXpm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/01/15 18:39:00 tnn Exp $
+$NetBSD: patch-aa,v 1.3 2012/06/03 17:35:38 wiz Exp $
 
---- configure.orig	2009-10-09 17:32:40.000000000 +0000
+--- configure.orig	2012-03-08 04:40:17.000000000 +0000
 +++ configure
-@@ -22115,6 +22115,10 @@ else
+@@ -17654,6 +17654,10 @@ else
  $as_echo "$LOCALEDIR" >&6; }
  fi
  
@@ -12,4 +12,4 @@ $NetBSD: patch-aa,v 1.2 2010/01/15 18:39:00 tnn Exp $
 +USE_GETTEXT=yes
  if test "x$USE_GETTEXT" = "xyes" ; then
  
- cat >>confdefs.h <<\_ACEOF
+ $as_echo "#define USE_GETTEXT 1" >>confdefs.h
diff --git a/x11/libXpm/patches/patch-ab b/x11/libXpm/patches/patch-ab
index 5b1866e06d0..631e3c5a1a7 100644
--- a/x11/libXpm/patches/patch-ab
+++ b/x11/libXpm/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2008/02/24 02:26:33 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2012/06/03 17:35:38 wiz Exp $
 
---- cxpm/Makefile.in.orig	2007-08-22 16:23:56.000000000 -0400
+--- cxpm/Makefile.in.orig	2012-03-08 04:40:17.000000000 +0000
 +++ cxpm/Makefile.in
-@@ -119,7 +119,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -133,7 +133,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
diff --git a/x11/libXpm/patches/patch-ac b/x11/libXpm/patches/patch-ac
index 042a915217a..35e572f2567 100644
--- a/x11/libXpm/patches/patch-ac
+++ b/x11/libXpm/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1 2008/02/24 02:26:33 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2012/06/03 17:35:38 wiz Exp $
 
---- sxpm/Makefile.in.orig	2007-08-22 16:23:56.000000000 -0400
+--- sxpm/Makefile.in.orig	2012-03-08 04:40:18.000000000 +0000
 +++ sxpm/Makefile.in
-@@ -123,7 +123,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -137,7 +137,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@