return the correct device name in bsd.c

update to libusb-0.1.5
ok pvalchev@
This commit is contained in:
jcs 2002-03-05 00:16:47 +00:00
parent e0d570355c
commit 5a4ea388db
5 changed files with 30 additions and 23 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2002/01/01 21:53:49 pvalchev Exp $
# $OpenBSD: Makefile,v 1.4 2002/03/05 00:16:47 jcs Exp $
COMMENT= "usb access library"
VERSION= 0.1.4
VERSION= 0.1.5
DISTNAME= libusb-${VERSION}
CATEGORIES= devel
NEED_VERSION= 1.504
NEED_VERSION= 1.506
HOMEPAGE= http://libusb.sourceforge.net/
@ -19,10 +19,6 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libusb
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \
patch-*
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}

View File

@ -1,3 +1,3 @@
MD5 (libusb-0.1.4.tar.gz) = 8043d54bed214a712f60d55de3e252c8
RMD160 (libusb-0.1.4.tar.gz) = eb36d3b05f23348c7033c3b76ae9c7c9fce61a97
SHA1 (libusb-0.1.4.tar.gz) = 16d4ec5b7efccbc1997177799b20bd3e38be4a4d
MD5 (libusb-0.1.5.tar.gz) = 4eff055ee5e9cbcbf82604efbc74f76a
RMD160 (libusb-0.1.5.tar.gz) = f25238ac7d53316ebf40cb1f2066d424f39a6288
SHA1 (libusb-0.1.5.tar.gz) = 519bb37993f01aefdc821cded229ca39e2112620

View File

@ -1,12 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.2 2002/01/01 21:53:49 pvalchev Exp $
--- Makefile.in.orig Mon Oct 29 09:41:50 2001
+++ Makefile.in Mon Dec 31 18:00:18 2001
@@ -112,7 +112,7 @@ libusb_la_SOURCES = usb.c usbi.h error.c
$OpenBSD: patch-Makefile_in,v 1.3 2002/03/05 00:16:47 jcs Exp $
--- Makefile.in.orig Thu Feb 7 00:45:27 2002
+++ Makefile.in Sun Mar 3 18:58:33 2002
@@ -123,7 +123,6 @@
include_HEADERS = usb.h
libusb_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) \
-export-dynamic \
$(LDADDS)
-libusb_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
+libusb_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-bsd_c,v 1.1 2002/03/05 00:16:47 jcs Exp $
--- bsd.c.orig Thu Feb 7 00:43:25 2002
+++ bsd.c Sun Mar 3 19:35:19 2002
@@ -363,7 +363,7 @@
/* we need to report the device name as /dev/ugenx NOT /dev/ugenx.00
* This seemed easier than having 2 variables...
*/
-#if __NetBSD__
+#if (__NetBSD__ || __OpenBSD__)
snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.devnames[0]);
#endif

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2002/01/01 21:53:49 pvalchev Exp $
lib/libusb.so.4.0
DYNLIBDIR(%B)
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/03/05 00:16:47 jcs Exp $
lib/libusb.so.5.0
DYNLIBDIR(%D/lib)