CVS commit: pkgsrc/sysutils/usbutil

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Mon Jul 29 11:19:56 UTC 2019

Modified Files:
        pkgsrc/sysutils/usbutil: Makefile distinfo
Added Files:
        pkgsrc/sysutils/usbutil/patches: patch-Makefile
Removed Files:
        pkgsrc/sysutils/usbutil/patches: patch-ae

Log Message:
Failed to build with RELRO option

- Honor LDFLAGS
- Bump PKGREVISION
- Add LICENSE (to fix pkglint error)
- Comment out dead homepage, reset maintainer
  OK by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/usbutil/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/usbutil/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/usbutil/patches/patch-Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/usbutil/patches/patch-ae

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

Modified files:

Index: pkgsrc/sysutils/usbutil/Makefile
diff -u pkgsrc/sysutils/usbutil/Makefile:1.18 pkgsrc/sysutils/usbutil/Makefile:1.19
--- pkgsrc/sysutils/usbutil/Makefile:1.18       Tue Oct 23 19:51:28 2012
+++ pkgsrc/sysutils/usbutil/Makefile    Mon Jul 29 11:19:56 2019
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.18 2012/10/23 19:51:28 asau Exp $
-#
+# $NetBSD: Makefile,v 1.19 2019/07/29 11:19:56 micha Exp $
 
 DISTNAME=      usbutil-0.5
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    sysutils
-MASTER_SITES=  ftp://ftp.augustsson.net/pub/netbsd/
+#MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
 
-MAINTAINER=    lennart%augustsson.net@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       USB developer utilities
+LICENSE=       2-clause-bsd
+
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man8
 
 post-install:
-       ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
        ${INSTALL_MAN} ${WRKSRC}/usbgen.8 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/usbgen.8
 

Index: pkgsrc/sysutils/usbutil/distinfo
diff -u pkgsrc/sysutils/usbutil/distinfo:1.15 pkgsrc/sysutils/usbutil/distinfo:1.16
--- pkgsrc/sysutils/usbutil/distinfo:1.15       Wed Nov  4 01:32:34 2015
+++ pkgsrc/sysutils/usbutil/distinfo    Mon Jul 29 11:19:56 2019
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2015/11/04 01:32:34 agc Exp $
+$NetBSD: distinfo,v 1.16 2019/07/29 11:19:56 micha Exp $
 
 SHA1 (usbutil-0.5.tar.gz) = 4c9abc6f370ab561bd2748b1792802d1e959c599
 RMD160 (usbutil-0.5.tar.gz) = 48c6bedeed8daf50a760feedef3575db021066f8
 SHA512 (usbutil-0.5.tar.gz) = 7bede70e32b185123f7297ccfe49f28ec7724a83ae018d9fce69e4aad6211a18571e177249da4d20cee3c7db3362011a4b13d6044a5f858bdc3951a247498dd8
 Size (usbutil-0.5.tar.gz) = 11508 bytes
+SHA1 (patch-Makefile) = dace3011ddd427f40e676099d9ff11726ff6679a
 SHA1 (patch-aa) = 8db548f99befd76839b8b31caa2de0861c6d708b
 SHA1 (patch-ab) = b470a91102e8ea4fbb592b4a0f5978ed11196969
 SHA1 (patch-ac) = 0c1c7e67c84c1a6db1ad0144803977bee7c61ceb
 SHA1 (patch-ad) = a98c2a46c6eb860416ff631c62361f5b0282def8
-SHA1 (patch-ae) = 92844785b7e6232332a0437cc257b8ecb3f2f50e

Added files:

Index: pkgsrc/sysutils/usbutil/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/usbutil/patches/patch-Makefile:1.1
--- /dev/null   Mon Jul 29 11:19:56 2019
+++ pkgsrc/sysutils/usbutil/patches/patch-Makefile      Mon Jul 29 11:19:56 2019
@@ -0,0 +1,33 @@
+$NetBSD: patch-Makefile,v 1.1 2019/07/29 11:19:56 micha Exp $
+
+Honor LDFLAGS.
+Use DESTDIR.
+
+--- Makefile.orig      1999-05-19 21:05:31.000000000 +0000
++++ Makefile
+@@ -7,19 +7,20 @@ man: usbgen.8
+       nroff -mandoc usbgen.8 > usbgen.0
+ 
+ usbctl:               usbctl.c
+-      cc $(CFLAGS) usbctl.c -o usbctl
++      $(CC) $(CFLAGS) $(LDFLAGS) usbctl.c -o usbctl
+ 
+ usbdebug:     usbdebug.c
+-      cc $(CFLAGS) usbdebug.c -o usbdebug
++      $(CC) $(CFLAGS) $(LDFLAGS) usbdebug.c -o usbdebug
+ 
+ usbstats:     usbstats.c
+-      cc $(CFLAGS) usbstats.c -o usbstats
++      $(CC) $(CFLAGS) $(LDFLAGS) usbstats.c -o usbstats
+ 
+ usbgen:               usbgen.c
+-      cc $(CFLAGS) usbgen.c -o usbgen
++      $(CC) $(CFLAGS) $(LDFLAGS) usbgen.c -o usbgen
+ 
+ install: $(PROGS)
+-      install usbctl usbdebug usbstats usbgen $(PREFIX)/sbin
++      ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin
++      install usbctl usbdebug usbstats usbgen ${DESTDIR}$(PREFIX)/sbin
+ 
+ clean:
+       rm -f $(PROGS)