Index: head/comms/owfs/Makefile =================================================================== --- head/comms/owfs/Makefile (revision 395371) +++ head/comms/owfs/Makefile (revision 395372) @@ -1,128 +1,132 @@ -# Created by: Johan Strom +# Created by: Johan Strom # $FreeBSD$ PORTNAME= owfs -PORTVERSION= 2.9p8 -PORTREVISION= 2 +PORTVERSION= 3.1p0 CATEGORIES= comms MASTER_SITES= SF/owfs/owfs/${PORTVERSION} MAINTAINER= johan@stromnet.se COMMENT= OWFS -- 1-Wire file system LICENSE= GPLv2 -USES= autoreconf libtool gmake +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 -# XXX: Not tested, it compiles, but not sure if fusefs actually works +# 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:${PORTSDIR}/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 + @${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}/;;}) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so + && ${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 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so .include Index: head/comms/owfs/Makefile.options =================================================================== --- head/comms/owfs/Makefile.options (revision 395371) +++ head/comms/owfs/Makefile.options (revision 395372) @@ -1,65 +1,67 @@ # $FreeBSD$ OPTIONS_DEFINE = \ OWDEBUG \ OWMUTEXDEBUG \ OWSHELL \ OWNET \ I2C \ OWHTTPD \ OWFTPD \ OWSERVER \ OWTAP \ OWMALLOC \ OWTRAFFIC \ OWMON \ OWCAPI \ OWPERL \ OWPHP \ OWPYTHON \ OWTCL \ PROFILING \ OWFS \ ZERO \ USB # Options disabled # PARPORT - linux/parport.h not available # W1 - no support on FreeBSD 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 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 (UNTESTED) +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\ + OWFS\ USB Index: head/comms/owfs/distinfo =================================================================== --- head/comms/owfs/distinfo (revision 395371) +++ head/comms/owfs/distinfo (revision 395372) @@ -1,2 +1,2 @@ -SHA256 (owfs-2.9p8.tar.gz) = 8af8785599d39f22fa060d7a04e3c0052cb5be6be1ab461136dbdab87aef2ef2 -SIZE (owfs-2.9p8.tar.gz) = 1471486 +SHA256 (owfs-3.1p0.tar.gz) = 62fca1b3e908cd4515c9eb499bf2b05020bbbea4a5b73611ddc6f205adec7a54 +SIZE (owfs-3.1p0.tar.gz) = 1523086 Index: head/comms/owfs/files/patch-module_owfs_src_c_owfs.c =================================================================== --- head/comms/owfs/files/patch-module_owfs_src_c_owfs.c (revision 395371) +++ head/comms/owfs/files/patch-module_owfs_src_c_owfs.c (revision 395372) @@ -1,11 +1,11 @@ ---- module/owfs/src/c/owfs.c.orig 2014-10-11 03:23:18.000000000 +0400 -+++ module/owfs/src/c/owfs.c 2014-12-30 19:53:53.000000000 +0300 -@@ -129,7 +129,7 @@ +--- module/owfs/src/c/owfs.c.orig 2015-02-23 03:46:11 UTC ++++ module/owfs/src/c/owfs.c +@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) // Unmount just in case // No checks -- can fail without consequences - umount( Outbound_Control.head->name ) ; + unmount( Outbound_Control.head->name, 0) ; Fuse_parse(fuse_mnt_opt, &fuse_options); LEVEL_DEBUG("fuse_mnt_opt=[%s]", fuse_mnt_opt); Index: head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c =================================================================== --- head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c (nonexistent) +++ head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c (revision 395372) @@ -0,0 +1,10 @@ +--- module/owlib/src/c/ow_rwlock.c.orig 2015-01-11 01:31:32 UTC ++++ module/owlib/src/c/ow_rwlock.c +@@ -25,7 +25,6 @@ void my_rwlock_init(my_rwlock_t * rwlock + int semrc; + semrc = pthread_rwlock_init(rwlock, NULL); + if(semrc != 0) { +- if ( + LOCK_DEBUG("semrc=%d [%s] RWLOCK INIT", semrc, strerror(errno)); + debug_crash(); + } Property changes on: head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/owfs/pkg-plist =================================================================== --- head/comms/owfs/pkg-plist (revision 395371) +++ head/comms/owfs/pkg-plist (revision 395372) @@ -1,162 +1,165 @@ %%OWCAPI%%include/owcapi.h -%%OWCAPI%%lib/libowcapi-2.9.so.8 -%%OWCAPI%%lib/libowcapi-2.9.so.8.0.0 +%%OWCAPI%%lib/libowcapi-3.1.so.0 +%%OWCAPI%%lib/libowcapi-3.1.so.0.0.0 %%OWCAPI%%lib/libowcapi.so %%OWFS%%bin/owfs %%OWFTPD%%bin/owftpd %%OWHTTPD%%bin/owhttpd %%OWMON%%bin/owmon %%OWNETLIB%%include/ownetapi.h -%%OWNETLIB%%lib/libownet-2.9.so.8 -%%OWNETLIB%%lib/libownet-2.9.so.8.0.0 +%%OWNETLIB%%lib/libownet-3.1.so.0 +%%OWNETLIB%%lib/libownet-3.1.so.0.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-2.9p8-py2.7.egg-info +%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-3.1p0-py2.7.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/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 bin/owexternal include/owfs_config.h -lib/libow-2.9.so.8 -lib/libow-2.9.so.8.0.0 +lib/libow-3.1.so.0 +lib/libow-3.1.so.0.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/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/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