Install libusb20.so.1 as libusb.so.1, there will be a followup commit to the

ports tree so that programs use libusb from the base by default. Thanks to
Stanislav Sedov for sorting out the ports build.

Bump __FreeBSD_version to 800069

Help and testing by:	stas

13 files changed, 22 insertions, 12 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index fcc117a..60687d5 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090308: libusb.so.1 renamed
+OLD_LIBS+=usr/lib/libusb20.so.1
+OLD_FILES+=usr/include/libusb20_compat01.h
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 # 20090223: changeover of USB stacks
diff --git a/UPDATING b/UPDATING
index 33665b0..4b673ef 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090309:
+	libusb20.so.1 is now installed as libusb.so.1 and the ports system
+	updated to use it. This requires a buildworld/installworld in order to
+	update the library and dependencies (usbconfig, etc). Its advisable to
+	update your ports as the affected programs have had a revision bump.
+
 20090302:
 	A workaround is committed to allow the creation of System V shared
 	memory segment of size > 2 GB on the 64-bit architectures.
diff --git a/lib/libusb20/Makefile b/lib/libusb20/Makefile
index 0c0f18f..3eb4378 100644
--- a/lib/libusb20/Makefile
+++ b/lib/libusb20/Makefile
@@ -4,7 +4,7 @@
 # Makefile for the FreeBSD specific LibUSB 2.0
 #
 
-LIB=		usb20
+LIB=		usb
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
 SRCS=		libusb20.c
@@ -14,11 +14,12 @@ SRCS+=		libusb20_compat01.c
 SRCS+=		libusb20_compat10.c
 INCS+=		libusb20.h
 INCS+=		libusb20_desc.h
-INCS+=		libusb20_compat01.h
-INCS+=		libusb20_compat10.h
 MAN=		libusb20.3
 MKLINT=		no
 NOGCCERROR=
 
+# libusb 0.1 compat
+INCS+=		usb.h
+
 .include <bsd.lib.mk>
 
diff --git a/lib/libusb20/libusb20_compat01.c b/lib/libusb20/libusb20_compat01.c
index 5d3f0d3..5e1e8e1 100644
--- a/lib/libusb20/libusb20_compat01.c
+++ b/lib/libusb20/libusb20_compat01.c
@@ -37,7 +37,7 @@
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"
-#include "libusb20_compat01.h"
+#include "usb.h"
 
 /*
  * The two following macros were taken from the original LibUSB v0.1
diff --git a/lib/libusb20/libusb20_compat01.h b/lib/libusb20/usb.h
index 3963a9f..3963a9f 100644
--- a/lib/libusb20/libusb20_compat01.h
+++ b/lib/libusb20/usb.h
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index bdb3f8a..858fe09 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -42,4 +42,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml -larchive -lbz2 -lusb20
+libs -lbsdxml -larchive -lbz2 -lusb
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index bdb3f8a..858fe09 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -42,4 +42,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml -larchive -lbz2 -lusb20
+libs -lbsdxml -larchive -lbz2 -lusb
diff --git a/release/ia64/boot_crunch.conf b/release/ia64/boot_crunch.conf
index f7c8833..1857d30 100644
--- a/release/ia64/boot_crunch.conf
+++ b/release/ia64/boot_crunch.conf
@@ -46,4 +46,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
-libs -lgeom -lbsdxml -larchive -lbz2 -lusb20
+libs -lgeom -lbsdxml -larchive -lbz2 -lusb
diff --git a/release/powerpc/boot_crunch.conf b/release/powerpc/boot_crunch.conf
index 23a3c8e..12c5a3b 100644
--- a/release/powerpc/boot_crunch.conf
+++ b/release/powerpc/boot_crunch.conf
@@ -44,4 +44,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
-libs -lbsdxml -larchive -lbz2 -lusb20
+libs -lbsdxml -larchive -lbz2 -lusb
diff --git a/release/sparc64/boot_crunch.conf b/release/sparc64/boot_crunch.conf
index 4f84bc4..520d75c 100644
--- a/release/sparc64/boot_crunch.conf
+++ b/release/sparc64/boot_crunch.conf
@@ -42,4 +42,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -lusb20
+libs -larchive -lbz2 -lusb
diff --git a/release/sun4v/boot_crunch.conf b/release/sun4v/boot_crunch.conf
index 4f84bc4..520d75c 100644
--- a/release/sun4v/boot_crunch.conf
+++ b/release/sun4v/boot_crunch.conf
@@ -42,4 +42,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -lusb20
+libs -larchive -lbz2 -lusb
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 665b8df..21e5433 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 800068	/* Master, propagated to newvers */
+#define __FreeBSD_version 800069	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>
diff --git a/usr.sbin/usbconfig/Makefile b/usr.sbin/usbconfig/Makefile
index 6356963..1cd0928 100644
--- a/usr.sbin/usbconfig/Makefile
+++ b/usr.sbin/usbconfig/Makefile
@@ -4,6 +4,6 @@
 PROG=	usbconfig
 MAN=	usbconfig.8
 SRCS=	usbconfig.c dump.c
-LDADD+= -lusb20
+LDADD+= -lusb
 
 .include <bsd.prog.mk>