Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Sep 2020 15:23:59 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550282 - head/devel/linux_libusb
Message-ID:  <202009271523.08RFNxx8085272@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sun Sep 27 15:23:59 2020
New Revision: 550282
URL: https://svnweb.freebsd.org/changeset/ports/550282

Log:
  Remove libusb.so symbolic link because it belongs in a -devel package.
  Add libusb-1.0.so.0 symbolic link because FreeBSD libusb implements that
  API too.
  
  PR:		249516
  Reported by:	Alex S <iwtcex@gmail.com>

Modified:
  head/devel/linux_libusb/Makefile

Modified: head/devel/linux_libusb/Makefile
==============================================================================
--- head/devel/linux_libusb/Makefile	Sun Sep 27 15:01:22 2020	(r550281)
+++ head/devel/linux_libusb/Makefile	Sun Sep 27 15:23:59 2020	(r550282)
@@ -3,7 +3,7 @@
 
 PORTNAME=	linux_libusb
 PORTVERSION=	13.0r${FSVN_REV}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
 		http://home.selasky.org/distfiles/
@@ -22,9 +22,9 @@ USE_LINUX_PREFIX=	yes
 
 LIBDIR_amd64=	lib64
 LIBDIR_i386=	lib
-PLIST_FILES=	usr/${LIBDIR_${ARCH}}/libusb.so \
-		usr/${LIBDIR_${ARCH}}/libusb.so.3 \
-		usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4
+PLIST_FILES=	usr/${LIBDIR_${ARCH}}/libusb.so.3 \
+		usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4 \
+		usr/${LIBDIR_${ARCH}}/libusb-1.0.so.0
 
 CC=		${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE}
 CFLAGS:=	${CFLAGS:N-march=*}
@@ -45,9 +45,9 @@ FSVNDIR=	lib/libusb
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
-PLIST_FILES+=	usr/lib/libusb.so \
-		usr/lib/libusb.so.3 \
-		usr/lib/libusb-0.1.so.4
+PLIST_FILES+=	usr/lib/libusb.so.3 \
+		usr/lib/libusb-0.1.so.4 \
+		usr/lib/libusb-1.0.so.0
 .endif
 
 do-build:
@@ -67,17 +67,17 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/${LIBDIR_${ARCH}}/libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}
 	${LN} -s libusb.so.3 \
-		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb.so
-	${LN} -s libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4
+	${LN} -s libusb.so.3 \
+		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb-1.0.so.0
 .if ${ARCH} == amd64
 	${MKDIR} ${STAGEDIR}${PREFIX}/usr/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/lib
 	${LN} -s libusb.so.3 \
-		${STAGEDIR}${PREFIX}/usr/lib/libusb.so
-	${LN} -s libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4
+	${LN} -s libusb.so.3 \
+		${STAGEDIR}${PREFIX}/usr/lib/libusb-1.0.so.0
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009271523.08RFNxx8085272>