From ec284fc40a45d2ad30c847c1f4d308a3eac2ea73 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 2 Mar 2011 06:31:35 +0000
Subject: [PATCH] - update dfu-util to 0.3 - various cleanups

ok ian@ (MAINTAINER)
---
 comms/dfu-util/Makefile                 | 15 ++++++---------
 comms/dfu-util/distinfo                 | 10 +++++-----
 comms/dfu-util/patches/patch-src_main_c | 14 +++++++-------
 comms/dfu-util/pkg/DESCR                |  8 ++++----
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile
index 8609e5ec8c9..8c3d3b80513 100644
--- a/comms/dfu-util/Makefile
+++ b/comms/dfu-util/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/15 00:22:50 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2011/03/02 06:31:35 jasper Exp $
 
 COMMENT =		device firmware update (DFU) USB programmer
 
-DISTNAME =		dfu-util-svn-4900
-PKGNAME =		dfu-util-0.1
-REVISION =		0
+DISTNAME =		dfu-util-0.3
 
 CATEGORIES =		comms
 
-HOMEPAGE =		http://wiki.openmoko.org/wiki/Dfu-util
+HOMEPAGE =		http://dfu-util.gnumonks.org/
 
 MAINTAINER =		Ian Darwin <ian@openbsd.org>
 
@@ -18,18 +16,17 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-
-MASTER_SITES =		http://files.lodoss.net/
+MASTER_SITES =		${HOMEPAGE}/releases/
 
 LIB_DEPENDS =		devel/libusb
 WANTLIB =		c usb
 
 CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS +=	--disable-silent-rules
 
-USE_GROFF =		Yes
 NO_REGRESS =		Yes
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/dfu-util.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/dfu-util.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/comms/dfu-util/distinfo b/comms/dfu-util/distinfo
index 9893919551a..320da4b85c8 100644
--- a/comms/dfu-util/distinfo
+++ b/comms/dfu-util/distinfo
@@ -1,5 +1,5 @@
-MD5 (dfu-util-svn-4900.tar.gz) = bSrf7J6vg69+2D60Ky/Qcw==
-RMD160 (dfu-util-svn-4900.tar.gz) = Ur6L7/8h5RQmbbtkQtW5WIKz8Lo=
-SHA1 (dfu-util-svn-4900.tar.gz) = LYiKTmpitjirDzMgZ141nQlXQ6A=
-SHA256 (dfu-util-svn-4900.tar.gz) = hOE5gljfEY1o2dAT6GyY9QKREG3SszBmSh9TDYK2Mok=
-SIZE (dfu-util-svn-4900.tar.gz) = 94703
+MD5 (dfu-util-0.3.tar.gz) = qnavP+9wDNc1BXRVgGhfTg==
+RMD160 (dfu-util-0.3.tar.gz) = PAkZKLwk5evoiXJN7Hsapsq7PKs=
+SHA1 (dfu-util-0.3.tar.gz) = qdqUu1DqIUWiKEIzQLhzAnpV9Y4=
+SHA256 (dfu-util-0.3.tar.gz) = RC7MqoVCH7AICYBkzt5jNMAtqYNksxIGSw+bJf9O9pM=
+SIZE (dfu-util-0.3.tar.gz) = 105209
diff --git a/comms/dfu-util/patches/patch-src_main_c b/comms/dfu-util/patches/patch-src_main_c
index fcceedbdbbe..dc300e153ba 100644
--- a/comms/dfu-util/patches/patch-src_main_c
+++ b/comms/dfu-util/patches/patch-src_main_c
@@ -1,17 +1,17 @@
-$OpenBSD: patch-src_main_c,v 1.1.1.1 2009/02/08 22:32:40 ian Exp $
+$OpenBSD: patch-src_main_c,v 1.2 2011/03/02 06:31:35 jasper Exp $
 
 From Bug 672 in OpenMoko via Simon Moore
 
---- src/main.c.orig	Fri Mar 30 13:21:03 2007
-+++ src/main.c	Tue Aug  7 15:29:25 2007
-@@ -82,8 +82,8 @@ static int find_dfu_if(struct usb_device *dev, int (*h
+--- src/main.c.orig	Wed Feb 16 15:36:44 2011
++++ src/main.c	Wed Feb 16 15:36:47 2011
+@@ -103,8 +103,8 @@ static int find_dfu_if(struct usb_device *dev, int (*h
  
  	memset(dfu_if, 0, sizeof(*dfu_if));
- 	
+ 
 -	for (cfg_idx = 0; cfg_idx < dev->descriptor.bNumConfigurations;
 -	     cfg_idx++) {
 +	for (cfg_idx = 0; NULL != dev->config &&
 +		cfg_idx < dev->descriptor.bNumConfigurations; cfg_idx++) {
  		cfg = &dev->config[cfg_idx];
- 		for (intf_idx = 0; intf_idx < cfg->bNumInterfaces;
- 		     intf_idx++) {
+ 		/* in some cases, noticably FreeBSD if uid != 0,
+ 		 * the configuration descriptors are empty */
diff --git a/comms/dfu-util/pkg/DESCR b/comms/dfu-util/pkg/DESCR
index d6b7d8d85e3..47ce18a366e 100644
--- a/comms/dfu-util/pkg/DESCR
+++ b/comms/dfu-util/pkg/DESCR
@@ -1,4 +1,4 @@
-dfu-util is a program that implements the host (PC) side of the USB
-DFU (Universal Serial Bus Device Firmware Upgrade) protocol.
-It is typically used to re-flash firmware in Openmoko phones and
-similar devices.
+dfu-util is a program that implements the host (PC) side of the USB DFU
+(Universal Serial Bus Device Firmware Upgrade) protocol.  It is
+typically used to re-flash firmware in Openmoko phones and similar
+devices.