qr-code-generator: update to 1.7.0.

Changes: not summarized, git commit log at
https://github.com/nayuki/QR-Code-generator/commits/master

5 files changed, 10 insertions, 53 deletions

diff --git a/graphics/qr-code-generator/Makefile b/graphics/qr-code-generator/Makefile
index c528c4b748e..43c70aeee0d 100644
--- a/graphics/qr-code-generator/Makefile
+++ b/graphics/qr-code-generator/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2020/03/22 18:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/15 13:36:40 wiz Exp $
 
-DISTNAME=	QR-Code-generator-1.6.0
+DISTNAME=	QR-Code-generator-1.7.0
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nayuki/}
@@ -29,11 +29,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/c/*.h ${DESTDIR}${PREFIX}/include/qrcodegen
 	${INSTALL_PROGRAM} ${WRKSRC}/c/qrcodegen-demo ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/c/qrcodegen-test ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/c/qrcodegen-worker ${DESTDIR}${PREFIX}/bin
 
-	${INSTALL_LIB} ${WRKSRC}/cpp/libqrcodegen.a ${DESTDIR}${PREFIX}/lib/libqrcodegencpp.a
+	${INSTALL_LIB} ${WRKSRC}/cpp/libqrcodegencpp.a ${DESTDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/cpp/QrCodeGeneratorDemo ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cpp/QrCodeGeneratorWorker ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/cpp/*.hpp ${DESTDIR}${PREFIX}/include/qrcodegen
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qr-code-generator/PLIST b/graphics/qr-code-generator/PLIST
index 0df0be5580e..2bcd4550ecf 100644
--- a/graphics/qr-code-generator/PLIST
+++ b/graphics/qr-code-generator/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2020/03/22 18:33:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/08/15 13:36:40 wiz Exp $
 bin/QrCodeGeneratorDemo
-bin/QrCodeGeneratorWorker
 bin/qrcodegen-demo
 bin/qrcodegen-test
-bin/qrcodegen-worker
-include/qrcodegen/QrCode.hpp
 include/qrcodegen/qrcodegen.h
+include/qrcodegen/qrcodegen.hpp
 lib/libqrcodegen.a
 lib/libqrcodegencpp.a
diff --git a/graphics/qr-code-generator/distinfo b/graphics/qr-code-generator/distinfo
index 89f3c71837e..9957bdbb06b 100644
--- a/graphics/qr-code-generator/distinfo
+++ b/graphics/qr-code-generator/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/03/22 18:33:29 wiz Exp $
+$NetBSD: distinfo,v 1.5 2021/08/15 13:36:40 wiz Exp $
 
-SHA1 (QR-Code-generator-1.6.0.tar.gz) = 1af4cdb3228fa47bc0a36747b05e0ac554f0ae7c
-RMD160 (QR-Code-generator-1.6.0.tar.gz) = b4b48603ced5734a388b3c91d3a288a5c499f8de
-SHA512 (QR-Code-generator-1.6.0.tar.gz) = 7cf62d29ba7706eab7982bea9f022e5739b38a8c37f6b01e6c8f63458db1b05ad56ba17cd4382639eb60603ce4dd3aff1ee94f993b430d312cdee9b9204af16e
-Size (QR-Code-generator-1.6.0.tar.gz) = 135432 bytes
-SHA1 (patch-c_Makefile) = 926022217e9bf1021416debeba60092cbc3bc3aa
-SHA1 (patch-cpp_Makefile) = 8822a8c6004a30d16b6ae8965b81f952c2d8ad96
+SHA1 (QR-Code-generator-1.7.0.tar.gz) = 006ea1f7779228932dab1a050d76dccf6df822dc
+RMD160 (QR-Code-generator-1.7.0.tar.gz) = c9279af5cc30b5fe9bdad4e48e5d4398d103cf3f
+SHA512 (QR-Code-generator-1.7.0.tar.gz) = 34efa40c382b6e7d060a764936c4e2faa4fbbecd5ea4730492a2cb1960656ed67242d84e20a42400ffdee063ed6bcf3b860fef309d09ee71303f44abaafe9328
+Size (QR-Code-generator-1.7.0.tar.gz) = 130540 bytes
diff --git a/graphics/qr-code-generator/patches/patch-c_Makefile b/graphics/qr-code-generator/patches/patch-c_Makefile
deleted file mode 100644
index 6e9998b02b4..00000000000
--- a/graphics/qr-code-generator/patches/patch-c_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-c_Makefile,v 1.2 2020/02/08 17:50:03 wiz Exp $
-
-Honor LDFLAGS.
-https://github.com/nayuki/QR-Code-generator/pull/76
-
---- c/Makefile.orig	2018-11-02 00:40:31.000000000 +0000
-+++ c/Makefile
-@@ -66,11 +66,11 @@ clean:
- 
- # Executable files
- %: %.o $(LIBFILE)
--	$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)
- 
- # Special executable
- qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
--	$(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^
- 
- # The library
- $(LIBFILE): $(LIBOBJ)
diff --git a/graphics/qr-code-generator/patches/patch-cpp_Makefile b/graphics/qr-code-generator/patches/patch-cpp_Makefile
deleted file mode 100644
index 1a8cdd60554..00000000000
--- a/graphics/qr-code-generator/patches/patch-cpp_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cpp_Makefile,v 1.2 2020/02/08 17:50:03 wiz Exp $
-
-Honor LDFLAGS.
-https://github.com/nayuki/QR-Code-generator/pull/76
-
---- cpp/Makefile.orig	2018-11-02 00:40:31.000000000 +0000
-+++ cpp/Makefile
-@@ -66,7 +66,7 @@ clean:
- 
- # Executable files
- %: %.o $(LIBFILE)
--	$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)
- 
- # The library
- $(LIBFILE): $(LIBOBJ)