Update libsixel to 1.4.2.

portability fixes.

4 files changed, 6 insertions, 76 deletions

diff --git a/graphics/libsixel/Makefile b/graphics/libsixel/Makefile
index d6862dfbcf7..b52fddf36f9 100644
--- a/graphics/libsixel/Makefile
+++ b/graphics/libsixel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2014/12/03 06:38:27 obache Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/10 09:02:09 obache Exp $
 
-DISTNAME=		libsixel-1.4.1
+DISTNAME=		libsixel-1.4.2
 CATEGORIES=		graphics
 MASTER_SITES=		-https://github.com/saitoha/libsixel/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
diff --git a/graphics/libsixel/distinfo b/graphics/libsixel/distinfo
index 34947ec4334..8eb7db1d47d 100644
--- a/graphics/libsixel/distinfo
+++ b/graphics/libsixel/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2014/12/03 06:38:27 obache Exp $
+$NetBSD: distinfo,v 1.12 2014/12/10 09:02:09 obache Exp $
 
-SHA1 (libsixel-1.4.1.tar.gz) = 0a23cdb45aa747daa4d6c2c0081295b85be89fdc
-RMD160 (libsixel-1.4.1.tar.gz) = 4aba9ddeea20d23a4986f9e0347414c9e98d6eab
-Size (libsixel-1.4.1.tar.gz) = 4038295 bytes
-SHA1 (patch-configure) = 4339e88886cf6bda5ec7d32c99209e526df151aa
-SHA1 (patch-configure.ac) = 36989cfe656a6a3e21cbf2a4572528db652f5150
+SHA1 (libsixel-1.4.2.tar.gz) = 9c8a2013161b815856f806e702f54f7c98c0d576
+RMD160 (libsixel-1.4.2.tar.gz) = c5be612c4909478c7ba5a6fcf3a1219585c4c872
+Size (libsixel-1.4.2.tar.gz) = 4038121 bytes
diff --git a/graphics/libsixel/patches/patch-configure b/graphics/libsixel/patches/patch-configure
deleted file mode 100644
index aa338021f5d..00000000000
--- a/graphics/libsixel/patches/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2014/12/03 06:38:27 obache Exp $
-
-* kill bashizm
-  https://github.com/saitoha/libsixel/pull/19
-
---- configure.orig	2014-11-30 17:14:29.000000000 +0000
-+++ configure
-@@ -13853,7 +13853,7 @@ fi
- 
- 
- if test x$with_libcurl != xno; then
--    if test x$build == x$host; then
-+    if test x$build = x$host; then
-         ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
- if test "x$ac_cv_header_curl_curl_h" = xyes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_cleanup in -lcurl" >&5
-@@ -13997,7 +13997,7 @@ fi
- 
- 
- if test x$with_jpeg != xno; then
--    if test x$build == x$host; then
-+    if test x$build = x$host; then
-         ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
- if test "x$ac_cv_header_jpeglib_h" = xyes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5
-@@ -14067,7 +14067,7 @@ fi
- 
- 
- if test x$with_png != xno; then
--    if test x$build == x$host; then
-+    if test x$build = x$host; then
-         ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
- if test "x$ac_cv_header_png_h" = xyes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_check_sig in -lpng" >&5
diff --git a/graphics/libsixel/patches/patch-configure.ac b/graphics/libsixel/patches/patch-configure.ac
deleted file mode 100644
index 05b2d339457..00000000000
--- a/graphics/libsixel/patches/patch-configure.ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2014/12/03 06:38:27 obache Exp $
-
-* kill bashizm
-  https://github.com/saitoha/libsixel/pull/19
-
---- configure.ac.orig	2014-11-30 17:14:29.000000000 +0000
-+++ configure.ac
-@@ -296,7 +296,7 @@ AC_SUBST(GD_CFLAGS)
- AC_SUBST(GD_LIBS)
- 
- if test x$with_libcurl != xno; then
--    if test x$build == x$host; then
-+    if test x$build = x$host; then
-         AC_CHECK_HEADER([curl/curl.h],
-                         [AC_CHECK_LIB([curl],
-                                       [curl_easy_cleanup],
-@@ -326,7 +326,7 @@ AC_SUBST(LIBCURL_CFLAGS)
- AC_SUBST(LIBCURL_LIBS)
- 
- if test x$with_jpeg != xno; then
--    if test x$build == x$host; then
-+    if test x$build = x$host; then
-         AC_CHECK_HEADER([jpeglib.h],
-                         [AC_CHECK_LIB([jpeg],
-                                       [jpeg_read_header],
-@@ -349,7 +349,7 @@ AC_SUBST(LIBJPEG_CFLAGS)
- AC_SUBST(LIBJPEG_LIBS)
- 
- if test x$with_png != xno; then
--    if test x$build == x$host; then
-+    if test x$build = x$host; then
-         AC_CHECK_HEADER([png.h],
-                         [AC_CHECK_LIB([png],
-                                       [png_check_sig],