Index: branches/2020Q4/comms/owfs/Makefile =================================================================== --- branches/2020Q4/comms/owfs/Makefile (revision 556984) +++ branches/2020Q4/comms/owfs/Makefile (revision 556985) @@ -1,148 +1,128 @@ # Created by: Johan Strom # $FreeBSD$ PORTNAME= owfs -PORTVERSION= 3.2p3 -DISTVERSIONPREFIX= v +PORTVERSION= 3.2p4 PORTREVISION= 1 CATEGORIES= comms +MASTER_SITES= https://github.com/owfs/owfs/releases/download/v${PORTVERSION}/ MAINTAINER= johan@stromnet.se COMMENT= 1-wire file system implementation LICENSE= GPLv2 -USES= autoreconf gmake libtool pkgconfig +BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash +USES= gmake libtool pkgconfig + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes -USE_GITHUB= yes - .include "Makefile.options" OPTIONS_SUB=yes CONFIGURE_ARGS= --enable-owlib # Linux specific kernel driver CONFIGURE_ARGS+= --disable-w1 CONFIGURE_ARGS+= --disable-parport AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app FTDI_CONFIGURE_ENABLE= ftdi FTDI_LIB_DEPENDS= libftdi.so:devel/libftdi 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 OWEXTERNAL_CONFIGURE_ENABLE= owexternal 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:2.7 - # 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 .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} +# If Perl or PHP is requested, enable SWIG +.if ${PORT_OPTIONS:MOWPERL} || ${PORT_OPTIONS:MOWPHP} BUILD_DEPENDS+= swig:devel/swig CONFIGURE_ARGS+= --enable-swig SWIG=${LOCALBASE}/bin/swig .else CONFIGURE_ARGS+= --disable-swig .endif .if ${PORT_OPTIONS:MOWTCL} CONFIGURE_ARGS+= --enable-owtcl --with-tcl=${TCL_LIBDIR} .endif .if ${PORT_OPTIONS:MOWEXTERNAL} PLIST_SUB+= OWEXTERNAL="" .else PLIST_SUB+= OWEXTERNAL="@comment " CONFIGURE_ARGS+= --disable-owexternal .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: branches/2020Q4/comms/owfs/Makefile.options =================================================================== --- branches/2020Q4/comms/owfs/Makefile.options (revision 556984) +++ branches/2020Q4/comms/owfs/Makefile.options (revision 556985) @@ -1,73 +1,69 @@ # $FreeBSD$ OPTIONS_DEFINE = \ AVAHI \ FTDI \ OWDEBUG \ OWMUTEXDEBUG \ OWSHELL \ OWNET \ I2C \ OWHTTPD \ OWFTPD \ OWSERVER \ OWTAP \ OWMALLOC \ - OWTRAFFIC \ OWMON \ OWCAPI \ OWEXTERNAL \ OWPERL \ OWPHP \ - OWPYTHON \ OWTCL \ PROFILING \ OWFS \ ZERO \ USB # Options disabled # PARPORT - linux/parport.h not available # W1 - no support on FreeBSD AVAHI_DESC= Enable zero-config autodiscovery FTDI_DESC= Enable LinkUSB support via libftdi OWDEBUG_DESC= Enable debug output OWMUTEXDEBUG_DESC= Enable mutex debug OWSHELL_DESC= Enable CLI utils OWNET_DESC= Enable network communication I2C_DESC= Enable i2c (DS2482-x00) support (UNTESTED) OWHTTPD_DESC= Enable owhttpd HTTP server OWFTPD_DESC= Enable owftpd FTP server OWSERVER_DESC= Enable owserver OWMALLOC_DESC= Enable malloc checking -OWTRAFFIC_DESC= Enable debug bus traffic reports OWTAP_DESC= Enable owtap module (X11) OWMON_DESC= Enable owmon module (X11) OWCAPI_DESC= Enable C API OWEXTERNAL_DESC= Enable owexternal OWPERL_DESC= Enable Perl binding (BROKEN) OWPHP_DESC= Enable PHP binding (BROKEN) -OWPYTHON_DESC= Enable Python binding OWTCL_DESC= Enable TCL binding PROFILING_DESC= Enable profiling (BROKEN) OWFS_DESC= Enable FUSE support ZERO_DESC= Enable Zeroconf/bonjour (UNTESTED) USB_DESC= Enable 1-Wire usb DS2490 support # Options disabled #PARPORT_DESC= Enable 1-Wire parallel port DS1410E support #W1_DESC=Enable w1 support OPTIONS_DEFAULT=OWDEBUG\ OWSHELL\ OWNET\ I2C\ OWHTTPD\ OWFTPD\ OWSERVER\ OWCAPI\ OWEXTERNAL \ OWFS\ USB Index: branches/2020Q4/comms/owfs/distinfo =================================================================== --- branches/2020Q4/comms/owfs/distinfo (revision 556984) +++ branches/2020Q4/comms/owfs/distinfo (revision 556985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540998714 -SHA256 (owfs-owfs-v3.2p3_GH0.tar.gz) = 680385e4db007a951e9678a48989dca7d43868b754299c8368010c80d0c2de4a -SIZE (owfs-owfs-v3.2p3_GH0.tar.gz) = 1322466 +TIMESTAMP = 1599553594 +SHA256 (owfs-3.2p4.tar.gz) = af0a5035f3f3df876ca15aea13486bfed6b3ef5409dee016db0be67755c35fcc +SIZE (owfs-3.2p4.tar.gz) = 1614528 Index: branches/2020Q4/comms/owfs/pkg-plist =================================================================== --- branches/2020Q4/comms/owfs/pkg-plist (revision 556984) +++ branches/2020Q4/comms/owfs/pkg-plist (revision 556985) @@ -1,169 +1,158 @@ %%OWCAPI%%include/owcapi.h -%%OWCAPI%%lib/libowcapi-3.2.so.3 -%%OWCAPI%%lib/libowcapi-3.2.so.3.0.0 +%%OWCAPI%%lib/libowcapi-3.2.so.4 +%%OWCAPI%%lib/libowcapi-3.2.so.4.0.0 %%OWCAPI%%lib/libowcapi.so %%OWCAPI%%libdata/pkgconfig/owcapi.pc %%OWEXTERNAL%%bin/owexternal %%OWFS%%bin/owfs %%OWFTPD%%bin/owftpd %%OWHTTPD%%bin/owhttpd %%OWMON%%bin/owmon %%OWNETLIB%%include/ownetapi.h -%%OWNETLIB%%lib/libownet-3.2.so.3 -%%OWNETLIB%%lib/libownet-3.2.so.3.0.0 +%%OWNETLIB%%lib/libownet-3.2.so.4 +%%OWNETLIB%%lib/libownet-3.2.so.4.0.0 %%OWNETLIB%%lib/libownet.so %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz %%OWNETPERL%%%%SITE_PERL%%/OWNet.pm -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet-0.3-py2.7.egg-info -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.py -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyc -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyo -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.py -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyc -%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyo %%OWPERL%%%%SITE_ARCH%%/OW.pm %%OWPERL%%%%SITE_ARCH%%/auto/OW/OW.so -%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-3.2p3-py%%PYTHON_VER%%.egg-info -%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so -%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py -%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc -%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyo %%OWSERVER%%bin/owserver %%OWSHELL%%bin/owdir %%OWSHELL%%bin/owexist %%OWSHELL%%bin/owget %%OWSHELL%%bin/owpresent %%OWSHELL%%bin/owread %%OWSHELL%%bin/owusbprobe %%OWSHELL%%bin/owwrite %%OWTAP%%bin/owtap %%OWTCL%%lib/owtcl-1.0/ow-1.0.so %%OWTCL%%lib/owtcl-1.0/ow.so %%OWTCL%%lib/owtcl-1.0/ow.tcl %%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl include/owfs_config.h -lib/libow-3.2.so.3 -lib/libow-3.2.so.3.0.0 +lib/libow-3.2.so.4 +lib/libow-3.2.so.4.0.0 lib/libow.so man/man1/libowcapi.1.gz man/man1/libownet.1.gz man/man1/owcapi.1.gz man/man1/owdir.1.gz man/man1/owexist.1.gz man/man1/owfs.1.gz man/man1/owftpd.1.gz man/man1/owget.1.gz man/man1/owhttpd.1.gz man/man1/owmon.1.gz man/man1/ownet.1.gz man/man1/ownetapi.1.gz man/man1/ownetlib.1.gz man/man1/owpresent.1.gz man/man1/owread.1.gz man/man1/owserver.1.gz man/man1/owshell.1.gz man/man1/owtap.1.gz man/man1/owwrite.1.gz man/man3/DS1427.3.gz man/man3/DS1821.3.gz man/man3/DS1822.3.gz man/man3/DS1825.3.gz man/man3/DS18B20.3.gz man/man3/DS18S20.3.gz man/man3/DS1904.3.gz man/man3/DS1920.3.gz man/man3/DS1921.3.gz man/man3/DS1963L.3.gz man/man3/DS1963S.3.gz man/man3/DS1971.3.gz man/man3/DS1977.3.gz man/man3/DS1982.3.gz man/man3/DS1982U.3.gz man/man3/DS1985.3.gz man/man3/DS1985U.3.gz man/man3/DS1986.3.gz man/man3/DS1986U.3.gz man/man3/DS1990A.3.gz man/man3/DS1991.3.gz man/man3/DS1992.3.gz man/man3/DS1993.3.gz man/man3/DS1994.3.gz man/man3/DS1995.3.gz man/man3/DS1996.3.gz man/man3/DS2401.3.gz man/man3/DS2404.3.gz man/man3/DS2404S.3.gz man/man3/DS2405.3.gz man/man3/DS2406.3.gz man/man3/DS2407.3.gz man/man3/DS2408.3.gz man/man3/DS2409.3.gz man/man3/DS2411.3.gz man/man3/DS2413.3.gz man/man3/DS2415.3.gz man/man3/DS2417.3.gz man/man3/DS2423.3.gz man/man3/DS2430A.3.gz man/man3/DS2431.3.gz man/man3/DS2433.3.gz man/man3/DS2436.3.gz man/man3/DS2437.3.gz man/man3/DS2438.3.gz man/man3/DS2450.3.gz man/man3/DS2502-E48.3.gz man/man3/DS2502-UNW.3.gz man/man3/DS2502.3.gz man/man3/DS2505-UNW.3.gz man/man3/DS2505.3.gz man/man3/DS2506-UNW.3.gz man/man3/DS2506.3.gz man/man3/DS2720.3.gz man/man3/DS2740.3.gz man/man3/DS2751.3.gz man/man3/DS2755.3.gz man/man3/DS2756.3.gz man/man3/DS2760.3.gz man/man3/DS2761.3.gz man/man3/DS2762.3.gz man/man3/DS2770.3.gz man/man3/DS2780.3.gz man/man3/DS2781.3.gz man/man3/DS2788.3.gz man/man3/DS2804.3.gz man/man3/DS2890.3.gz man/man3/DS28E04.3.gz man/man3/DS28EA00.3.gz man/man3/DS28EC20.3.gz man/man3/EDS.3.gz man/man3/EDS0064.3.gz man/man3/EDS0065.3.gz man/man3/EDS0066.3.gz man/man3/EDS0067.3.gz man/man3/EDS0068.3.gz man/man3/EDS0070.3.gz man/man3/EDS0071.3.gz man/man3/EDS0072.3.gz man/man3/EDS0080.3.gz man/man3/EDS0082.3.gz man/man3/EDS0083.3.gz man/man3/EDS0085.3.gz man/man3/EDS0090.3.gz man/man3/EEEF.3.gz man/man3/IBLSS.3.gz man/man3/LCD.3.gz man/man3/MAX31820.3.gz man/man3/MAX31826.3.gz man/man3/MAX31850.3.gz man/man3/MAX31851.3.gz man/man3/OWNet.3.gz man/man3/Thermachron.3.gz man/man3/UVI.3.gz man/man3/mAM001.3.gz man/man3/mCM001.3.gz man/man3/mDI001.3.gz man/man3/mRS001.3.gz man/man3/owperl.3.gz man/man5/owfs.5.gz man/man5/owfs.conf.5.gz man/mann/ow.n.gz man/mann/owtcl.n.gz +man/man3/InfernoEmbedded.3.gz Index: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 556984) +++ branches/2020Q4 (revision 556985) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r556984