CVS commit: pkgsrc/sysutils/qpasswd

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Dec 22 01:08:56 UTC 2018

Modified Files:
        pkgsrc/sysutils/qpasswd: distinfo
        pkgsrc/sysutils/qpasswd/patches: patch-Makefile

Log Message:
Move LDFLAGS to the end. Fixes Ubuntu, doesn't break NetBSD or OS X.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/qpasswd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/qpasswd/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/qpasswd/distinfo
diff -u pkgsrc/sysutils/qpasswd/distinfo:1.2 pkgsrc/sysutils/qpasswd/distinfo:1.3
--- pkgsrc/sysutils/qpasswd/distinfo:1.2        Mon Dec 17 16:32:18 2018
+++ pkgsrc/sysutils/qpasswd/distinfo    Sat Dec 22 01:08:56 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2018/12/17 16:32:18 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2018/12/22 01:08:56 schmonz Exp $
 
 SHA1 (qpasswd-0.5.tar.bz2) = 72cb41406cf1c3542fc70aefbbde74e7c3dd4cf5
 RMD160 (qpasswd-0.5.tar.bz2) = 0b596c1c487bd9d7c45d2710687f17e2b509a64d
 SHA512 (qpasswd-0.5.tar.bz2) = 3ff454b1939a84fb75be54b1a80d5710a710d78af565e2bcaacf1ec37eea9b56450e5c776c41e857cc3c8877dad950f8144023c11c4dca429b8b27108b466951
 Size (qpasswd-0.5.tar.bz2) = 71473 bytes
-SHA1 (patch-Makefile) = c0da81b6a27bc75c43e04bd88c7555ac67352ac9
+SHA1 (patch-Makefile) = bb11bb669614f08c20336124496f60d2edf45826
 SHA1 (patch-params.h) = 5836dc6d86b64efb54f23a8ea5558b3d00bb84ce
 SHA1 (patch-qpasswd.h) = 44e95989e51bec9620e587a27613ad6728af89e0

Index: pkgsrc/sysutils/qpasswd/patches/patch-Makefile
diff -u pkgsrc/sysutils/qpasswd/patches/patch-Makefile:1.1 pkgsrc/sysutils/qpasswd/patches/patch-Makefile:1.2
--- pkgsrc/sysutils/qpasswd/patches/patch-Makefile:1.1  Sun Aug  5 15:00:46 2018
+++ pkgsrc/sysutils/qpasswd/patches/patch-Makefile      Sat Dec 22 01:08:56 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2018/08/05 15:00:46 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2018/12/22 01:08:56 schmonz Exp $
 
 Use pkgsrc paths, flags, users, etc.
 
@@ -31,18 +31,21 @@ Use pkgsrc paths, flags, users, etc.
  #CFLAGS += -W -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wswitch -Wredundant-decls -Wunused
  #CFLAGS += -Werror
  #CFLAGS += -funroll-loops
-@@ -46,17 +46,15 @@ again:     clean setup
+@@ -45,18 +45,16 @@ setup:  it install
+ again:        clean setup
  
  multicheckpw: $(OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
 -      $(STRIP) $@
++      $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
        for i in checkpasswd checkqpasswd qpasswd; do \
         ( test -f $$i || ln -s multicheckpw $$i ) \
        done
  
  test-cases: $(OBJS2)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS2)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS2)
 -      $(STRIP) $@
++      $(CC) $(CFLAGS) -o $@ $(OBJS2) $(LDFLAGS)
  
  check:        test-cases
 -      test-cases > test-cases.computed