qr-code-generator: update to 1.4.0nb1.

Honor LDFLAGS. Fixes RELRO build.

4 files changed, 40 insertions, 2 deletions

diff --git a/graphics/qr-code-generator/Makefile b/graphics/qr-code-generator/Makefile
index eef447865bb..3e9a29c297e 100644
--- a/graphics/qr-code-generator/Makefile
+++ b/graphics/qr-code-generator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/02/05 13:17:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2020/02/08 17:47:26 wiz Exp $
 
 DISTNAME=	QR-Code-generator-1.4.0
 PKGNAME=	${DISTNAME:tl}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://dev-www.libreoffice.org/src/
 
diff --git a/graphics/qr-code-generator/distinfo b/graphics/qr-code-generator/distinfo
index 154cf310860..b8a103d6e16 100644
--- a/graphics/qr-code-generator/distinfo
+++ b/graphics/qr-code-generator/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2020/02/05 13:17:21 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2020/02/08 17:47:26 wiz Exp $
 
 SHA1 (QR-Code-generator-1.4.0.tar.gz) = df391cea80b616eec37a51eb8b2dddb0024c8e6a
 RMD160 (QR-Code-generator-1.4.0.tar.gz) = 85b239aeff420e06358532a2efac1e13e8f15a35
 SHA512 (QR-Code-generator-1.4.0.tar.gz) = 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
 Size (QR-Code-generator-1.4.0.tar.gz) = 146339 bytes
+SHA1 (patch-c_Makefile) = 96e6c371a10fb44109929d15d331e24d9bb4de45
+SHA1 (patch-cpp_Makefile) = 7eaee301c4187069b307b5e43d131136b03d5d4c
diff --git a/graphics/qr-code-generator/patches/patch-c_Makefile b/graphics/qr-code-generator/patches/patch-c_Makefile
new file mode 100644
index 00000000000..bcf32176cff
--- /dev/null
+++ b/graphics/qr-code-generator/patches/patch-c_Makefile
@@ -0,0 +1,20 @@
+$NetBSD: patch-c_Makefile,v 1.1 2020/02/08 17:47:27 wiz Exp $
+
+Honor LDFLAGS.
+
+--- 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
new file mode 100644
index 00000000000..18e533846c1
--- /dev/null
+++ b/graphics/qr-code-generator/patches/patch-cpp_Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-cpp_Makefile,v 1.1 2020/02/08 17:47:27 wiz Exp $
+
+Honor LDFLAGS.
+
+--- 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)