Fri Oct 10 23:30:59 2008 UTC ()
DESTDIR support.


(joerg)
diff -r1.11 -r1.12 pkgsrc/sysutils/usbutil/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/usbutil/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/sysutils/usbutil/patches/patch-ae
cvs diff -r1.11 -r1.12 pkgsrc/sysutils/usbutil/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/usbutil/Makefile 2007/02/26 11:54:55 1.11
+++ pkgsrc/sysutils/usbutil/Makefile 2008/10/10 23:30:59 1.12
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2007/02/26 11:54:55 drochner Exp $ 1# $NetBSD: Makefile,v 1.12 2008/10/10 23:30:59 joerg Exp $
2# 2#
3 3
4DISTNAME= usbutil-0.5 4DISTNAME= usbutil-0.5
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/ 7MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
8 8
9MAINTAINER= lennart@augustsson.net 9MAINTAINER= lennart@augustsson.net
10COMMENT= USB developer utilities 10COMMENT= USB developer utilities
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/usbutil/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/sysutils/usbutil/patches/patch-ad 2005/12/18 17:31:22 1.1
+++ pkgsrc/sysutils/usbutil/patches/patch-ad 2008/10/10 23:30:59 1.2
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-ad,v 1.1 2005/12/18 17:31:22 joerg Exp $ 1$NetBSD: patch-ad,v 1.2 2008/10/10 23:30:59 joerg Exp $
2 2
3--- usbstats.c.orig 2005-12-18 17:23:45.000000000 +0000 3--- usbstats.c.orig 2002-02-25 01:55:56.000000000 +0100
4+++ usbstats.c 4+++ usbstats.c
5@@ -26,10 +26,15 @@ 5@@ -26,10 +26,16 @@
6  6
7 #include <stdio.h> 7 #include <stdio.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9+#include <sys/ioctl.h> 9+#include <sys/ioctl.h>
10 #include <fcntl.h> 10 #include <fcntl.h>
 11+#include <stdlib.h>
11 #include <unistd.h> 12 #include <unistd.h>
12 #include <err.h> 13 #include <err.h>
13+#ifdef __DragonFly__ 14+#ifdef __DragonFly__
14+#include <bus/usb/usb.h> 15+#include <bus/usb/usb.h>
15+#else 16+#else
16 #include <dev/usb/usb.h> 17 #include <dev/usb/usb.h>
17+#endif 18+#endif
18  19
19 #ifndef USB_STACK_VERSION 20 #ifndef USB_STACK_VERSION
20 #define uds_requests requests 21 #define uds_requests requests
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/usbutil/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/usbutil/patches/Attic/patch-ae 2007/09/14 13:31:04 1.1
+++ pkgsrc/sysutils/usbutil/patches/Attic/patch-ae 2008/10/10 23:30:59 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-ae,v 1.1 2007/09/14 13:31:04 gson Exp $ 1$NetBSD: patch-ae,v 1.2 2008/10/10 23:30:59 joerg Exp $
2 2
3--- Makefile.orig 1999-05-20 00:05:31.000000000 +0300 3--- Makefile.orig 1999-05-19 23:05:31.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -19,6 +19,7 @@ usbgen: usbgen.c 5@@ -19,7 +19,8 @@ usbgen: usbgen.c
6 cc $(CFLAGS) usbgen.c -o usbgen 6 cc $(CFLAGS) usbgen.c -o usbgen
7  7
8 install: $(PROGS) 8 install: $(PROGS)
9+ install -d $(PREFIX)/sbin 9- install usbctl usbdebug usbstats usbgen $(PREFIX)/sbin
10 install usbctl usbdebug usbstats usbgen $(PREFIX)/sbin 10+ install -d ${DESTDIR}$(PREFIX)/sbin
 11+ install usbctl usbdebug usbstats usbgen ${DESTDIR}$(PREFIX)/sbin
11  12
12 clean: 13 clean:
 14 rm -f $(PROGS)