Date: Wed, 26 Aug 2015 16:29:55 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395372 - in head/comms/owfs: . files Message-ID: <201508261629.t7QGTtx8037372@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Aug 26 16:29:55 2015 New Revision: 395372 URL: https://svnweb.freebsd.org/changeset/ports/395372 Log: - Update to 3.1p0 PR: 200245 Submitted by: johan@stromnet.se (maintainer) Reported by: admin@lissyara.su Added: head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c (contents, props changed) Modified: head/comms/owfs/Makefile head/comms/owfs/Makefile.options head/comms/owfs/distinfo head/comms/owfs/files/patch-module_owfs_src_c_owfs.c head/comms/owfs/pkg-plist Modified: head/comms/owfs/Makefile ============================================================================== --- head/comms/owfs/Makefile Wed Aug 26 16:19:19 2015 (r395371) +++ head/comms/owfs/Makefile Wed Aug 26 16:29:55 2015 (r395372) @@ -1,9 +1,8 @@ -# Created by: Johan Strom <johna@stromnet.se> +# Created by: Johan Strom <johan@stromnet.se> # $FreeBSD$ PORTNAME= owfs -PORTVERSION= 2.9p8 -PORTREVISION= 2 +PORTVERSION= 3.1p0 CATEGORIES= comms MASTER_SITES= SF/owfs/owfs/${PORTVERSION} @@ -12,7 +11,7 @@ COMMENT= OWFS -- 1-Wire file system LICENSE= GPLv2 -USES= autoreconf libtool gmake +USES= autoreconf gmake libtool pkgconfig GNU_CONFIGURE= yes INSTALL_TARGET= install-strip @@ -66,7 +65,7 @@ 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 @@ -113,16 +112,21 @@ CONFIGURE_ARGS+= --enable-owtcl --with- # 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 <bsd.port.mk> Modified: head/comms/owfs/Makefile.options ============================================================================== --- head/comms/owfs/Makefile.options Wed Aug 26 16:19:19 2015 (r395371) +++ head/comms/owfs/Makefile.options Wed Aug 26 16:29:55 2015 (r395372) @@ -46,7 +46,7 @@ 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 @@ -57,9 +57,11 @@ USB_DESC= Enable 1-Wire usb DS2490 supp OPTIONS_DEFAULT=OWDEBUG\ OWSHELL\ OWNET\ + I2C\ OWHTTPD\ OWFTPD\ OWSERVER\ OWCAPI\ + OWFS\ USB Modified: head/comms/owfs/distinfo ============================================================================== --- head/comms/owfs/distinfo Wed Aug 26 16:19:19 2015 (r395371) +++ head/comms/owfs/distinfo Wed Aug 26 16:29:55 2015 (r395372) @@ -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 Modified: head/comms/owfs/files/patch-module_owfs_src_c_owfs.c ============================================================================== --- head/comms/owfs/files/patch-module_owfs_src_c_owfs.c Wed Aug 26 16:19:19 2015 (r395371) +++ head/comms/owfs/files/patch-module_owfs_src_c_owfs.c Wed Aug 26 16:29:55 2015 (r395372) @@ -1,6 +1,6 @@ ---- 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 Added: head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c Wed Aug 26 16:29:55 2015 (r395372) @@ -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(); + } Modified: head/comms/owfs/pkg-plist ============================================================================== --- head/comms/owfs/pkg-plist Wed Aug 26 16:19:19 2015 (r395371) +++ head/comms/owfs/pkg-plist Wed Aug 26 16:29:55 2015 (r395372) @@ -1,28 +1,31 @@ %%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 @@ -37,8 +40,8 @@ %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508261629.t7QGTtx8037372>