Update to 3.1.1

* Update MASTER_SITES and HOMEPAGE.
* set LICENSE
* Fix pg-config --cflags output

Changelog:
3.1.1 (2010.2.3)

        A bug in data encoder has been fixed.

3.1.0 (2009.6.6)

        Various code cleanups and performance improves.
        Strict internal error checks have been added.
        "--without-tests" has become default setting. Specify "--with-tests" to compile test programs.
        Some memory leak bugs have been fixed.

4 files changed, 40 insertions, 35 deletions

diff --git a/converters/qrencode/Makefile b/converters/qrencode/Makefile
index 3dcefa43cb6..2c9ece2cd12 100644
--- a/converters/qrencode/Makefile
+++ b/converters/qrencode/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2011/01/13 13:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/20 19:08:14 ryoon Exp $
 #
 
-DISTNAME=	qrencode-3.0.3
-PKGREVISION=	2
+DISTNAME=	qrencode-3.1.1
 CATEGORIES=	converters
-MASTER_SITES=	http://megaui.net/fukuchi/works/qrencode/
+MASTER_SITES=	http://fukuchi.org/works/qrencode/
 
 MAINTAINER=	alaric@kitten-technologies.co.uk
-HOMEPAGE=	http://megaui.net/fukuchi/works/qrencode/index.en.html
+HOMEPAGE=	http://fukuchi.org/works/qrencode/index.en.html
 COMMENT=	QR Code generator
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES+= c c++
+USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
 MAKE_JOBS_SAFE=		no
diff --git a/converters/qrencode/distinfo b/converters/qrencode/distinfo
index 7d6ff731d33..b059556fbd0 100644
--- a/converters/qrencode/distinfo
+++ b/converters/qrencode/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/06/13 22:44:00 wiz Exp $
+$NetBSD: distinfo,v 1.3 2011/07/20 19:08:14 ryoon Exp $
 
-SHA1 (qrencode-3.0.3.tar.gz) = 818924a8b648ddee3cd2df556455a3d468ab87c5
-RMD160 (qrencode-3.0.3.tar.gz) = 7e94883cdc8434e1511eef319af01d9733e8960a
-Size (qrencode-3.0.3.tar.gz) = 399547 bytes
-SHA1 (patch-aa) = e4241ea1c7443f9dd748e4df0e8aa1777b734c72
+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
diff --git a/converters/qrencode/patches/patch-aa b/converters/qrencode/patches/patch-aa
index 1d3d3defedb..67805fed0cc 100644
--- a/converters/qrencode/patches/patch-aa
+++ b/converters/qrencode/patches/patch-aa
@@ -1,40 +1,42 @@
-$NetBSD: patch-aa,v 1.1 2010/06/13 22:44:00 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2011/07/20 19:08:15 ryoon Exp $
 
---- configure.orig	2008-05-26 18:01:17.000000000 +0000
+* Support libpng15
+
+--- configure.orig	2010-02-03 00:43:16.000000000 +0000
 +++ configure
-@@ -21145,12 +21145,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -11445,12 +11445,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_png_CFLAGS="$png_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\"") >&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&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=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $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
-@@ -21163,12 +21163,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -11463,12 +11463,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_png_LIBS="$png_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\"") >&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&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=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $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
-@@ -21187,14 +21187,14 @@ else
+@@ -11487,14 +11487,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -47,17 +49,8 @@ $NetBSD: patch-aa,v 1.1 2010/06/13 22:44:00 wiz Exp $
  	# Put the nasty error message in config.log where it belongs
  	echo "$png_PKG_ERRORS" >&5
  
--	{ { echo "$as_me:$LINENO: error: Package requirements (\"libpng12\") were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (\"libpng\") were not met:
- 
- $png_PKG_ERRORS
- 
-@@ -21205,7 +21205,7 @@ Alternatively, you may set the environme
- and png_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (\"libpng12\") were not met:
-+echo "$as_me: error: Package requirements (\"libpng\") were not met:
+-	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
new file mode 100644
index 00000000000..789c3503646
--- /dev/null
+++ b/converters/qrencode/patches/patch-libqrencode.pc.in
@@ -0,0 +1,11 @@
+$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}