svn commit: r430669 - in head: audio/libgpod comms/gnuradio comms/gnuradio/files comms/libticables2 comms/owfs comms/rtl-sdr comms/rtl-sdr/files comms/usbmuxd devel/acsccid devel/libccid devel/libg...
Jan Beich
jbeich at FreeBSD.org
Thu Jan 5 22:58:06 UTC 2017
Author: jbeich
Date: Thu Jan 5 22:58:02 2017
New Revision: 430669
URL: https://svnweb.freebsd.org/changeset/ports/430669
Log:
Assume "pkg-config libusb*" works after 9.x EOL
FreeBSD appears to use different pkg-config name for 0.1.x API but it
doesn't matter much as 0.1, 1.0 and 2.0 share CFLAGS/LIBS.
Deleted:
head/devel/libg19/files/patch-configure
head/devel/openocd/files/
head/devel/stlink/files/
Modified:
head/audio/libgpod/Makefile (contents, props changed)
head/comms/gnuradio/Makefile (contents, props changed)
head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake (contents, props changed)
head/comms/libticables2/Makefile (contents, props changed)
head/comms/owfs/Makefile (contents, props changed)
head/comms/rtl-sdr/Makefile (contents, props changed)
head/comms/rtl-sdr/files/patch-configure.ac (contents, props changed)
head/comms/rtl-sdr/files/patch-librtlsdr.pc.in (contents, props changed)
head/comms/usbmuxd/Makefile (contents, props changed)
head/devel/acsccid/Makefile (contents, props changed)
head/devel/libccid/Makefile (contents, props changed)
head/devel/libg19/Makefile (contents, props changed)
head/devel/libpafe/Makefile (contents, props changed)
head/devel/libsigrok/Makefile (contents, props changed)
head/devel/openocd/Makefile (contents, props changed)
head/devel/pcsc-lite/Makefile (contents, props changed)
head/emulators/qemu-devel/Makefile (contents, props changed)
head/emulators/qemu-devel/files/patch-configure (contents, props changed)
head/emulators/qemu/Makefile (contents, props changed)
head/emulators/qemu/files/patch-configure (contents, props changed)
head/graphics/colord/Makefile (contents, props changed)
head/graphics/libgphoto2/Makefile (contents, props changed)
head/net/usbredir/Makefile (contents, props changed)
head/print/cups/files/patch-configure (contents, props changed)
head/security/libfprint/Makefile (contents, props changed)
head/security/openct/Makefile (contents, props changed)
head/sysutils/lcdproc/Makefile (contents, props changed)
head/sysutils/lcdproc/files/patch-configure.ac (contents, props changed)
head/sysutils/usbhid-dump/Makefile (contents, props changed)
head/sysutils/usbutils/Makefile (contents, props changed)
Modified: head/audio/libgpod/Makefile
==============================================================================
--- head/audio/libgpod/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/audio/libgpod/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -33,7 +33,6 @@ OPTIONS_SUB= yes
IMOBILE_DESC= Apple iPhone/iPod Touch support
IMOBILE_LIB_DEPENDS= libimobiledevice.so:comms/libimobiledevice
-IMOBILE_CONFIGURE_ENV= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
IMOBILE_CONFIGURE_WITH= libimobiledevice
MONO_USE= GNOME=gtksharp20
Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/gnuradio/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -41,7 +41,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
# volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
# volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
# volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
-USES= cmake:outsource compiler:c11 iconv perl5 python:2.7 shebangfix
+USES= cmake:outsource compiler:c11 iconv perl5 pkgconfig python:2.7 shebangfix
SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in
CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\
-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
Modified: head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
==============================================================================
--- head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake Thu Jan 5 22:58:02 2017 (r430669)
@@ -1,51 +1,5 @@
--- cmake/Modules/FindUSB.cmake.orig 2015-04-13 14:32:43 UTC
+++ cmake/Modules/FindUSB.cmake
-@@ -1,20 +1,30 @@
- if(NOT LIBUSB_FOUND)
-- pkg_check_modules (LIBUSB_PKG libusb-1.0)
-- find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
-- PATHS
-- ${LIBUSB_PKG_INCLUDE_DIRS}
-- /usr/include/libusb-1.0
-- /usr/include
-- /usr/local/include
-- )
--
-- find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
-- PATHS
-- ${LIBUSB_PKG_LIBRARY_DIRS}
-- /usr/lib
-- /usr/local/lib
-- )
-+ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ message(status "--- Looking for FreeBSD usb")
-+ find_library(LIBUSB_LIBRARIES NAMES usb
-+ PATHS
-+ ${LIBUSB_PKG_LIBRARY_DIRS}
-+ /usr/lib
-+ )
-+ else()
-+ message(status "--- LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES}")
-+ pkg_check_modules (LIBUSB_PKG libusb-1.0)
-+ find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
-+ PATHS
-+ ${LIBUSB_PKG_INCLUDE_DIRS}
-+ /usr/include/libusb-1.0
-+ /usr/include
-+ /usr/local/include
-+ )
-
-+ find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
-+ PATHS
-+ ${LIBUSB_PKG_LIBRARY_DIRS}
-+ /usr/lib
-+ /usr/local/lib
-+ )
-+ endif()
-+
- if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
- set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
- message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
@@ -23,6 +33,17 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRA
message(STATUS "libusb-1.0 not found.")
endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
Modified: head/comms/libticables2/Makefile
==============================================================================
--- head/comms/libticables2/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/libticables2/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -22,11 +22,12 @@ NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
+ @${REINPLACE_CMD} -e '/PKG_CONFIG.*libusb/s/ >= 0\.1\.[0-9]*/-0.1/' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's/Requires/&.private/' ${WRKSRC}/ticables2.pc.in
.include <bsd.port.mk>
Modified: head/comms/owfs/Makefile
==============================================================================
--- head/comms/owfs/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/owfs/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -3,6 +3,7 @@
PORTNAME= owfs
PORTVERSION= 3.1p1
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= SF/owfs/owfs/${PORTVERSION}
@@ -71,7 +72,6 @@ OWFS_USES= fuse
ZERO_CONFIGURE_ENABLE= zero
USB_CONFIGURE_ENABLE= usb
-USB_LDFLAGS= -lusb
.include <bsd.port.options.mk>
Modified: head/comms/rtl-sdr/Makefile
==============================================================================
--- head/comms/rtl-sdr/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/rtl-sdr/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -3,7 +3,7 @@
PORTNAME= rtl-sdr
PORTVERSION= 20140210
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= comms hamradio
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
Modified: head/comms/rtl-sdr/files/patch-configure.ac
==============================================================================
--- head/comms/rtl-sdr/files/patch-configure.ac Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/rtl-sdr/files/patch-configure.ac Thu Jan 5 22:58:02 2017 (r430669)
@@ -1,16 +1,5 @@
--- configure.ac.orig 2012-08-23 08:40:54.000000000 +0200
+++ configure.ac 2012-08-23 11:47:20.000000000 +0200
-@@ -14,9 +14,7 @@
- LT_INIT
- AC_PROG_LIBTOOL
-
--PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0)
--LIBS="$LIBS $LIBUSB_LIBS"
--CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
-+LIBS="$LIBS -lusb"
-
- AC_PATH_PROG(DOXYGEN,doxygen,false)
- AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
@@ -34,7 +32,7 @@
dnl checks for required libraries
Modified: head/comms/rtl-sdr/files/patch-librtlsdr.pc.in
==============================================================================
--- head/comms/rtl-sdr/files/patch-librtlsdr.pc.in Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/rtl-sdr/files/patch-librtlsdr.pc.in Thu Jan 5 22:58:02 2017 (r430669)
@@ -1,3 +1,5 @@
+libusb-1.0 is already part of RTLSDR_PC_LIBS
+
--- librtlsdr.pc.in.orig 2014-07-11 08:56:42.640078065 +0000
+++ librtlsdr.pc.in 2014-07-11 08:56:57.487076496 +0000
@@ -7,5 +7,5 @@
@@ -5,5 +7,5 @@
Version: @VERSION@
Cflags: -I${includedir}/ @RTLSDR_PC_CFLAGS@
-Libs: -L${libdir} -lrtlsdr -lusb-1.0
-+Libs: -L${libdir} -lrtlsdr -lusb
++Libs: -L${libdir} -lrtlsdr
Libs.private: @RTLSDR_PC_LIBS@
Modified: head/comms/usbmuxd/Makefile
==============================================================================
--- head/comms/usbmuxd/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/comms/usbmuxd/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -17,9 +17,7 @@ LIB_DEPENDS= libplist.so:devel/libplist
USES= autoreconf cpe libtool pathfix pkgconfig tar:bzip2
CPE_VENDOR= nikias_bassen
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-systemd \
- libusb_CFLAGS="-I/usr/include" \
- libusb_LIBS="-lusb"
+CONFIGURE_ARGS= --without-systemd
PLIST_FILES= man/man1/${PORTNAME}.1.gz \
sbin/${PORTNAME}
Modified: head/devel/acsccid/Makefile
==============================================================================
--- head/devel/acsccid/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/acsccid/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -20,15 +20,7 @@ PLIST_FILES= lib/pcsc/drivers/ifd-acscci
GNU_CONFIGURE= yes
-.include <bsd.port.pre.mk>
-
-# Old versions don't have pkgconfig files for libusb
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
-CONFIGURE_ENV+= LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
- LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
-.endif
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ifd-acsccid.bundle/Contents/${OPSYS}/libacsccid.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/libccid/Makefile
==============================================================================
--- head/devel/libccid/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/libccid/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -19,8 +19,6 @@ GNU_CONFIGURE= yes
USE_PERL5= build
CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \
--enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial
-CONFIGURE_ENV= LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
- LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
PLIST_SUB= VER=${PORTVERSION}
INSTALL_TARGET= install-strip
Modified: head/devel/libg19/Makefile
==============================================================================
--- head/devel/libg19/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/libg19/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -10,7 +10,7 @@ MASTER_SITES= SF/g19linux/${PORTNAME}/${
MAINTAINER= armin at frozen-zone.org
COMMENT= G19 library
-USES= libtool
+USES= libtool pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
Modified: head/devel/libpafe/Makefile
==============================================================================
--- head/devel/libpafe/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/libpafe/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -24,7 +24,4 @@ PLIST_FILES= bin/felica_dump bin/pasori_
lib/libpafe.a lib/libpafe.so lib/libpafe.so.0 \
lib/libpafe.so.0.0.8
-CONFIGURE_ENV+= LIBUSB_CFLAGS="-I/usr/include" \
- LIBUSB_LIBS="-L/usr/lib -lusb"
-
.include <bsd.port.mk>
Modified: head/devel/libsigrok/Makefile
==============================================================================
--- head/devel/libsigrok/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/libsigrok/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -20,9 +20,14 @@ USES= gmake pathfix libtool pkgconfig
USE_GNOME= glib20
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
-LDFLAGS+= -L/usr/lib -lusb
USE_LDCONFIG= yes
+post-patch:
+# libusb can be disabled via src.conf(5), so detect via pkg-config
+ @${REINPLACE_CMD} -e 's/\(libusb-1\.0\) >= 1\.0\.[0-9]*/\1/' \
+ -e '/\*freebsd\*/,/;;/d' \
+ ${WRKSRC}/configure
+
.include <bsd.port.pre.mk>
# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION
Modified: head/devel/openocd/Makefile
==============================================================================
--- head/devel/openocd/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/openocd/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -58,7 +58,8 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCA
INFO= openocd
post-patch:
- chmod +x ${WRKSRC}/libusb_finder
+ @${REINPLACE_CMD} -e '/PKG_CONFIG/{/1\.0/!s/libusb/&-0.1/;}' \
+ ${WRKSRC}/configure
# IMPORTANT INFORMATION FOR DEVELOPERS:
# Some Interfaces and Options are not on the list because they break a build.
Modified: head/devel/pcsc-lite/Makefile
==============================================================================
--- head/devel/pcsc-lite/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/devel/pcsc-lite/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -21,8 +21,7 @@ USE_RC_SUBR= pcscd
SHEBANG_FILES= ${WRKSRC}/src/spy/pcsc-spy
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \
- LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
+CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/
PKGMESSAGE= ${WRKDIR}/pkg-message
Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/emulators/qemu-devel/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -110,6 +110,7 @@ CONFIGURE_ARGS+= --sparc_cpu=v9
# but it shouldn't matter much
post-patch:
@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
+ -e '/libusb/s/ --atleast-version=1\.0\.[0-9]*//' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
@${REINPLACE_CMD} -E \
Modified: head/emulators/qemu-devel/files/patch-configure
==============================================================================
--- head/emulators/qemu-devel/files/patch-configure Thu Jan 5 22:43:42 2017 (r430668)
+++ head/emulators/qemu-devel/files/patch-configure Thu Jan 5 22:58:02 2017 (r430669)
@@ -130,32 +130,6 @@
fi
# Search for bswap_32 function
-@@ -3992,6 +4045,17 @@ fi
-
- # check for libusb
- if test "$libusb" != "no" ; then
-+ cat > $TMPC << EOF
-+#include <libusb.h>
-+
-+int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); }
-+EOF
-+ if compile_prog "-Werror" "-lusb -pthread" ; then
-+ libusb="yes"
-+ libusb_cflags=""
-+ libusb_libs=-lusb
-+ libs_softmmu="$libs_softmmu $libusb_libs"
-+ else
- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
- libusb="yes"
- libusb_cflags=$($pkg_config --cflags libusb-1.0)
-@@ -4004,6 +4068,7 @@ if test "$libusb" != "no" ; then
- fi
- libusb="no"
- fi
-+ fi
- fi
-
- # check for usbredirparser for usb network redirection support
@@ -4769,6 +4834,7 @@ echo "Audio drivers $audio_drv_list"
echo "Block whitelist (rw) $block_drv_rw_whitelist"
echo "Block whitelist (ro) $block_drv_ro_whitelist"
Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/emulators/qemu/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -111,6 +111,7 @@ CONFIGURE_ARGS+= --sparc_cpu=v9
# but it shouldn't matter much
post-patch:
@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
+ -e '/libusb/s/ --atleast-version=1\.0\.[0-9]*//' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
@${REINPLACE_CMD} -E \
Modified: head/emulators/qemu/files/patch-configure
==============================================================================
--- head/emulators/qemu/files/patch-configure Thu Jan 5 22:43:42 2017 (r430668)
+++ head/emulators/qemu/files/patch-configure Thu Jan 5 22:58:02 2017 (r430669)
@@ -130,32 +130,6 @@
fi
# Search for bswap_32 function
-@@ -3992,6 +4045,17 @@ fi
-
- # check for libusb
- if test "$libusb" != "no" ; then
-+ cat > $TMPC << EOF
-+#include <libusb.h>
-+
-+int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); }
-+EOF
-+ if compile_prog "-Werror" "-lusb -pthread" ; then
-+ libusb="yes"
-+ libusb_cflags=""
-+ libusb_libs=-lusb
-+ libs_softmmu="$libs_softmmu $libusb_libs"
-+ else
- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
- libusb="yes"
- libusb_cflags=$($pkg_config --cflags libusb-1.0)
-@@ -4004,6 +4068,7 @@ if test "$libusb" != "no" ; then
- fi
- libusb="no"
- fi
-+ fi
- fi
-
- # check for usbredirparser for usb network redirection support
@@ -4769,6 +4834,7 @@ echo "Audio drivers $audio_drv_list"
echo "Block whitelist (rw) $block_drv_rw_whitelist"
echo "Block whitelist (ro) $block_drv_ro_whitelist"
Modified: head/graphics/colord/Makefile
==============================================================================
--- head/graphics/colord/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/graphics/colord/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -34,8 +34,6 @@ CONFIGURE_ARGS= --disable-udev \
--with-daemon-user=colord \
--disable-systemd-login \
--enable-libcolordcompat
-CONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \
- USB_LIBS="-L/usr/lib -lusb"
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml
@@ -56,7 +54,6 @@ post-patch:
-e 's|-Wignored-qualifiers||g' \
-e 's|-Wtype-limits||g' \
-e 's|-Wmissing-parameter-type||g' \
- -e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|lib/color|db/color|g' \
-e 's|/usr/share/color|${PREFIX}/share/color|g' \
Modified: head/graphics/libgphoto2/Makefile
==============================================================================
--- head/graphics/libgphoto2/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/graphics/libgphoto2/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -47,10 +47,6 @@ XML_CONFIGURE_OFF= --with-libxml-2.0=no
.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000040
-CONFIGURE_ENV+= LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
-.endif
-
post-patch:
.for i in configure libgphoto2_port/configure
@${REINPLACE_CMD} -e \
@@ -63,9 +59,6 @@ post-patch:
'/^doc_DATA/s|COPYING||' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e \
- 's|-lusb-1.0|-lusb|' \
- ${WRKSRC}/libgphoto2_port/configure
- @${REINPLACE_CMD} -e \
'/^SUBDIRS/s|linux-hotplug||' \
${WRKSRC}/packaging/Makefile.in
Modified: head/net/usbredir/Makefile
==============================================================================
--- head/net/usbredir/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/net/usbredir/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -16,6 +16,5 @@ USES= gmake libtool pathfix pkgconfig t
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-CONFIGURE_ENV= LIBUSB_CFLAGS=-DLIBUSB_CALL= LIBUSB_LIBS=-lusb
.include <bsd.port.mk>
Modified: head/print/cups/files/patch-configure
==============================================================================
--- head/print/cups/files/patch-configure Thu Jan 5 22:43:42 2017 (r430668)
+++ head/print/cups/files/patch-configure Thu Jan 5 22:58:02 2017 (r430669)
@@ -1,19 +1,5 @@
--- configure.orig 2016-02-05 17:22:09 UTC
+++ configure
-@@ -5390,6 +5390,13 @@ $as_echo "yes" >&6; }
- CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
- LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
- USBQUIRKS="\$(DATADIR)/usb"
-+ elif test -f /usr/lib/libusb.so; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
-+
-+ LIBUSB="-lusb"
-+ USBQUIRKS="\$(DATADIR)/usb"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
@@ -5656,7 +5663,6 @@ if test "${with_dbusdir+set}" = set; the
fi
Modified: head/security/libfprint/Makefile
==============================================================================
--- head/security/libfprint/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/security/libfprint/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -20,7 +20,6 @@ USE_OPENSSL= yes
USE_GNOME= glib20
INSTALL_TARGET= install-strip
-CONFIGURE_ENV= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
CPPFLAGS+= -DHAVE_MEMMEM
MAKE_JOBS_UNSAFE=yes
Modified: head/security/openct/Makefile
==============================================================================
--- head/security/openct/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/security/openct/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -24,9 +24,7 @@ USE_RC_SUBR= openct
SUB_FILES= etoken.conf
CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBASE}/include" \
- LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
- LIBUSB_CFLAGS="-I/usr/include" \
- LIBUSB_LIBS="-lusb"
+ LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl"
CONFIGURE_ARGS= --localstatedir=/var --enable-usb
@@ -48,7 +46,8 @@ CONFIGURE_ARGS+=--enable-doc
.endif
post-patch:
- @${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+ @${REINPLACE_CMD} -e '/PKG_CONFIG/s/libusb/&-0.1/' \
+ -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
${WRKSRC}/configure
@${REINPLACE_CMD} 's|install-data-am: install-dist_apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \
${WRKSRC}/doc/Makefile.in
Modified: head/sysutils/lcdproc/Makefile
==============================================================================
--- head/sysutils/lcdproc/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/sysutils/lcdproc/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -90,7 +90,7 @@ LCDPROC_DRIVERS=bayrad \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MUSB}
-CONFIGURE_ARGS+= --with-libusb=/usr
+CONFIGURE_ARGS+= --enable-libusb
PLIST_SUB+= USB=""
LCDPROC_DRIVERS+=IOWarrior \
picolcd \
@@ -117,7 +117,7 @@ PLIST_SUB+= HID="@comment "
. endif
.else
-CONFIGURE_ARGS+= --without-libusb --disable-libftdi --disable-libhid
+CONFIGURE_ARGS+= --disable-libusb --disable-libftdi --disable-libhid
PLIST_SUB+= USB="@comment " FTDI="@comment " HID="@comment "
.endif
Modified: head/sysutils/lcdproc/files/patch-configure.ac
==============================================================================
--- head/sysutils/lcdproc/files/patch-configure.ac Thu Jan 5 22:43:42 2017 (r430668)
+++ head/sysutils/lcdproc/files/patch-configure.ac Thu Jan 5 22:58:02 2017 (r430669)
@@ -1,6 +1,6 @@
---- ./configure.ac.orig 2014-05-17 12:08:57.000000000 +0200
-+++ ./configure.ac 2014-05-17 12:12:55.000000000 +0200
-@@ -4,6 +4,7 @@
+--- configure.ac.orig 2014-05-01 10:44:01 UTC
++++ configure.ac
+@@ -4,6 +4,7 @@ AC_PREREQ(2.61)
AC_INIT([lcdproc], [0.5.7], [lcdproc at lists.omnipotent.net])
AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
AM_INIT_AUTOMAKE
@@ -8,82 +8,12 @@
AC_CONFIG_HEADERS(config.h)
-@@ -255,26 +256,62 @@
+@@ -268,7 +269,7 @@ AC_MSG_RESULT($enable_libusb)
- dnl ######################################################################
- dnl libusb support
-+dnl Stolen from the gnupg project and modified for LCDproc''s need.
-+dnl
-+dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
- dnl ######################################################################
- AC_MSG_CHECKING([if libusb support has been enabled]);
--AC_ARG_ENABLE(libusb,
-- [AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
-- [ if test "$enableval" != "no"; then
-- enable_libusb=yes
-- fi ],
-- [ enable_libusb=yes ]
--)
--AC_MSG_RESULT($enable_libusb)
-+AC_ARG_WITH(libusb,
-+ AC_HELP_STRING([--with-libusb=DIR],
-+ [look for the libusb library in DIR]),
-+ [_do_libusb=$withval],[_do_libusb=yes])
-+AC_MSG_RESULT($_do_libusb)
-
--if test "$enable_libusb" = "yes"; then
-- ifdef([PKG_CHECK_MODULES],
+ if test "$enable_libusb" = "yes"; then
+ ifdef([PKG_CHECK_MODULES],
- [PKG_CHECK_MODULES(LIBUSB, libusb,
-- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])],
-- [ enable_libusb=no ])],
-- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])])
-+if test "$_do_libusb" != "no" ; then
-+ if test -d "$withval" ; then
-+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
-+ LDFLAGS="${LDFLAGS} -L$withval/lib"
-+ AC_PATH_PROG([_usb_config],["$_do_libusb/bin/libusb-config"])
-+ else
-+ AC_PATH_PROG([_usb_config],[libusb-config])
-+ fi
-+
-+ _libusb_save_libs=$LIBS
-+ _libusb_save_cflags=$CFLAGS
-+
-+ if test x$_usb_config != "x" ; then
-+ _libusb_try_libs=`$_usb_config --libs`
-+ _libusb_try_cflags=`$_usb_config --cflags`
-+ else
-+ _libusb_try_libs="-lusb"
-+ _libusb_try_cflags=""
-+ fi
-+
-+ LIBS="$LIBS $_libusb_try_libs"
-+ CFLAGS="$CFLAGS $_libusb_try_cflags"
-+
-+ AC_MSG_CHECKING([whether libusb is present and sane])
-+
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <usb.h>],[
-+ usb_interrupt_write(NULL,0,NULL,0,0);
-+ ])],enable_libusb=yes,enable_libusb=no)
-+
-+ AC_MSG_RESULT([$enable_libusb])
-+
-+ if test "$enable_libusb" = "yes" ; then
-+ AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])
-+ AC_SUBST(LIBUSB_CFLAGS, $_libusb_try_cflags)
-+ AC_SUBST(LIBUSB_LIBS, $_libusb_try_libs)
-+ fi
-+
-+ LIBS=$_libusb_save_libs
-+ CFLAGS=$_libusb_save_cflags
-+
-+ unset _libusb_save_libs
-+ unset _libusb_save_cflags
-+ unset _libusb_try_libs
-+ unset _libusb_try_cflags
- fi
--AC_SUBST(LIBUSB_LIBS)
--AC_SUBST(LIBUSB_CFLAGS)
-
- dnl ######################################################################
- dnl libusb-1.0 support
++ [PKG_CHECK_MODULES(LIBUSB, libusb-0.1,
+ [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])],
+ [ enable_libusb=no ])],
+ [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])])
Modified: head/sysutils/usbhid-dump/Makefile
==============================================================================
--- head/sysutils/usbhid-dump/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/sysutils/usbhid-dump/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -11,8 +11,6 @@ COMMENT= USB HID device dumping utility
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-CONFIGURE_ENV= LIBUSB_CFLAGS="-I/usr/include" \
- LIBUSB_LIBS="-L/usr/lib -lusb"
GNU_CONFIGURE= yes
USES= autoreconf libtool pkgconfig
Modified: head/sysutils/usbutils/Makefile
==============================================================================
--- head/sysutils/usbutils/Makefile Thu Jan 5 22:43:42 2017 (r430668)
+++ head/sysutils/usbutils/Makefile Thu Jan 5 22:58:02 2017 (r430669)
@@ -20,14 +20,14 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --datadir=${DATADIR} --enable-zlib
-CONFIGURE_ENV= LIBUSB_CFLAGS="-I/usr/include" \
- LIBUSB_LIBS="-L/usr/lib -lusb"
PORTDOCS= AUTHORS ChangeLog NEWS README
OPTIONS_DEFINE= DOCS
post-patch:
+ @${REINPLACE_CMD} -e '/PKG_CONFIG.*libusb/s/ >= 0\.1\.[0-9]*/-0.1/' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -i '' \
-e 's|/bin/bash|/bin/sh|' \
${WRKSRC}/usb-devices
More information about the svn-ports-all
mailing list