From 42061798586c0f11c323ad3ec0a9d522a54f634b Mon Sep 17 00:00:00 2001
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 10 Mar 2020 18:46:35 +0000
Subject: [PATCH] Update linux_libusb to FreeBSD-current r358841.

Approved by:	pi
---
 devel/linux_libusb/Makefile | 50 +++++++++++++------------------------
 devel/linux_libusb/distinfo |  5 ++--
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/devel/linux_libusb/Makefile b/devel/linux_libusb/Makefile
index 43cbd865e727..eaba23a306cf 100644
--- a/devel/linux_libusb/Makefile
+++ b/devel/linux_libusb/Makefile
@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	linux_libusb
-PORTVERSION=	11.0r${FSVN_REV}
-PORTREVISION=	4
+PORTVERSION=	13.0r${FSVN_REV}
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/nox
+MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
+		http://home.selasky.org/distfiles/
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux-compatibility libusb
 
+LICENSE=	BSD2CLAUSE
+
+ONLY_FOR_ARCHS=	amd64 i386
 USES=		linux tar:bzip2
-ONLY_FOR_ARCHS=	i386 amd64
 USE_LDCONFIG=	yes
 USE_LINUX=	devtools:build
 USE_LINUX_PREFIX=	yes
@@ -19,7 +21,7 @@ PLIST_FILES=		usr/lib/libusb.so	\
 			usr/lib/libusb.so.3	\
 			usr/lib/libusb-0.1.so.4
 CC=		${LINUXBASE}/usr/bin/gcc
-CFLAGS+=	-I${WRKDIR}/sys
+CFLAGS+=	-I${WRKDIR}/${DISTNAME}/include
 SSP_CFLAGS?=	-fstack-protector # XXX -strong isn't supported by GCC < 4.9
 MAKE_ARGS+=	LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h
 MAKE_ARGS+=	PTHREAD_LIBS="-lpthread -lrt"
@@ -27,11 +29,9 @@ MAKE_ARGS+=	NO_WERROR=yes
 MAKE_ARGS+=	WITHOUT_PROFILE=yes
 MAKE_ARGS+=	WITHOUT_SSP=yes
 MAKE_ARGS+=	__MAKE_CONF=""
-# XXX ${LINUXBASE}/usr/bin/ld is a broken link with gentoo atm?
-#MAKE_ENV+=	COMPILER_PATH=/usr/i486-pc-linux-gnu/binutils-bin/2.22
 
 # see: sysutils/pc-sysinstall/Makefile
-FSVN_REV=	261448
+FSVN_REV=	358841
 FSVNPATH?=	http://svn.freebsd.org/base/head
 FSVNDIR=	lib/libusb
 
@@ -41,24 +41,6 @@ FSVNDIR=	lib/libusb
 MAKE_ARGS+=	COMPAT_32BIT=YES
 .endif
 
-pre-everything::
-	@${ECHO_MSG} '===> Using the FreeBSD source tree under ${SRC_BASE}'
-	@${ECHO_MSG} '===> Set SRC_BASE to use an alternate source tree'
-
-.if !exists(${SRC_BASE}/sys/i386/linux/syscalls.master)
-IGNORE=	requires kernel source present in ${SRC_BASE}/sys
-.endif
-#.if !exists(${SRC_BASE}/lib/libusb/Makefile)
-#IGNORE=	requires libusb source present in ${SRC_BASE}/lib/libusb
-#.endif
-#.if exists(${LINUXBASE}/etc/fedora-release)
-#IGNORE=	does not build with the default linux base, use the package instead
-#.endif
-
-post-patch:
-	${MKDIR} ${WRKDIR}/sys
-	${LN} -s ${SRC_BASE}/sys/compat ${SRC_BASE}/sys/dev ${WRKDIR}/sys
-
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/usr/lib
 	${INSTALL_LIB} ${WRKSRC}/libusb.so.3 ${STAGEDIR}${PREFIX}/usr/lib
@@ -67,17 +49,21 @@ do-install:
 	${LN} -s libusb.so.3 ${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-#FETCH_DEPENDS+=		svn:devel/subversion
 SVN?=		svnlite
 
 do-fetch:
+	${RM} -rf ${WRKDIR}
 	${MKDIR} ${WRKDIR}
 	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/${FSVNDIR} ${WRKDIR}/${DISTNAME}
-	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-.if ${USER} == noxNOTYET
-	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    nox@freefall.freebsd.org:public_distfiles/
-.endif
+	${MKDIR} ${WRKDIR}/${DISTNAME}/include/compat/linux
+	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/compat/linux/linux_ioctl.h ${WRKDIR}/${DISTNAME}/include/compat/linux/
+	${MKDIR} ${WRKDIR}/${DISTNAME}/include/dev/usb
+	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb_endian.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
+	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb_freebsd.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
+	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
+	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usbdi.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
+	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb_ioctl.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
+	cd ${WRKDIR}; tar --uid=0 --gid=0 -cvyf ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/linux_libusb/distinfo b/devel/linux_libusb/distinfo
index d0d3519ff6ab..cf25b640cff3 100644
--- a/devel/linux_libusb/distinfo
+++ b/devel/linux_libusb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (linux_libusb-11.0r261448.tar.bz2) = e1013ccd0181e00a55bb786be54d125b71462492442122350d820b98fef97f81
-SIZE (linux_libusb-11.0r261448.tar.bz2) = 45739
+TIMESTAMP = 1583857275
+SHA256 (linux_libusb-13.0r358841.tar.bz2) = 0114a83eb21889ff54e1f2f551296ef584e7fe1a8d468ade6ec1bc017937deb7
+SIZE (linux_libusb-13.0r358841.tar.bz2) = 69877