Update to 3.1p1.

PR:		206959
Submitted by:	osidorkin@gmail.com
Approved by:	johan@stromnet.se (maintainer)

5 files changed, 10 insertions, 31 deletions

diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
index 6bf6f4a4c745..ef0dc2988bd2 100644
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	owfs
-PORTVERSION=	3.1p0
+PORTVERSION=	3.1p1
 CATEGORIES=	comms
 MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
 
diff --git a/comms/owfs/distinfo b/comms/owfs/distinfo
index 246492d81e03..3614271da4a4 100644
--- a/comms/owfs/distinfo
+++ b/comms/owfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (owfs-3.1p0.tar.gz) = 62fca1b3e908cd4515c9eb499bf2b05020bbbea4a5b73611ddc6f205adec7a54
-SIZE (owfs-3.1p0.tar.gz) = 1523086
+SHA256 (owfs-3.1p1.tar.gz) = e69421ae534565c1f8530a2447f583401f4d0d4b1cf3cb8cf399a57133ed7f81
+SIZE (owfs-3.1p1.tar.gz) = 1400962
diff --git a/comms/owfs/files/patch-module_owfs_src_c_owfs.c b/comms/owfs/files/patch-module_owfs_src_c_owfs.c
deleted file mode 100644
index 464fa25cb73c..000000000000
--- a/comms/owfs/files/patch-module_owfs_src_c_owfs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
diff --git a/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c b/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c
deleted file mode 100644
index b88b82a6010b..000000000000
--- a/comms/owfs/files/patch-module_owlib_src_c_ow__rwlock.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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();
- 	}
diff --git a/comms/owfs/pkg-plist b/comms/owfs/pkg-plist
index dccb1ed5cb28..e1807a691011 100644
--- a/comms/owfs/pkg-plist
+++ b/comms/owfs/pkg-plist
@@ -1,14 +1,14 @@
 %%OWCAPI%%include/owcapi.h
-%%OWCAPI%%lib/libowcapi-3.1.so.0
-%%OWCAPI%%lib/libowcapi-3.1.so.0.0.0
+%%OWCAPI%%lib/libowcapi-3.1.so.1
+%%OWCAPI%%lib/libowcapi-3.1.so.1.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-3.1.so.0
-%%OWNETLIB%%lib/libownet-3.1.so.0.0.0
+%%OWNETLIB%%lib/libownet-3.1.so.1
+%%OWNETLIB%%lib/libownet-3.1.so.1.0.0
 %%OWNETLIB%%lib/libownet.so
 %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
 %%OWNETPERL%%%%SITE_PERL%%/OWNet.pm
@@ -21,7 +21,7 @@
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyo
 %%OWPERL%%%%SITE_ARCH%%/OW.pm
 %%OWPERL%%%%SITE_ARCH%%/auto/OW/OW.so
-%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-3.1p0-py2.7.egg-info
+%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-3.1p1-py2.7.egg-info
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
@@ -40,8 +40,8 @@
 %%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
 bin/owexternal
 include/owfs_config.h
-lib/libow-3.1.so.0
-lib/libow-3.1.so.0.0.0
+lib/libow-3.1.so.1
+lib/libow-3.1.so.1.0.0
 lib/libow.so
 man/man1/libowcapi.1.gz
 man/man1/libownet.1.gz