Install the manual page for usbgen. While here,

use a BSD Makefile for consistency's sake (why not?).

PKGREVISION++

5 files changed, 32 insertions, 19 deletions

diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile
index 2cc522ad234..62bbd9e6c05 100644
--- a/sysutils/usbutil/Makefile
+++ b/sysutils/usbutil/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/10/10 23:30:59 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/11/25 13:21:48 bjs Exp $
 #
 
 DISTNAME=	usbutil-0.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.augustsson.net/pub/netbsd/
 
@@ -11,4 +11,17 @@ COMMENT=	USB developer utilities
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+AUTO_MKDIRS=		yes
+USE_BSD_MAKEFILE=	yes
+
+INSTALL_TARGET+=	maninstall install
+
+MAKE_FLAGS+=	BINDIR=${PREFIX:Q}/sbin
+MAKE_FLAGS+=	MKCATPAGES=no
+MAKE_FLAGS+=	MKHTML=no
+MAKE_FLAGS+=	NOGCCERROR=yes	# in keeping with original Makefile
+
+post-extract
+	${RUN} ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/usbutil/PLIST b/sysutils/usbutil/PLIST
index db882c049ed..e7d4b97ec1d 100644
--- a/sysutils/usbutil/PLIST
+++ b/sysutils/usbutil/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:07 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/25 13:21:48 bjs Exp $
+man/man8/usbgen.8
 sbin/usbctl
 sbin/usbdebug
 sbin/usbgen
diff --git a/sysutils/usbutil/distinfo b/sysutils/usbutil/distinfo
index 73fcfaddd89..744ea097c8a 100644
--- a/sysutils/usbutil/distinfo
+++ b/sysutils/usbutil/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/10/14 11:37:02 joerg Exp $
+$NetBSD: distinfo,v 1.11 2008/11/25 13:21:48 bjs Exp $
 
 SHA1 (usbutil-0.5.tar.gz) = 4c9abc6f370ab561bd2748b1792802d1e959c599
 RMD160 (usbutil-0.5.tar.gz) = 48c6bedeed8daf50a760feedef3575db021066f8
@@ -7,4 +7,3 @@ SHA1 (patch-aa) = 8db548f99befd76839b8b31caa2de0861c6d708b
 SHA1 (patch-ab) = af20c5d609c5fccfb0f8672d00daeda195a3b4a0
 SHA1 (patch-ac) = 0c1c7e67c84c1a6db1ad0144803977bee7c61ceb
 SHA1 (patch-ad) = a98c2a46c6eb860416ff631c62361f5b0282def8
-SHA1 (patch-ae) = a15d3fe9922cc0628760f3177a941fd65f5082fe
diff --git a/sysutils/usbutil/files/Makefile b/sysutils/usbutil/files/Makefile
new file mode 100644
index 00000000000..46b444c8cef
--- /dev/null
+++ b/sysutils/usbutil/files/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2008/11/25 13:21:48 bjs Exp $
+
+# NOTE:  BINDIR, MKHTML, NOGCCERROR, and BINDIR set by pkgsrc Makefile
+
+PROGS= 		usbctl usbdebug usbstats usbgen 
+
+CPPFLAGS+=	-Wall	# In keeping with original Makefile
+
+.for p in ${PROGS}
+MAN.${p}?=	# empty
+.endfor
+MAN.usbgen=	usbgen.8
+
+.include <bsd.prog.mk>
diff --git a/sysutils/usbutil/patches/patch-ae b/sysutils/usbutil/patches/patch-ae
deleted file mode 100644
index 05e3b62c734..00000000000
--- a/sysutils/usbutil/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/10/10 23:30:59 joerg Exp $
-
---- Makefile.orig	1999-05-19 23:05:31.000000000 +0200
-+++ Makefile
-@@ -19,7 +19,8 @@ usbgen:		usbgen.c
- 	cc $(CFLAGS) usbgen.c -o usbgen
- 
- install: $(PROGS)
--	install usbctl usbdebug usbstats usbgen $(PREFIX)/sbin
-+	install -d ${DESTDIR}$(PREFIX)/sbin
-+	install usbctl usbdebug usbstats usbgen ${DESTDIR}$(PREFIX)/sbin
- 
- clean:
- 	rm -f $(PROGS)