Update to 3.2.0

* Remove obsolete patches.

Changelog:
Version 3.2.0 (2011.11.26)
------------------------
* "--dpi" (or "-d") option has been added to qrencode. This option set DPI
  information in an output PNG image. (Thanks to David Dahl)
* New option "--enable-thread-safety" has been added to the configure script
  that makes the library thread-safe. It is enabled by default.
* QRcode_encodeData(), QRcode_encodeDataMQR, QRcode_encodeDataStructured() have
  been added for binary data encoding including '\0'.
* Typo and bug fixes.
* Experimental Micro QR Code support has been added.
* "--micro" (or "-M") option for Micro QR Code has been added to qrencode.
  (experimental)

Release Note:
Binary data including '\0' is now supported. To encode a binary data, give "-8"
option to qrencode, and let qrencode obtain data via standard input like
"qrencode -8 -o output.png < binary". "--dpi" and "-d" are also added to embed
DPI information to PNG file.

A bug in the mask pattern evaluation routine has been fixed. In some cases,
libqrencode may generate a different symbol from the one that was generated by
the prior libqrencode because of this bug fix, but the embedded data are not
affected. The symbols generated by the old libqrencode are valid.

Experimental support of Micro QR Code encoder has been added. Some functions
(QRcode_*MQR()) have been added to the library. The command line tool generates
Micro QR Code when "--micro" or "-M" is given.

4 files changed, 6 insertions, 75 deletions

diff --git a/converters/qrencode/Makefile b/converters/qrencode/Makefile
index 2c9ece2cd12..8ac25877d5a 100644
--- a/converters/qrencode/Makefile
+++ b/converters/qrencode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/07/20 19:08:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2011/12/13 21:44:36 ryoon Exp $
 #
 
-DISTNAME=	qrencode-3.1.1
+DISTNAME=	qrencode-3.2.0
 CATEGORIES=	converters
 MASTER_SITES=	http://fukuchi.org/works/qrencode/
 
diff --git a/converters/qrencode/distinfo b/converters/qrencode/distinfo
index b059556fbd0..4111d240a35 100644
--- a/converters/qrencode/distinfo
+++ b/converters/qrencode/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2011/07/20 19:08:14 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2011/12/13 21:44:36 ryoon Exp $
 
-SHA1 (qrencode-3.1.1.tar.gz) = c3eb6c44553daa612a9bcf413d3cab7c46241373
-RMD160 (qrencode-3.1.1.tar.gz) = 22c832c363f3ed38d3a44479ab8599c79a665f72
-Size (qrencode-3.1.1.tar.gz) = 377838 bytes
-SHA1 (patch-aa) = b369fd6bd0a47c5fe2464d270e0ed5819069fa63
-SHA1 (patch-libqrencode.pc.in) = 7255323ce05e7d573cc96d0b535285283a6c975b
+SHA1 (qrencode-3.2.0.tar.gz) = 1c9cf02cc8e79dddc7238cad64b0bf3c48e94210
+RMD160 (qrencode-3.2.0.tar.gz) = ebf131f37b963b4295f8b052eeb33556a5db6cda
+Size (qrencode-3.2.0.tar.gz) = 423280 bytes
diff --git a/converters/qrencode/patches/patch-aa b/converters/qrencode/patches/patch-aa
deleted file mode 100644
index 67805fed0cc..00000000000
--- a/converters/qrencode/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/07/20 19:08:15 ryoon Exp $
-
-* Support libpng15
-
---- configure.orig	2010-02-03 00:43:16.000000000 +0000
-+++ configure
-@@ -11445,12 +11445,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_png_CFLAGS="$png_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
--  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null`
-+  pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng"" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -11463,12 +11463,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_png_LIBS="$png_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
--  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null`
-+  pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng"" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -11487,14 +11487,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""`
-+	        png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng""`
-         else
--	        png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""`
-+	        png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng""`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$png_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements (\"libpng12\") were not met:
-+	as_fn_error "Package requirements (\"libpng\") were not met:
- 
- $png_PKG_ERRORS
- 
diff --git a/converters/qrencode/patches/patch-libqrencode.pc.in b/converters/qrencode/patches/patch-libqrencode.pc.in
deleted file mode 100644
index 789c3503646..00000000000
--- a/converters/qrencode/patches/patch-libqrencode.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-libqrencode.pc.in,v 1.1 2011/07/20 19:08:15 ryoon Exp $
-
-* Fix output of "pkg-config libqrencode --cflags".
-
---- libqrencode.pc.in.orig	2010-01-19 20:13:25.000000000 +0000
-+++ libqrencode.pc.in
-@@ -7,3 +7,4 @@ Name: libqrencode
- Description: A QR Code encoding library
- Version: @VERSION@
- Libs: -L${libdir} -lqrencode
-+Cflags: -I${includedir}