Add minimal patch to make libusb build with plain gcc on 4.x again.

This also allows us to return to standard libtool-handling.

PR:		ports/80169
Submitted by:	Helge Oldach
Approved by:	maintainer timeout

4 files changed, 31 insertions, 16 deletions

diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index a0dcd04cf3b5..c438c2b9550c 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -18,6 +18,6 @@ COMMENT=	Library giving userland programs access to USB devices
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-build-docs
 INSTALLS_SHLIB=	yes
-USE_GCC=	3.1+
+USE_LIBTOOL_VER=15
 
 .include <bsd.port.mk>
diff --git a/devel/libusb/files/patch-ltmain.sh b/devel/libusb/files/patch-ltmain.sh
deleted file mode 100644
index 3fd2c8d82822..000000000000
--- a/devel/libusb/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Fri Feb 25 21:55:10 2005
-+++ ltmain.sh	Fri Feb 25 21:55:38 2005
-@@ -5550,10 +5550,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libusb/files/patch-tests_descriptor__test.cpp b/devel/libusb/files/patch-tests_descriptor__test.cpp
new file mode 100644
index 000000000000..439401a89e26
--- /dev/null
+++ b/devel/libusb/files/patch-tests_descriptor__test.cpp
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- tests/descriptor_test.cpp.orig
++++ tests/descriptor_test.cpp
+@@ -34,9 +34,9 @@
+ 
+ 			cout << bus->directoryName() << "/" 
+ 				 << device->fileName() << "     "
+-				 << uppercase << hex << setw(4) << setfill('0')
++				 << hex << setw(4) << setfill('0')
+ 				 << device->idVendor() << "/"
+-				 << uppercase << hex << setw(4) << setfill('0')
++				 << hex << setw(4) << setfill('0')
+ 				 << device->idProduct() << endl;
+ 			if (device->Vendor() != "") {
+ 				cout << "- Manufacturer : " << device->Vendor() << endl;
diff --git a/devel/libusb/files/patch-usbpp.cpp b/devel/libusb/files/patch-usbpp.cpp
new file mode 100644
index 000000000000..8c53cfd0f883
--- /dev/null
+++ b/devel/libusb/files/patch-usbpp.cpp
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- usbpp.cpp.orig
++++ usbpp.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include <errno.h>
+ #include <cstdlib>
++#include <cstdio>
+ 
+ //remove after debugging
+ #include <iostream>