Tue Jan 21 21:09:41 2020 UTC ()
Stop adding unneeded CFLAGS. Fixes tests on at least macOS Catalina.


(schmonz)
diff -r1.3 -r1.4 pkgsrc/sysutils/qpasswd/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/qpasswd/patches/patch-Makefile
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/qpasswd/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/qpasswd/distinfo 2018/12/22 01:08:56 1.3
+++ pkgsrc/sysutils/qpasswd/distinfo 2020/01/21 21:09:40 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2018/12/22 01:08:56 schmonz Exp $ 1$NetBSD: distinfo,v 1.4 2020/01/21 21:09:40 schmonz Exp $
2 2
3SHA1 (qpasswd-0.5.tar.bz2) = 72cb41406cf1c3542fc70aefbbde74e7c3dd4cf5 3SHA1 (qpasswd-0.5.tar.bz2) = 72cb41406cf1c3542fc70aefbbde74e7c3dd4cf5
4RMD160 (qpasswd-0.5.tar.bz2) = 0b596c1c487bd9d7c45d2710687f17e2b509a64d 4RMD160 (qpasswd-0.5.tar.bz2) = 0b596c1c487bd9d7c45d2710687f17e2b509a64d
5SHA512 (qpasswd-0.5.tar.bz2) = 3ff454b1939a84fb75be54b1a80d5710a710d78af565e2bcaacf1ec37eea9b56450e5c776c41e857cc3c8877dad950f8144023c11c4dca429b8b27108b466951 5SHA512 (qpasswd-0.5.tar.bz2) = 3ff454b1939a84fb75be54b1a80d5710a710d78af565e2bcaacf1ec37eea9b56450e5c776c41e857cc3c8877dad950f8144023c11c4dca429b8b27108b466951
6Size (qpasswd-0.5.tar.bz2) = 71473 bytes 6Size (qpasswd-0.5.tar.bz2) = 71473 bytes
7SHA1 (patch-Makefile) = bb11bb669614f08c20336124496f60d2edf45826 7SHA1 (patch-Makefile) = 89dec099df133f1ca4e508e5e6bb7ec1b1e27cd9
8SHA1 (patch-params.h) = 5836dc6d86b64efb54f23a8ea5558b3d00bb84ce 8SHA1 (patch-params.h) = 5836dc6d86b64efb54f23a8ea5558b3d00bb84ce
9SHA1 (patch-qpasswd.h) = 44e95989e51bec9620e587a27613ad6728af89e0 9SHA1 (patch-qpasswd.h) = 44e95989e51bec9620e587a27613ad6728af89e0
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/qpasswd/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/qpasswd/patches/patch-Makefile 2018/12/22 01:08:56 1.2
+++ pkgsrc/sysutils/qpasswd/patches/patch-Makefile 2020/01/21 21:09:41 1.3
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: patch-Makefile,v 1.2 2018/12/22 01:08:56 schmonz Exp $ 1$NetBSD: patch-Makefile,v 1.3 2020/01/21 21:09:41 schmonz Exp $
2 2
3Use pkgsrc paths, flags, users, etc. 3Use pkgsrc paths, flags, users, etc.
4 4
5--- Makefile.orig 2004-04-08 12:59:11.000000000 +0000 5--- Makefile.orig 2004-04-08 12:59:11.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -3,20 +3,20 @@ 7@@ -3,20 +3,20 @@
8 # - change it to fit your needs 8 # - change it to fit your needs
9 # - see also params.h 9 # - see also params.h
10  10
11-MANDIR = /usr/share/man 11-MANDIR = /usr/share/man
12-DEST = /command 12-DEST = /command
13-GROUP = nofiles 13-GROUP = nofiles
14+MANDIR = ${DESTDIR}${PREFIX}/${PKGMANDIR} 14+MANDIR = ${DESTDIR}${PREFIX}/${PKGMANDIR}
15+DEST = ${DESTDIR}${PREFIX}/bin 15+DEST = ${DESTDIR}${PREFIX}/bin
16+#GROUP = nofiles 16+#GROUP = nofiles
17  17
18 ARCH = $(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/') 18 ARCH = $(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/')
19 DIET = $(shell basename `which diet 2>/dev/null` 2>/dev/null) 19 DIET = $(shell basename `which diet 2>/dev/null` 2>/dev/null)
20  20
21 # compiler 21 # compiler
22 CC = $(DIET) gcc 22 CC = $(DIET) gcc
23-CFLAGS = -Os -Wall -pipe -fomit-frame-pointer 23-CFLAGS = -Os -Wall -pipe -fomit-frame-pointer
24-LDFLAGS = -s -lcrypt 24-LDFLAGS = -s -lcrypt
25+CFLAGS += -Os -Wall -pipe -fomit-frame-pointer 25+CFLAGS += -Wall
26+#LDFLAGS = -s -lcrypt 26+#LDFLAGS = -s -lcrypt
27  27
28 # extraflags 28 # extraflags
29-CFLAGS += -mpreferred-stack-boundary=2 -march=$(ARCH) -mcpu=$(ARCH) 29-CFLAGS += -mpreferred-stack-boundary=2 -march=$(ARCH) -mcpu=$(ARCH)
30+#CFLAGS += -mpreferred-stack-boundary=2 -march=$(ARCH) -mcpu=$(ARCH) 30+#CFLAGS += -mpreferred-stack-boundary=2 -march=$(ARCH) -mcpu=$(ARCH)
31 #CFLAGS += -W -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wswitch -Wredundant-decls -Wunused 31 #CFLAGS += -W -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wswitch -Wredundant-decls -Wunused
32 #CFLAGS += -Werror 32 #CFLAGS += -Werror
33 #CFLAGS += -funroll-loops 33 #CFLAGS += -funroll-loops
34@@ -45,18 +45,16 @@ setup: it install 34@@ -45,18 +45,16 @@ setup: it install
35 again: clean setup 35 again: clean setup
36  36
37 multicheckpw: $(OBJS) 37 multicheckpw: $(OBJS)
38- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) 38- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)