Index: head/audio/libgpod/Makefile =================================================================== --- head/audio/libgpod/Makefile (revision 430668) +++ head/audio/libgpod/Makefile (revision 430669) @@ -1,73 +1,72 @@ # Created by: Devon Ryan # $FreeBSD$ PORTNAME= libgpod PORTVERSION= 0.8.3 PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER?= avilla@FreeBSD.org COMMENT?= Library for direct access to iPod contents LICENSE= LGPL20 LIB_DEPENDS= libplist.so:devel/libplist \ libtag.so:audio/taglib \ libsgutils2.so:sysutils/sg3_utils USES= gettext gmake libtool localbase pathfix pkgconfig sqlite:3 tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-udev --without-hal \ --with-html-dir="${DOCSDIR:H}" USE_CSTD= gnu89 USE_GNOME= gdkpixbuf2 gtk20 intltool libxml2 INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS IMOBILE PYTHON MONO OPTIONS_DEFAULT=IMOBILE OPTIONS_EXCLUDE?= MONO 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 MONO_CONFIGURE_WITH= mono PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 \ ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen PYTHON_USE= GNOME=pygobject PYTHON_USES= python PYTHON_CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig2.0" PYTHON_CONFIGURE_WITH= python PORTDOCS= ChangeLog NEWS README* .include .if ${PORT_OPTIONS:MIMOBILE} COMMENT:= ${COMMENT:S,iPod,&/iPhone,} .endif post-patch-MONO-on: ${REINPLACE_CMD} 's/gmcs/mcs/g' ${WRKSRC}/configure ${WRKSRC}/m4/mono.m4 .if ${SLAVE_PORT} == no post-install: ${INSTALL_PROGRAM} ${WRKSRC}/tools/ipod-time-sync \ ${STAGEDIR}${PREFIX}/bin .endif post-install-MONO-off: @${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libgpod-sharp.pc post-install-DOCS-on: ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/comms/gnuradio/Makefile =================================================================== --- head/comms/gnuradio/Makefile (revision 430668) +++ head/comms/gnuradio/Makefile (revision 430669) @@ -1,127 +1,127 @@ # $FreeBSD$ PORTNAME= gnuradio PORTVERSION= 3.7.9.2 PORTREVISION= 4 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ LOCAL/db MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio Software defined radio LICENSE= GPLv3 BUILD_DEPENDS= sdl-config:devel/sdl12 \ swig2.0:devel/swig20 \ cheetah:devel/py-cheetah \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}qt4>0:devel/py-qt4 \ xdg-open:devel/xdg-utils \ guile:lang/guile \ aconnect:audio/alsa-utils \ git:devel/git \ ${PYNUMPY} \ ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem LIB_DEPENDS= libcppunit.so:devel/cppunit \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libqwt.so:x11-toolkits/qwt5 \ libboost_python.so:devel/boost-python-libs \ libportaudio.so:audio/portaudio \ libjack.so:audio/jack \ libasound.so:audio/alsa-lib \ libgsl.so:math/gsl \ libgsm.so:audio/gsm \ libboost_date_time.so:devel/boost-libs \ liborc-0.4.so:devel/orc RUN_DEPENDS:= ${BUILD_DEPENDS} # USES=compiler:c11 is necessary because base GCC fails: # 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}" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ -DENABLE_GR_CTRLPORT="YES" \ -DLOCALBASE:STRING="${LOCALBASE}" \ -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace MAJOR_SUB_VER= 3.7.9.2 DOCSDIR= share/doc/${PORTNAME}-${MAJOR_SUB_VER} USE_GNOME= pygtk2 USE_WX= 3.0+ USE_QT4= corelib gui xml qmake moc rcc uic WX_COMPS= wx wx:build wx:run python:build python:run USE_LDCONFIG= yes PLIST_SUB+= MAJOR_VERSION="3" PLIST_SUB+= MAJOR_SUB_VER="${MAJOR_SUB_VER}" LIBSTRIP_FILES= analog atsc audio blocks channels digital dtv fcd fec fft\ filter noaa pager pmt qtgui runtime trellis video-sdl\ vocoder wavelet wxgui OPTIONS_DEFINE= UHD TESTING DOXYGEN # Unfortunately building docs on i386 fails ##OPTIONS_EXCLUDE_${i386}= DOXYGEN # Yay. building docs is broken on 10 and HEAD too so turn them all off OPTIONS_EXCLUDE= DOXYGEN OPTIONS_DEFAULT= UHD OPTIONS_SUB= yes UHD_DESC= Include UHD support from Ettus TESTING_DESC= Include testing support PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ sphinx-apidoc:textproc/py-sphinx \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf DOXYGEN_CMAKE_ON= -DENABLE_DOXYGEN:STRING="ON" \ -DENABLE_DOCS:STRING="ON" \ -DENABLE_BAD_BOOST="ON" DOXYGEN_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \ -DENABLE_DOCS:STRING="OFF" \ -DENABLE_BAD_BOOST="ON" HAVE_PORTDOCS= YES UHD_CMAKE_ON= -DENABLE_GR_UHD:STRING="ON" UHD_CMAKE_OFF= -DENABLE_GR_UHD:STRING="OFF" TESTING_CMAKE_ON= -DENABLE_TESTING:STRING="ON" TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF" TESTING_BUILD_DEPENDS= cppunit-config:devel/cppunit .include .if ${PORT_OPTIONS:MUHD} LIBSTRIP_FILES+= uhd LIB_DEPENDS+= libuhd.so:comms/uhd .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 USE_GCC= yes .endif PATCH_FILES= docs/doxygen/Doxyfile.in \ gr-fec/lib/CMakeLists.txt post-patch: @${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \ ${XARGS} ${REINPLACE_CMD} -e \ "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g" .for p in ${PATCH_FILES} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/${p} .endfor post-install: .for a in ${LIBSTRIP_FILES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER} .endfor .include Index: head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake =================================================================== --- head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake (revision 430668) +++ head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake (revision 430669) @@ -1,66 +1,20 @@ --- 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) +message(status "--- Checking for libusb_get_string_descriptor") +set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_LIBRARIES}) +CHECK_FUNCTION_EXISTS(libusb_get_string_descriptor HAVE_LIBUSB_GET_STRING_DESCRIPTOR) + +if (HAVE_LIBUSB_GET_STRING_DESCRIPTOR) + add_definitions( -DHAVE_LIBUSB_GET_STRING_DESCRIPTOR) + message(status "--- Found libusb_get_string_descriptor") +else() + message(status "--- libusb_get_string_descriptor Not Found") +endif() + mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) endif(NOT LIBUSB_FOUND) Property changes on: head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/libticables2/Makefile =================================================================== --- head/comms/libticables2/Makefile (revision 430668) +++ head/comms/libticables2/Makefile (revision 430669) @@ -1,32 +1,33 @@ # $FreeBSD$ PORTNAME= libticables2 PORTVERSION= 1.3.4 PORTREVISION= 3 CATEGORIES= comms MASTER_SITES= SF/tilp/tilp2-linux/tilp2-1.17 MAINTAINER= tijl@FreeBSD.org COMMENT= TI calculator link cables library LICENSE= GPLv2 USE_GNOME= glib20 USE_LDCONFIG= yes USES= gmake libtool pathfix pkgconfig tar:bzip2 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes 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 Index: head/comms/owfs/Makefile =================================================================== --- head/comms/owfs/Makefile (revision 430668) +++ head/comms/owfs/Makefile (revision 430669) @@ -1,132 +1,132 @@ # Created by: Johan Strom # $FreeBSD$ PORTNAME= owfs PORTVERSION= 3.1p1 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= SF/owfs/owfs/${PORTVERSION} MAINTAINER= johan@stromnet.se COMMENT= OWFS -- 1-Wire file system LICENSE= GPLv2 USES= autoreconf gmake libtool pkgconfig GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes .include "Makefile.options" OPTIONS_SUB=yes CONFIGURE_ARGS= --enable-owlib # Linux specific kernel driver CONFIGURE_ARGS+= --disable-w1 CONFIGURE_ARGS+= --disable-parport OWDEBUG_CONFIGURE_ENABLE= debug OWMUTEXDEBUG_CONFIGURE_ENABLE= mutexdebug OWSHELL_CONFIGURE_ENABLE= owshell OWNET_CONFIGURE_ENABLE= ownet I2C_CONFIGURE_ENABLE= i2c OWHTTPD_CONFIGURE_ENABLE= owhttpd OWFTPD_CONFIGURE_ENABLE= owftpd OWSERVER_CONFIGURE_ENABLE= owserver OWTAP_CONFIGURE_ENABLE= owtap OWTAP_USES= tk:wrapper OWMALLOC_CONFIGURE_ENABLE= owmalloc OWTRAFFIC_CONFIGURE_ENABLE= owtraffic OWMON_CONFIGURE_ENABLE= owmon OWMON_USES= tk:wrapper OWCAPI_CONFIGURE_ENABLE= owcapi OWPERL_CONFIGURE_ENABLE= owperl OWPERL_USES= perl5 OWPERL_USE= perl5=build,run # Broken/untested OWPHP_CONFIGURE_ENABLE= owphp OWPYTHON_CONFIGURE_ENABLE= owpython OWPYTHON_USES= python # Additional CONFIGURE_ARGS is done below OWTCL_CONFIGURE_ENABLE= owtcl OWTCL_USES= tcl # XXX Broken due to -lgcc_p PROFILING_CONFIGURE_ENABLE= profiling # work on 10.1 amd64, USB DS9097, --passive=/dev/cuaU0 OWFS_CONFIGURE_ENABLE= owfs OWFS_USES= fuse ZERO_CONFIGURE_ENABLE= zero USB_CONFIGURE_ENABLE= usb -USB_LDFLAGS= -lusb .include # If OW Network and C API is requested, build libownet as well .if ${PORT_OPTIONS:MOWNET} && ${PORT_OPTIONS:MOWCAPI} CONFIGURE_ARGS+= --enable-ownetlib PLIST_SUB+= OWNETLIB="" .else CONFIGURE_ARGS+= --disable-ownetlib PLIST_SUB+= OWNETLIB="@comment " .endif # If OW Network and Perl is requested, we get ownet perl files .if ${PORT_OPTIONS:MOWPERL} && ${PORT_OPTIONS:MOWNET} PLIST_SUB+= OWNETPERL="" .else PLIST_SUB+= OWNETPERL="@comment " .endif # If OW Network and Python is requested, we get ownet python files .if ${PORT_OPTIONS:MOWPYTHON} && ${PORT_OPTIONS:MOWNET} PLIST_SUB+= OWNETPYTHON="" .else PLIST_SUB+= OWNETPYTHON="@comment " .endif # If Perl, Python or PHP is requested, enable SWIG .if ${PORT_OPTIONS:MOWPERL} || ${PORT_OPTIONS:MOWPYTHON} || ${PORT_OPTIONS:MOWPHP} BUILD_DEPENDS+= ${LOCALBASE}/bin/swig2.0:devel/swig20 CONFIGURE_ARGS+= --enable-swig SWIG=${LOCALBASE}/bin/swig2.0 .else CONFIGURE_ARGS+= --disable-swig .endif .if ${PORT_OPTIONS:MOWTCL} CONFIGURE_ARGS+= --enable-owtcl --with-tcl=${TCL_LIBDIR} .endif # This takes a few seconds so give the user some notice pre-configure: @${MKDIR} ${WRKSRC}/m4 @echo "Preparing build using autotools..." # Workarounds for different problems post-install-OWPYTHON-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) post-install-OWPERL-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so .include Index: head/comms/rtl-sdr/Makefile =================================================================== --- head/comms/rtl-sdr/Makefile (revision 430668) +++ head/comms/rtl-sdr/Makefile (revision 430669) @@ -1,35 +1,35 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= rtl-sdr PORTVERSION= 20140210 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= comms hamradio MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Commandline tool that performs SDR with RTL2832-based USB sticks LICENSE= GPLv2 USES= autoreconf gmake pkgconfig libtool pathfix tar:tgz GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/librtlsdr OPTIONS_DEFINE= DOXYGEN OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile.am post-patch: @${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \ ${WRKSRC}/Makefile.am .include Index: head/comms/rtl-sdr/files/patch-configure.ac =================================================================== --- head/comms/rtl-sdr/files/patch-configure.ac (revision 430668) +++ head/comms/rtl-sdr/files/patch-configure.ac (revision 430669) @@ -1,22 +1,11 @@ --- 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 dnl pthreads -AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"]) +AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -pthread"]) dnl libmath (for rtl_fm) AC_CHECK_LIB(m, atan2, [LIBS="$LIBS -lm"]) Index: head/comms/rtl-sdr/files/patch-librtlsdr.pc.in =================================================================== --- head/comms/rtl-sdr/files/patch-librtlsdr.pc.in (revision 430668) +++ head/comms/rtl-sdr/files/patch-librtlsdr.pc.in (revision 430669) @@ -1,9 +1,11 @@ +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 @@ Description: C Utility Library 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@ Index: head/comms/usbmuxd/Makefile =================================================================== --- head/comms/usbmuxd/Makefile (revision 430668) +++ head/comms/usbmuxd/Makefile (revision 430669) @@ -1,41 +1,39 @@ # $FreeBSD$ PORTNAME= usbmuxd DISTVERSION= 1.1.0 CATEGORIES= comms MASTER_SITES= http://www.libimobiledevice.org/downloads/ MAINTAINER= avilla@FreeBSD.org COMMENT= Daemon for multiplexing connections over USB to iPhone/iPod Touch LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libplist.so:devel/libplist \ libimobiledevice.so:comms/libimobiledevice 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} PORTDOCS= AUTHORS NEWS README OPTIONS_DEFINE= DOCS post-patch: # TODO: add devd(8) rule. @${REINPLACE_CMD} \ -e '/*cygwin*/ s,),|dragonfly*|*bsd*),' \ ${WRKSRC}/configure.ac post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/devel/acsccid/Makefile =================================================================== --- head/devel/acsccid/Makefile (revision 430668) +++ head/devel/acsccid/Makefile (revision 430669) @@ -1,34 +1,26 @@ # Created by: mp39590@gmail.com # $FreeBSD$ PORTNAME= acsccid PORTVERSION= 1.1.4 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= mp39590@gmail.com COMMENT= PC/SC driver for CS CCID smart card readers LICENSE= GPLv2 LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite USES= perl5 pkgconfig tar:bz2 PLIST_FILES= lib/pcsc/drivers/ifd-acsccid.bundle/Contents/${OPSYS}/libacsccid.so \ lib/pcsc/drivers/ifd-acsccid.bundle/Contents/Info.plist GNU_CONFIGURE= yes -.include - -# 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 +.include Index: head/devel/libccid/Makefile =================================================================== --- head/devel/libccid/Makefile (revision 430668) +++ head/devel/libccid/Makefile (revision 430669) @@ -1,41 +1,39 @@ # Created by: arved # $FreeBSD$ PORTNAME= ccid PORTVERSION= 1.4.25 CATEGORIES= devel MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4187/ MAINTAINER= mokhi64@gmail.com COMMENT= Generic USB CCID (Chip/Smart Card Interface Devices) driver LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite USES= perl5 pkgconfig tar:bzip2 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 post-patch: @${REINPLACE_CMD} -e "s,ndef __APPLE__, !(__APPLE__ || __FreeBSD__)," ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c @${REINPLACE_CMD} -e "s,libusb-1.0/libusb.h,libusb.h," \ ${WRKSRC}/configure ${WRKSRC}/src/ccid_usb.c \ ${WRKSRC}/src/ccid_usb.h \ ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c post-install: ${INSTALL_PROGRAM} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/devel/libg19/Makefile =================================================================== --- head/devel/libg19/Makefile (revision 430668) +++ head/devel/libg19/Makefile (revision 430669) @@ -1,23 +1,23 @@ # Created by: Armin Pirkovitsch # $FreeBSD$ PORTNAME= libg19 PORTVERSION= 1.1.1 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/g19linux/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= armin@frozen-zone.org COMMENT= G19 library -USES= libtool +USES= libtool pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes PLIST_FILES= include/libg19.h \ lib/libg19.a \ lib/libg19.so \ lib/libg19.so.1 \ lib/libg19.so.1.0.1 .include Index: head/devel/libg19/files/patch-configure =================================================================== --- head/devel/libg19/files/patch-configure (revision 430668) +++ head/devel/libg19/files/patch-configure (nonexistent) @@ -1,39 +0,0 @@ ---- configure.orig 2011-04-15 10:36:10.000000000 +0200 -+++ configure 2011-04-15 15:27:11.000000000 +0200 -@@ -20067,35 +20067,11 @@ - - if test -n "$libg19_CFLAGS"; then - pkg_cv_libg19_CFLAGS="$libg19_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_libg19_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried - fi - if test -n "$libg19_LIBS"; then - pkg_cv_libg19_LIBS="$libg19_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_libg19_LIBS=`$PKG_CONFIG --libs "libusb-1.0" 2>/dev/null` - else -- pkg_failed=yes --fi -- else -- pkg_failed=untried -+ pkg_cv_libg19_LIBS="-lusb" - fi - - Property changes on: head/devel/libg19/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libpafe/Makefile =================================================================== --- head/devel/libpafe/Makefile (revision 430668) +++ head/devel/libpafe/Makefile (revision 430669) @@ -1,30 +1,27 @@ # Created by: Hajimu UMEMOTO # $FreeBSD$ PORTNAME= libpafe PORTVERSION= 0.0.8 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://homepage3.nifty.com/slokar/pasori/ MAINTAINER= ume@FreeBSD.org COMMENT= FeliCa read/write library for Sony RC-S320 USB FeliCa R/W(PaSoRi) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= libtool pkgconfig PLIST_FILES= bin/felica_dump bin/pasori_test \ include/libpafe/felica_command.h \ include/libpafe/libpafe.h \ include/libpafe/pasori_command.h \ 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 Index: head/devel/libsigrok/Makefile =================================================================== --- head/devel/libsigrok/Makefile (revision 430668) +++ head/devel/libsigrok/Makefile (revision 430669) @@ -1,33 +1,38 @@ # Created by: Uffe Jakobsen # $FreeBSD$ PORTNAME= libsigrok PORTVERSION= 0.3.0 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://sigrok.org/download/source/libsigrok/ MAINTAINER= bsam@FreeBSD.org COMMENT= Framework for hardware logic analyzers, core library LICENSE= GPLv3 LIB_DEPENDS= libserialport.so:devel/libserialport \ libzip.so:archivers/libzip GNU_CONFIGURE= yes 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 # Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION .if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe .endif .include Index: head/devel/openocd/files/patch-configure =================================================================== --- head/devel/openocd/files/patch-configure (revision 430668) +++ head/devel/openocd/files/patch-configure (nonexistent) @@ -1,101 +0,0 @@ ---- configure.orig 2015-05-17 21:09:56 UTC -+++ configure -@@ -15124,12 +15124,12 @@ if test -n "$LIBUSB1_CFLAGS"; then - pkg_cv_LIBUSB1_CFLAGS="$LIBUSB1_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-1.0\""; } >&5 -+ (./libusb_finder --exists --print-errors "libusb-1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBUSB1_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null` -+ pkg_cv_LIBUSB1_CFLAGS=`./libusb_finder --cflags "libusb-1.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15141,12 +15141,12 @@ if test -n "$LIBUSB1_LIBS"; then - pkg_cv_LIBUSB1_LIBS="$LIBUSB1_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-1.0\""; } >&5 -+ (./libusb_finder --exists --print-errors "libusb-1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBUSB1_LIBS=`$PKG_CONFIG --libs "libusb-1.0" 2>/dev/null` -+ pkg_cv_LIBUSB1_LIBS=`./libusb_finder --libs "libusb-1.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15167,9 +15167,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBUSB1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb-1.0" 2>&1` -+ LIBUSB1_PKG_ERRORS=`./libusb_finder --short-errors --print-errors --cflags --libs "libusb-1.0" 2>&1` - else -- LIBUSB1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb-1.0" 2>&1` -+ LIBUSB1_PKG_ERRORS=`./libusb_finder --print-errors --cflags --libs "libusb-1.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBUSB1_PKG_ERRORS" >&5 -@@ -15198,8 +15198,8 @@ $as_echo "yes" >&6; } - $as_echo "#define HAVE_LIBUSB1 1" >>confdefs.h - - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.9\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libusb-1.0 >= 1.0.9") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-1.0 >= 1.0.9\""; } >&5 -+ (./libusb_finder --exists --print-errors "libusb-1.0 >= 1.0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -@@ -15225,12 +15225,12 @@ if test -n "$LIBUSB0_CFLAGS"; then - pkg_cv_LIBUSB0_CFLAGS="$LIBUSB0_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb\""; } >&5 -+ (./libusb_finder --exists --print-errors "libusb-0.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBUSB0_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null` -+ pkg_cv_LIBUSB0_CFLAGS=`./libusb_finder --cflags "libusb-0.1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15242,12 +15242,12 @@ if test -n "$LIBUSB0_LIBS"; then - pkg_cv_LIBUSB0_LIBS="$LIBUSB0_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-0.1\""; } >&5 -+ (./libusb_finder --exists --print-errors "libusb-0.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBUSB0_LIBS=`$PKG_CONFIG --libs "libusb" 2>/dev/null` -+ pkg_cv_LIBUSB0_LIBS=`./libusb_finder --libs "libusb-0.1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15268,9 +15268,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBUSB0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb" 2>&1` -+ LIBUSB0_PKG_ERRORS=`./libusb_finder --short-errors --print-errors --cflags --libs "libusb" 2>&1` - else -- LIBUSB0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb" 2>&1` -+ LIBUSB0_PKG_ERRORS=`./libusb_finder --print-errors --cflags --libs "libusb" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBUSB0_PKG_ERRORS" >&5 Property changes on: head/devel/openocd/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/openocd/files/patch-libusb__finder =================================================================== --- head/devel/openocd/files/patch-libusb__finder (revision 430668) +++ head/devel/openocd/files/patch-libusb__finder (nonexistent) @@ -1,30 +0,0 @@ ---- libusb_finder.orig 2016-07-22 13:59:36 UTC -+++ libusb_finder -@@ -0,0 +1,27 @@ -+#!/bin/sh -+ -+set -e -+ -+case `uname -r` in -+ 9.*) ;; -+ *) pkg-config $@ && exit 0;; -+esac -+ -+if [ ! -e /usr/lib/libusb.so ]; then -+ echo "$0: libusb does not seem to be available" > /dev/stderr -+ exit 1 -+fi -+ -+for param in $@; do -+ case $param in -+ "--exists") ;; -+ "--cflags") ;; -+ "--libs") echo "-lusb" ;; -+ "--short-errors") ;; -+ "--print-errors") ;; -+ libusb*) ;; -+ *) -+ echo "$0: Unhandled parameters: $@" > /dev/stderr -+ exit 1 ;; -+ esac -+done Property changes on: head/devel/openocd/files/patch-libusb__finder ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/openocd/Makefile =================================================================== --- head/devel/openocd/Makefile (revision 430668) +++ head/devel/openocd/Makefile (revision 430669) @@ -1,297 +1,298 @@ # Created by: Tomasz "CeDeROM" CEDRO (http://www.tomek.cedro.info) # $FreeBSD$ PORTNAME= openocd PORTVERSION= 0.9.0 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= skreuzer@FreeBSD.org COMMENT= Open On-Chip Debugger BUILD_DEPENDS= ${LOCALBASE}/bin/makeinfo:print/texinfo GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-werror CONFIGURE_ENV= MAKEINFO=${LOCALBASE}/bin/makeinfo OPTIONS_DEFINE= DOXYGEN JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \ USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \ ARMJTAGEW BUSPIRATE TIICDI STLINK OSBDM OPENDOUS SYSFSGPIO RMTBITBANG \ MINIDRIVER CMSISDAP OPTIONS_DEFAULT=JIMTCL PARPORT DUMMY FT2232 FTDI USBBLASTER EP93XX \ AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK ARMJTAGEW \ BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG DOXYGEN_DESC= Build HTML and PDF documentation with Doxygen JIMTCL_DESC= Build with internal JimTCL interpreter VERBOSE_DESC= Enable verbose JTAG I/O messages JTAG_IO_DESC= Enable verbose JTAG I/O messages USB_IO_DESC= Enable verbose USB I/O messages PARPORT_DESC= Support Parallel Port based drivers DUMMY_DESC= Support Dummy Driver FT2232_DESC= Support FT2232 based USB devices (using libftdi) FTDI_DESC= Support experimental FTDI+MPSSE+libusb-1.0 async. USBBLASTER_DESC=Support USB-Blaster Programmer (using libftdi) EP93XX_DESC= Support EP93xx based SBCs AT91RM9200_DESC=Support AT91RM9200 based SBCs PRESTO_DESC= Support ASIX Presto Programmer (using libftdi) USBPROG_DESC= Support USB-Prog JTAG Programmer JLINK_DESC= Support Segger J-Link JTAG Programmer VSLLINK_DESC= Support Versaloon-Link JTAG Programmer RLINK_DESC= Support Raisonance RLink JTAG Programmer ULINK_DESC= Support Keil ULINK-JTAG Programmer ARMJTAGEW_DESC= Support Olimex ARM-JTAG-EW Programmer BUSPIRATE= Support BusPirate Programmer STLINK_DESC= Support STLink Programmer TI_ICDI_DESC= Support TI ICDI JTAG Programmer OSBDM_DESC= Support OSBDM Programmer (JTAG only) OPENDOUS= Support EStick/OpenDous Programmer SYSFSGPIO= Support Programming via sysfs GPIOs RMTBITBANG_DESC=Support Remote-Bitbang Driver MINIDRIVER_DESC=Dummy minidriver only (will exclude others!) CMSISDAP_DESC=Support for CMSIS-DAP Compliant Debugger USES= gmake libtool pkgconfig tar:bzip2 CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib 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. # If you need them working on FreeeBSD, code, patches are welcome :-) .include .if ${PORT_OPTIONS:MDOXYGEN} CONFIGURE_ARGS+= --enable-doxygen-pdf WITH_DOXYGEN= yes .else CONFIGURE_ARGS+= --disable-doxygen-pdf --disable-doxygen-html .endif .if ${PORT_OPTIONS:MJIMTCL} CONFIGURE_ARGS+= --enable-internal-jimtcl .else CONFIGURE_ARGS+= --disable-internal-jimtcl .endif .if ${PORT_OPTIONS:MVERBOSE} CONFIGURE_ARGS+= --enable-verbose .else CONFIGURE_ARGS+= --disable-verbose .endif .if ${PORT_OPTIONS:MJTAG_IO} CONFIGURE_ARGS+= --enable-verbose-jtag-io .else CONFIGURE_ARGS+= --disable-verbose-jtag-io .endif .if ${PORT_OPTIONS:MUSB_IO} CONFIGURE_ARGS+= --enable-verbose-usb-io .else CONFIGURE_ARGS+= --disable-verbose-usb-io .endif .if ${PORT_OPTIONS:MUSB_COMMS} CONFIGURE_ARGS+= --enable-verbose-usb-comms .else CONFIGURE_ARGS+= --disable-verbose-usb-comms .endif .if ${PORT_OPTIONS:MMALLOC} CONFIGURE_ARGS+= --enable-malloc-logging .else CONFIGURE_ARGS+= --disable-malloc-logging .endif .if ${PORT_OPTIONS:MPARPORT} CONFIGURE_ARGS+= --enable-parport .else CONFIGURE_ARGS+= --disable-parport .endif .if ${PORT_OPTIONS:MDUMMY} CONFIGURE_ARGS+= --enable-dummy .else CONFIGURE_ARGS+= --disable-dummy .endif .if ${PORT_OPTIONS:MFT2232} CONFIGURE_ARGS+= --enable-legacy-ft2232_libftdi WITH_LIBFTDI= yes .else CONFIGURE_ARGS+= --disable-legacy-ft2232_libftdi .endif .if ${PORT_OPTIONS:MFTDI} CONFIGURE_ARGS+= --enable-ftdi WITH_LIBFTDI= yes .else CONFIGURE_ARGS+= --disable-ftdi .endif .if ${PORT_OPTIONS:MUSBBLASTER} CONFIGURE_ARGS+= --enable-usb_blaster_libftdi .else CONFIGURE_ARGS+= --disable-usb_blaster_libftdi .endif .if ${PORT_OPTIONS:MAMTJTAGACCEL} CONFIGURE_ARGS+= --enable-amtjtagaccel .else CONFIGURE_ARGS+= --disable-amtjtagaccel .endif .if ${PORT_OPTIONS:MZY1000} CONFIGURE_ARGS+= --enable-zy1000 .else CONFIGURE_ARGS+= --disable-zy1000 .endif .if ${PORT_OPTIONS:MIOUTIL} CONFIGURE_ARGS+= --enable-ioutil .else CONFIGURE_ARGS+= --disable-ioutil .endif .if ${PORT_OPTIONS:MEP93XX} CONFIGURE_ARGS+= --enable-ep93xx .else CONFIGURE_ARGS+= --disable-ep93xx .endif .if ${PORT_OPTIONS:MAT91RM9200} CONFIGURE_ARGS+= --enable-at91rm9200 .else CONFIGURE_ARGS+= --disable-at91rm9200 .endif .if ${PORT_OPTIONS:MGW16012} CONFIGURE_ARGS+= --enable-gw16012 .else CONFIGURE_ARGS+= --disable-gw16012 .endif .if ${PORT_OPTIONS:MPRESTO} CONFIGURE_ARGS+= --enable-presto_libftdi WITH_LIBFTDI= yes .else CONFIGURE_ARGS+= --disable-presto_libftdi .endif .if ${PORT_OPTIONS:MUSBPROG} CONFIGURE_ARGS+= --enable-usbprog WITH_LIBUSB= yes .else CONFIGURE_ARGS+= --disable-usbprog .endif .if ${PORT_OPTIONS:MOOCDTRACE} CONFIGURE_ARGS+= --enable-oocd_trace .else CONFIGURE_ARGS+= --disable-oocd_trace .endif .if ${PORT_OPTIONS:MJLINK} CONFIGURE_ARGS+= --enable-jlink WITH_LIBUSB= yes .else CONFIGURE_ARGS+= --disable-jlink .endif .if ${PORT_OPTIONS:MVSLLINK} CONFIGURE_ARGS+= --enable-vsllink WITH_LIBUSB= yes .else CONFIGURE_ARGS+= --disable-vsllink .endif .if ${PORT_OPTIONS:MRLINK} CONFIGURE_ARGS+= --enable-rlink WITH_LIBUSB= yes .else CONFIGURE_ARGS+= --disable-rlink .endif .if ${PORT_OPTIONS:MULINK} CONFIGURE_ARGS+= --enable-ulink .else CONFIGURE_ARGS+= --disable-ulink .endif .if ${PORT_OPTIONS:MARMJTAGEW} CONFIGURE_ARGS+= --enable-arm-jtag-ew WITH_LIBUSB= yes .else CONFIGURE_ARGS+= --disable-arm-jtag-ew .endif .if ${PORT_OPTIONS:MBUSPIRATE} CONFIGURE_ARGS+= --enable-buspirate .else CONFIGURE_ARGS+= --disable-buspirate .endif .if ${PORT_OPTIONS:MSTLINK} CONFIGURE_ARGS+= --enable-stlink .else CONFIGURE_ARGS+= --disable-stlink .endif .if ${PORT_OPTIONS:MTIICDI} CONFIGURE_ARGS+= --enable-ti-icdi .else CONFIGURE_ARGS+= --disable-ti-icdi .endif .if ${PORT_OPTIONS:MOSBDM} CONFIGURE_ARGS+= --enable-osbdm .else CONFIGURE_ARGS+= --disable-osbdm .endif .if ${PORT_OPTIONS:MOPENDOUS} CONFIGURE_ARGS+= --enable-opendous .else CONFIGURE_ARGS+= --disable-opendous .endif .if ${PORT_OPTIONS:MSYSFSGPIO} CONFIGURE_ARGS+= --enable-sysfsgpio .else CONFIGURE_ARGS+= --disable-sysfsgpio .endif .if ${PORT_OPTIONS:MRMTBITBANG} CONFIGURE_ARGS+= --enable-remote-bitbang .else CONFIGURE_ARGS+= --disable-remote-bitbang .endif .if ${PORT_OPTIONS:MMINIDRIVER} CONFIGURE_ARGS+= --enable-minidriver-dummy .else CONFIGURE_ARGS+= --disable-minidriver-dummy .endif .if ${PORT_OPTIONS:MCMSISDAP} CONFIGURE_ARGS+= --enable-cmsis-dap LIB_DEPENDS+= libhidapi.so:comms/hidapi .else CONFIGURE_ARGS+= --disable-cmsis-dap .endif .if defined(WITH_LIBFTDI) LIB_DEPENDS+= libftdi.so:devel/libftdi .endif .if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:devel/doxygen .endif .include Index: head/devel/pcsc-lite/Makefile =================================================================== --- head/devel/pcsc-lite/Makefile (revision 430668) +++ head/devel/pcsc-lite/Makefile (revision 430669) @@ -1,54 +1,53 @@ # Created by: Toni Andjelkovic # $FreeBSD$ PORTNAME= pcsc-lite PORTVERSION= 1.8.19 PORTEPOCH= 2 CATEGORIES= devel security MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4198/ MAINTAINER= mokhi64@gmail.com COMMENT= Smartcard development library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= gmake libtool pathfix perl5 pkgconfig shebangfix tar:bzip2 USE_PERL5= build 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 OPTIONS_DEFINE= DOCS EXAMPLES .include post-patch: ${REINPLACE_CMD} -e "s,^datadir,#datadir,; s,^data_DATA,#data_DATA," \ ${WRKSRC}/doc/Makefile.in ${REINPLACE_CMD} -e "s,libusb-1.0/libusb.h,libusb.h,; \ s,libusb_strerror(ret),ret," ${WRKSRC}/configure \ ${WRKSRC}/src/hotplug_libusb.c ${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/src/spy/Makefile.in post-patch-DOCS-off: ${REINPLACE_CMD} -e '/^install-data-am: / s|install-docDATA||' ${WRKSRC}/doc/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.in ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers @${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/services @${SED} 's,%%PREFIX%%,${PREFIX},g' < ${FILESDIR}/pkg-message.in > \ ${WRKDIR}/pkg-message .include Index: head/devel/stlink/files/patch-configure.ac =================================================================== --- head/devel/stlink/files/patch-configure.ac (revision 430668) +++ head/devel/stlink/files/patch-configure.ac (nonexistent) @@ -1,13 +0,0 @@ ---- configure.ac.orig 2014-02-01 10:35:47.000000000 +0400 -+++ configure.ac 2014-02-15 18:30:35.000000000 +0400 -@@ -21,8 +21,8 @@ - AC_REPLACE_FUNCS(mmap) - - # Checks for libraries. --PKG_CHECK_MODULES(USB, libusb-1.0 >= 1.0.0,, -- AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) -+LIBS="$LIBS -lusb" -+ - AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb) - - LIBS="$LIBS $USB_LIBS" Property changes on: head/devel/stlink/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/qemu/Makefile =================================================================== --- head/emulators/qemu/Makefile (revision 430668) +++ head/emulators/qemu/Makefile (revision 430669) @@ -1,156 +1,157 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= qemu PORTVERSION= 2.6.1 PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT?= QEMU CPU Emulator LICENSE= GPLv2 HAS_CONFIGURE= yes USES?= cpe gmake pkgconfig bison perl5 python:2,build tar:bzip2 USE_PERL5= build MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils" USE_XORG= pixman USE_GNOME+= cairo glib20 ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? .endif OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK DOCS NCURSES SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) GNS3_DESC= gns3 patches (promiscuous multicast) X86_TARGETS_DESC= Build only x86 system targets STATIC_LINK_DESC= Statically link the executables OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3 NCURSES OPTIONS_SUB= yes X11_USE= SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2 X11_CONFIGURE_ENABLE= sdl GTK2_USE= GNOME=gtk20,vte GTK2_USES= gettext GTK2_CONFIGURE_OFF= --disable-gtk --disable-vte GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --disable-gnutls SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_OFF= --disable-vnc-sasl JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_OFF= --disable-vnc-png CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_OFF= --disable-curl OPENGL_USE= GL=yes OPENGL_CONFIGURE_OFF= --disable-opengl USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_CONFIGURE_OFF= --disable-usb-redir PCAP_CONFIGURE_ON= --enable-pcap PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch ${FILESDIR}/pcap-patch-net_net.c STATIC_LINK_CONFIGURE_ON= --static STATIC_LINK_PREVENTS= GTK2 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static NCURSES_USES= ncurses:base SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36 DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html DOCS_USES= makeinfo DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 PORTDOCS?= docs qemu-doc.html qemu-tech.html qmp-commands.txt WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 --enable-debug \ --prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" LIB_DEPENDS?= libnettle.so:security/nettle \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 .include .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" MAKE_ARGS+= ARCH=ppc .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # 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 \ -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ ${WRKSRC}/qemu-doc.texi @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/internal.h post-patch-GNS3-on: @${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \ ${WRKSRC}/hw/net/e1000.c # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak .if !target(post-install) post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif .include Index: head/emulators/qemu/files/patch-configure =================================================================== --- head/emulators/qemu/files/patch-configure (revision 430668) +++ head/emulators/qemu/files/patch-configure (revision 430669) @@ -1,192 +1,166 @@ --- configure.orig 2016-04-14 20:19:53 UTC +++ configure @@ -245,7 +245,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" -mandir="\${prefix}/share/man" +mandir="\${prefix}/man" datadir="\${prefix}/share" qemu_docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" @@ -316,6 +316,10 @@ virglrenderer="" tpm="yes" libssh2="" vhdx="" +quorum="no" +pcap="no" +pcap_create="no" +bpf="no" numa="" tcmalloc="no" jemalloc="no" @@ -575,7 +579,7 @@ FreeBSD) audio_drv_list="oss" audio_possible_drivers="oss sdl pa" # needed for kinfo_getvmmap(3) in libutil.h - LIBS="-lutil $LIBS" + LIBS="-lprocstat -lkvm -lelf -lutil $LIBS" netmap="" # enable netmap autodetect HOST_VARIANT_DIR="freebsd" ;; @@ -878,6 +882,10 @@ for opt do ;; --enable-vnc-png) vnc_png="yes" ;; + --enable-pcap) pcap="yes" + ;; + --disable-pcap) pcap="no" + ;; --disable-slirp) slirp="no" ;; --disable-uuid) uuid="no" @@ -2157,7 +2165,7 @@ if test "$gtk" != "no"; then gtk_cflags="$gtk_cflags $x11_cflags" gtk_libs="$gtk_libs $x11_libs" fi - libs_softmmu="$gtk_libs $libs_softmmu" + libs_softmmu="$gtk_libs -lintl $libs_softmmu" gtk="yes" elif test "$gtk" = "yes"; then feature_not_found "gtk" "Install gtk2 or gtk3 devel" @@ -2384,6 +2392,14 @@ if ! check_include "ifaddrs.h" ; then fi ########################################## +# getifaddrs (for tests/test-io-channel-socket ) + +have_ifaddrs_h=yes +if ! check_include "ifaddrs.h" ; then + have_ifaddrs_h=no +fi + +########################################## # VTE probe if test "$vte" != "no"; then @@ -2526,6 +2542,50 @@ EOF fi fi +########################################## +# pcap probe + +if test "$pcap" = "yes" -a "$pcap" != "no"; then + cat > $TMPC << EOF +#include +int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } +EOF + if test "$mingw32" = "no" ; then + libpcap=-lpcap + else + libpcap=-lwpcap + fi + if compile_prog "" "$libpcap" ; then + : + else + echo + echo "Error: Could not find pcap" + echo "Make sure to have the pcap libs and headers installed." + echo + exit 1 + fi + cat > $TMPC << EOF +#include +int main(void) +{ + char errbuf[PCAP_ERRBUF_SIZE]; + return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); +} +EOF + if compile_prog "" "$libpcap" ; then + pcap_create="yes" + fi + cat > $TMPC << EOF +#define PCAP_DONT_INCLUDE_PCAP_BPF_H +#include +#include +int main(void) { return (BPF_MAJOR_VERSION); } +EOF + if compile_prog ; then + bpf="yes" + fi + libs_softmmu="$libpcap $libs_softmmu" +fi # test "$pcap" ########################################## # VNC SASL detection @@ -3857,14 +3917,7 @@ fi # Check if tools are available to build documentation. if test "$docs" != "no" ; then - if has makeinfo && has pod2man; then docs=yes - else - if test "$docs" = "yes" ; then - feature_not_found "docs" "Install texinfo and Perl/perl-podlators" - fi - docs=no - fi fi # Search for bswap_32 function -@@ -3992,6 +4045,17 @@ fi - - # check for libusb - if test "$libusb" != "no" ; then -+ cat > $TMPC << EOF -+#include -+ -+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" echo "VirtFS support $virtfs" +echo "pcap support $pcap" echo "VNC support $vnc" if test "$vnc" = "yes" ; then echo "VNC SASL support $vnc_sasl" @@ -4950,6 +5016,15 @@ fi if test "$profiler" = "yes" ; then echo "CONFIG_PROFILER=y" >> $config_host_mak fi +if test "$pcap" = "yes" ; then + echo "CONFIG_PCAP=y" >> $config_host_mak + if test "$pcap_create" = "yes" ; then + echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak + fi + if test "$bpf" = "yes" ; then + echo "CONFIG_BPF=y" >> $config_host_mak + fi +fi if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak @@ -5153,6 +5228,9 @@ fi if test "$have_ifaddrs_h" = "yes" ; then echo "HAVE_IFADDRS_H=y" >> $config_host_mak fi +if test "$have_ifaddrs_h" = "yes" ; then + echo "HAVE_IFADDRS_H=y" >> $config_host_mak +fi if test "$vte" = "yes" ; then echo "CONFIG_VTE=y" >> $config_host_mak echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak Index: head/emulators/qemu-devel/Makefile =================================================================== --- head/emulators/qemu-devel/Makefile (revision 430668) +++ head/emulators/qemu-devel/Makefile (revision 430669) @@ -1,155 +1,156 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= qemu DISTVERSION= 2.6.0 PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ PKGNAMESUFFIX= -devel MAINTAINER= bofh@FreeBSD.org COMMENT= QEMU CPU Emulator - development version LICENSE= GPLv2 HAS_CONFIGURE= yes USES= cpe gmake pkgconfig bison perl5 python:2,build ssl tar:bzip2 USE_PERL5= build USE_XORG= pixman USE_GNOME+= cairo glib20 MAKE_ENV+= BSD_MAKE="${MAKE}" ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK DOCS SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) GNS3_DESC= gns3 patches (promiscuous multicast) X86_TARGETS_DESC= Build only x86 system targets STATIC_LINK_DESC= Statically link the executables OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3 OPTIONS_SUB= yes X11_USE= SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2 X11_CONFIGURE_ON= --enable-sdl X11_CONFIGURE_OFF= --disable-sdl GTK2_USE= GNOME=gtk20,vte GTK2_USES= gettext GTK2_CONFIGURE_OFF= --disable-gtk --disable-vte GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --disable-gnutls SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_OFF= --disable-vnc-sasl JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_OFF= --disable-vnc-png CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_OFF= --disable-curl OPENGL_USE= GL=yes OPENGL_CONFIGURE_OFF= --disable-opengl USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_CONFIGURE_OFF= --disable-usb-redir PCAP_CONFIGURE_ON= --enable-pcap PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch ${FILESDIR}/pcap-patch-net_net.c STATIC_LINK_CONFIGURE_ON= --static STATIC_LINK_PREVENTS= GTK2 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36 DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html DOCS_USES= makeinfo DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} LDFLAGS+= -L${OPENSSLLIB} -lcrypto CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 --enable-debug \ --prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" LIB_DEPENDS+= libnettle.so:security/nettle \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 .include .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" MAKE_ARGS+= ARCH=ppc .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # 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 \ -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ ${WRKSRC}/qemu-doc.texi @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/internal.h post-patch-GNS3-on: @${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \ ${WRKSRC}/hw/net/e1000.c # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak .if !target(post-install) post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif .include Index: head/emulators/qemu-devel/files/patch-configure =================================================================== --- head/emulators/qemu-devel/files/patch-configure (revision 430668) +++ head/emulators/qemu-devel/files/patch-configure (revision 430669) @@ -1,192 +1,166 @@ --- configure.orig 2016-04-14 20:19:53 UTC +++ configure @@ -245,7 +245,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" -mandir="\${prefix}/share/man" +mandir="\${prefix}/man" datadir="\${prefix}/share" qemu_docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" @@ -316,6 +316,10 @@ virglrenderer="" tpm="yes" libssh2="" vhdx="" +quorum="no" +pcap="no" +pcap_create="no" +bpf="no" numa="" tcmalloc="no" jemalloc="no" @@ -575,7 +579,7 @@ FreeBSD) audio_drv_list="oss" audio_possible_drivers="oss sdl pa" # needed for kinfo_getvmmap(3) in libutil.h - LIBS="-lutil $LIBS" + LIBS="-lprocstat -lkvm -lelf -lutil $LIBS" netmap="" # enable netmap autodetect HOST_VARIANT_DIR="freebsd" ;; @@ -878,6 +882,10 @@ for opt do ;; --enable-vnc-png) vnc_png="yes" ;; + --enable-pcap) pcap="yes" + ;; + --disable-pcap) pcap="no" + ;; --disable-slirp) slirp="no" ;; --disable-uuid) uuid="no" @@ -2157,7 +2165,7 @@ if test "$gtk" != "no"; then gtk_cflags="$gtk_cflags $x11_cflags" gtk_libs="$gtk_libs $x11_libs" fi - libs_softmmu="$gtk_libs $libs_softmmu" + libs_softmmu="$gtk_libs -lintl $libs_softmmu" gtk="yes" elif test "$gtk" = "yes"; then feature_not_found "gtk" "Install gtk2 or gtk3 devel" @@ -2384,6 +2392,14 @@ if ! check_include "ifaddrs.h" ; then fi ########################################## +# getifaddrs (for tests/test-io-channel-socket ) + +have_ifaddrs_h=yes +if ! check_include "ifaddrs.h" ; then + have_ifaddrs_h=no +fi + +########################################## # VTE probe if test "$vte" != "no"; then @@ -2526,6 +2542,50 @@ EOF fi fi +########################################## +# pcap probe + +if test "$pcap" = "yes" -a "$pcap" != "no"; then + cat > $TMPC << EOF +#include +int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } +EOF + if test "$mingw32" = "no" ; then + libpcap=-lpcap + else + libpcap=-lwpcap + fi + if compile_prog "" "$libpcap" ; then + : + else + echo + echo "Error: Could not find pcap" + echo "Make sure to have the pcap libs and headers installed." + echo + exit 1 + fi + cat > $TMPC << EOF +#include +int main(void) +{ + char errbuf[PCAP_ERRBUF_SIZE]; + return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); +} +EOF + if compile_prog "" "$libpcap" ; then + pcap_create="yes" + fi + cat > $TMPC << EOF +#define PCAP_DONT_INCLUDE_PCAP_BPF_H +#include +#include +int main(void) { return (BPF_MAJOR_VERSION); } +EOF + if compile_prog ; then + bpf="yes" + fi + libs_softmmu="$libpcap $libs_softmmu" +fi # test "$pcap" ########################################## # VNC SASL detection @@ -3857,14 +3917,7 @@ fi # Check if tools are available to build documentation. if test "$docs" != "no" ; then - if has makeinfo && has pod2man; then docs=yes - else - if test "$docs" = "yes" ; then - feature_not_found "docs" "Install texinfo and Perl/perl-podlators" - fi - docs=no - fi fi # Search for bswap_32 function -@@ -3992,6 +4045,17 @@ fi - - # check for libusb - if test "$libusb" != "no" ; then -+ cat > $TMPC << EOF -+#include -+ -+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" echo "VirtFS support $virtfs" +echo "pcap support $pcap" echo "VNC support $vnc" if test "$vnc" = "yes" ; then echo "VNC SASL support $vnc_sasl" @@ -4950,6 +5016,15 @@ fi if test "$profiler" = "yes" ; then echo "CONFIG_PROFILER=y" >> $config_host_mak fi +if test "$pcap" = "yes" ; then + echo "CONFIG_PCAP=y" >> $config_host_mak + if test "$pcap_create" = "yes" ; then + echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak + fi + if test "$bpf" = "yes" ; then + echo "CONFIG_BPF=y" >> $config_host_mak + fi +fi if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak @@ -5153,6 +5228,9 @@ fi if test "$have_ifaddrs_h" = "yes" ; then echo "HAVE_IFADDRS_H=y" >> $config_host_mak fi +if test "$have_ifaddrs_h" = "yes" ; then + echo "HAVE_IFADDRS_H=y" >> $config_host_mak +fi if test "$vte" = "yes" ; then echo "CONFIG_VTE=y" >> $config_host_mak echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak Index: head/graphics/colord/Makefile =================================================================== --- head/graphics/colord/Makefile (revision 430668) +++ head/graphics/colord/Makefile (revision 430669) @@ -1,74 +1,71 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= colord PORTVERSION= 1.2.12 CATEGORIES= graphics MASTER_SITES= http://www.freedesktop.org/software/colord/releases/ MAINTAINER= kwm@FreeBSD.org COMMENT= Manage color profiles to accurately color input/output devices LICENSE= GPLv2 BUILD_DEPENDS= spotread:graphics/argyllcms LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libdbus-1.so:devel/dbus \ liblcms2.so:graphics/lcms2 RUN_DEPENDS= spotread:graphics/argyllcms USERS= colord GROUPS= colord USES= gettext gmake libtool localbase pathfix pkgconfig sqlite tar:xz USE_GNOME= glib20 intlhack introspection:build GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes CONFIGURE_ARGS= --disable-udev \ --localstatedir=/var \ --enable-gtk-doc-html=no \ --disable-bash-completion \ --disable-gusb \ --disable-sane \ --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 OPTIONS_SUB= yes OPTIONS_DEFINE= MANPAGES PPROFILES MANPAGES_BUILD_DEPENDS= docbook2html:textproc/docbook-utils \ docbook-sgml>0:textproc/docbook-sgml PPROFILES_DESC= Build extra print profiles (long build time) PPROFILES_CONFIGURE_ENABLE= print-profiles .include post-patch: @${REINPLACE_CMD} -e 's|-Wclobbered||g' \ -e 's|-Wempty-body||g' \ -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' \ ${WRKSRC}/src/cd-main.c \ ${WRKSRC}/lib/colord/cd-icc-store.c \ ${WRKSRC}/src/cd-profile.c .if ! ${PORT_OPTIONS:MMANPAGES} @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure .endif post-install: @${MKDIR} ${STAGEDIR}/var/db/colord/icc .include Index: head/graphics/libgphoto2/Makefile =================================================================== --- head/graphics/libgphoto2/Makefile (revision 430668) +++ head/graphics/libgphoto2/Makefile (revision 430669) @@ -1,72 +1,65 @@ # Created by: Anders Nordby # $FreeBSD$ PORTNAME= libgphoto2 PORTVERSION= 2.5.11 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} MAINTAINER= woodsb02@FreeBSD.org COMMENT= Universal digital camera control library LICENSE= LGPL21 LIB_DEPENDS= libltdl.so:devel/libltdl USES= gmake iconv libtool pkgconfig tar:bzip2 USE_CSTD= gnu89 GNU_CONFIGURE= yes CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ LIBLTDL="-L${LOCALBASE}/lib -lltdl" \ PATH="${PATH:C,${HOME}/bin,,}" \ ac_cv_path_DOT=false \ ac_cv_path_DOXYGEN=false \ udevscriptdir=${WRKDIR} INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.12.0 OPTIONS_DEFINE= DOCS GD JPEG LIBEXIF NLS XML OPTIONS_DEFAULT= GD JPEG LIBEXIF XML OPTIONS_SUB= yes GD_LIB_DEPENDS= libgd.so:graphics/gd GD_CONFIGURE_OFF= --with-gdlib=no JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif LIBEXIF_CONFIGURE_OFF= --with-libexif=no NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls XML_USE= GNOME=libxml2 XML_CONFIGURE_OFF= --with-libxml-2.0=no .include -.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 \ '/FLAGS/s|-g|| ; \ /grep -i linux/s|; fi ; then|; else false; fi ; then| ; \ /pkgconfig/s|$${libdir}|$${prefix}/libdata|' \ ${WRKSRC}/${i} .endfor @${REINPLACE_CMD} -e \ '/^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 .include Index: head/net/usbredir/Makefile =================================================================== --- head/net/usbredir/Makefile (revision 430668) +++ head/net/usbredir/Makefile (revision 430669) @@ -1,21 +1,20 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= usbredir PORTVERSION= 0.7.1 CATEGORIES= net devel MASTER_SITES= http://spice-space.org/download/usbredir/ MAINTAINER= bofh@FreeBSD.org COMMENT= Protocol for redirection of USB traffic LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual USES= gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -CONFIGURE_ENV= LIBUSB_CFLAGS=-DLIBUSB_CALL= LIBUSB_LIBS=-lusb .include Index: head/print/cups/files/patch-configure =================================================================== --- head/print/cups/files/patch-configure (revision 430668) +++ head/print/cups/files/patch-configure (revision 430669) @@ -1,39 +1,25 @@ --- 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 -DBUSDIR="" DBUS_NOTIFIER="" DBUS_NOTIFIERLIBS="" @@ -8684,13 +8690,7 @@ fi PAMLIBS="-lpam" fi - # Find the PAM configuration directory, if any... - for dir in /private/etc/pam.d /etc/pam.d; do - if test -d $dir; then - PAMDIR=$dir - break; - fi - done + PAMDIR=/usr/local/etc/pam.d fi LIBS="$SAVELIBS" Index: head/security/libfprint/Makefile =================================================================== --- head/security/libfprint/Makefile (revision 430668) +++ head/security/libfprint/Makefile (revision 430669) @@ -1,27 +1,26 @@ # Created by: barner # $FreeBSD$ PORTNAME= libfprint PORTVERSION= 0.6.0 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://people.freedesktop.org/~hadess/ MAINTAINER= lichray@gmail.com COMMENT= Library for fingerprint reader devices LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick \ libnss3.so:security/nss GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes USE_OPENSSL= yes USE_GNOME= glib20 INSTALL_TARGET= install-strip -CONFIGURE_ENV= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" CPPFLAGS+= -DHAVE_MEMMEM MAKE_JOBS_UNSAFE=yes .include Index: head/security/openct/Makefile =================================================================== --- head/security/openct/Makefile (revision 430668) +++ head/security/openct/Makefile (revision 430669) @@ -1,60 +1,59 @@ # Created by: Janos Mohacsi # $FreeBSD$ PORTNAME= openct PORTVERSION= 0.6.20 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/opensc/${PORTNAME} MAINTAINER= ale@FreeBSD.org COMMENT= Middleware framework for smart card terminals LICENSE= LGPL21 LIB_DEPENDS= libltdl.so:devel/libltdl OPTIONS_DEFINE= PCSC DOCS PCSC_DESC= Enable PC/SC support GNU_CONFIGURE= yes USES= gmake libtool pkgconfig USE_LDCONFIG= yes 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 PORTDOCS= * PORTEXAMPLES= * .include .if ${PORT_OPTIONS:MPCSC} LIB_DEPENDS+= libpcsclite.so:devel/pcsc-lite CONFIGURE_ARGS+=--enable-pcsc PLIST_SUB+= PCSC="" .else PLIST_SUB+= PCSC="@comment " .endif .if ${PORT_OPTIONS:MDOCS} 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 post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/etoken.conf ${STAGEDIR}${EXAMPLESDIR} .include Index: head/sysutils/lcdproc/Makefile =================================================================== --- head/sysutils/lcdproc/Makefile (revision 430668) +++ head/sysutils/lcdproc/Makefile (revision 430669) @@ -1,132 +1,132 @@ # Created by: pat # $FreeBSD$ PORTNAME= lcdproc PORTVERSION= 0.5.7 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= bsdfan@nurfuerspam.de COMMENT= Client/server suite for LCD devices LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= i386 amd64 GNU_CONFIGURE= yes USE_RC_SUBR= LCDd lcdproc lcdexec USES= autoreconf pkgconfig CONFIGURE_ARGS= --enable-drivers="${LCDPROC_DRIVERS}" \ --disable-dependency-tracking \ --disable-libusb-1-0 \ --disable-doxygen SUB_FILES= pkg-message # Options OPTIONS_DEFINE= USB FTDI HID FREETYPE PNG SERDISP X11 USB_DESC= USB support FTDI_DESC= Build drivers using libftdi (requires USB) HID_DESC= Build drivers using libhid (requires USB) SERDISP_DESC= Build drivers using serdisplib OPTIONS_DEFAULT=USB FREETYPE NO_OPTIONS_SORT=yes FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_ENABLE= libpng SERDISP_LIB_DEPENDS= libserdisp.so:devel/serdisplib SERDISP_CFLAGS= -I${LOCALBASE}/include SERDISP_LDFLAGS= -L${LOCALBASE}/lib SERDISP_CPPFLAGS= -I${LOCALBASE}/include X11_USE= xorg=x11 X11_CONFIGURE_ENABLE= libX11 # Empty args to aclocal required! ACLOCAL_ARGS= LCDPROC_DRIVERS=bayrad \ CFontz \ CFontzPacket \ CwLnx \ curses \ ea65 \ EyeboxOne \ glcd \ glk \ hd44780 \ icp_a106 \ lb216 \ lcdm001 \ lcterm \ MD8800 \ ms6931 \ mtc_s16209x \ MtxOrb \ NoritakeVFD \ pyramid \ rawserial \ SureElec \ sdeclcd \ sed1330 \ sed1520 \ serialPOS \ serialVFD \ sli \ stv5730 \ t6963 \ text \ tyan \ vlsys_m428 .include .if ${PORT_OPTIONS:MUSB} -CONFIGURE_ARGS+= --with-libusb=/usr +CONFIGURE_ARGS+= --enable-libusb PLIST_SUB+= USB="" LCDPROC_DRIVERS+=IOWarrior \ picolcd \ shuttleVFD . if ${PORT_OPTIONS:MFTDI} LIB_DEPENDS+= libftdi.so:devel/libftdi PLIST_SUB+= FTDI="" LCDPROC_DRIVERS+=i2500vfd \ lis \ ula200 . else CONFIGURE_ARGS+= --disable-libftdi PLIST_SUB+= FTDI="@comment " . endif . if ${PORT_OPTIONS:MHID} LIB_DEPENDS+= libhid.so:devel/libhid PLIST_SUB+= HID="" LCDPROC_DRIVERS+=mdm166a . else CONFIGURE_ARGS+= --disable-libhid 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 post-patch: @${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf post-install: ${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${STAGEDIR}${PREFIX}/etc/LCDd.conf.sample ${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${STAGEDIR}${PREFIX}/etc/lcdproc.conf.sample ${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${STAGEDIR}${PREFIX}/etc/lcdexec.conf.sample .include Index: head/sysutils/lcdproc/files/patch-configure.ac =================================================================== --- head/sysutils/lcdproc/files/patch-configure.ac (revision 430668) +++ head/sysutils/lcdproc/files/patch-configure.ac (revision 430669) @@ -1,89 +1,19 @@ ---- ./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@lists.omnipotent.net]) AC_CONFIG_SRCDIR([clients/lcdproc/batt.c]) AM_INIT_AUTOMAKE +PKG_PROG_PKG_CONFIG() 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_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])]) Index: head/sysutils/usbhid-dump/Makefile =================================================================== --- head/sysutils/usbhid-dump/Makefile (revision 430668) +++ head/sysutils/usbhid-dump/Makefile (revision 430669) @@ -1,27 +1,25 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= usbhid-dump PORTVERSION= 1.4 CATEGORIES= sysutils MAINTAINER= sunpoet@FreeBSD.org 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 GH_ACCOUNT= DIGImend USE_GITHUB= yes post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/uhd/ cd ${WRKSRC}/include/uhd/ && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/uhd/ ${INSTALL_DATA} ${WRKSRC}/lib/.libs/libuhd.a ${STAGEDIR}${PREFIX}/lib/ .include Index: head/sysutils/usbutils/Makefile =================================================================== --- head/sysutils/usbutils/Makefile (revision 430668) +++ head/sysutils/usbutils/Makefile (revision 430669) @@ -1,39 +1,39 @@ # Created by: Henrik Brix Andersen # $FreeBSD$ PORTNAME= usbutils PORTVERSION= 0.86 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF/linux-usb/${PORTNAME} \ http://pkgs.fedoraproject.org/repo/pkgs/usbutils/usbutils-0.86.tar.gz/34979f675d2bcb3e1b45012fa830a53f/ \ http://ftp.be.debian.org/pub/linux/utils/usb/usbutils/ MAINTAINER= ports@FreeBSD.org COMMENT= Utility for listing USB devices LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake pathfix pkgconfig 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 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR} .include