Attachment 148128 Details for Bug 194261 – comms/owfs patch to upgrade to 2.9p7

[patch] comms/owfs patch to upgrade to 2.9p7

owfs-2.9p7.patch (text/plain), 5.47 KB, created by Johan Ström on 2014-10-09 07:02:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Ström

Created: 2014-10-09 07:02:40 UTC

Size: 5.47 KB

patch

obsolete

>diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
>index 383b1f6..792247c 100644
>--- a/comms/owfs/Makefile
>+++ b/comms/owfs/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/comms/owfs/Makefile 368126 2014-09-13 18:25:04Z tijl $
> 
> PORTNAME=	owfs
>-PORTVERSION=	2.9p5
>+PORTVERSION=	2.9p7
> CATEGORIES=	comms
> MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
> 
>@@ -18,6 +18,7 @@ USE_AUTOTOOLS=	libtoolize aclocal autoheader autoconf automake
> AUTOMAKE_ARGS=	--add-missing
> GNU_CONFIGURE=	On
> INSTALL_TARGET=	install-strip
>+USE_LDCONFIG=	yes
> 
> .include "Makefile.options"
> 
>@@ -30,6 +31,7 @@ CONFIGURE_ARGS+=	--disable-w1
> CONFIGURE_ARGS+=	--disable-parport
> 
> OWDEBUG_CONFIGURE_ENABLE=	debug
>+OWMUTEXDEBUG_CONFIGURE_ENABLE=	mutexdebug
> OWSHELL_CONFIGURE_ENABLE=	owshell
> OWNET_CONFIGURE_ENABLE=		ownet
> 
>@@ -39,13 +41,13 @@ OWFTPD_CONFIGURE_ENABLE=	owftpd
> OWSERVER_CONFIGURE_ENABLE=	owserver
> 
> OWTAP_CONFIGURE_ENABLE=		owtap
>-OWTAP_USE=			tk=yes tk_wrapper=yes
>+OWTAP_USES=			tk:wrapper
> 
> OWMALLOC_CONFIGURE_ENABLE=	owmalloc
> OWTRAFFIC_CONFIGURE_ENABLE=	owtraffic
> 
> OWMON_CONFIGURE_ENABLE=		owmon
>-OWMON_USE=			tk=yes tk_wrapper=yes
>+OWMON_USES=			tk:wrapper
> 
> OWCAPI_CONFIGURE_ENABLE=	owcapi
> 
>@@ -111,17 +113,6 @@ CONFIGURE_ARGS+=		--disable-swig
> CONFIGURE_ARGS+=		--enable-owtcl --with-tcl=${TCL_LIBDIR}
> .endif
> 
>-# These __version__ fixes should be unnecessary on next release
>-post-patch:
>-	@${REINPLACE_CMD} \
>-		-e "s/^$__version__ = '[[:digit:]]\.[[:digit:]]$.*/\1'/" \
>-		${WRKSRC}/module/swig/python/unittest/*.py \
>-		${WRKSRC}/module/ownet/python/ownet/__init__.py
>-	@${REINPLACE_CMD} -e "s/$__version__ =$.*/\1 '1.9'/" \
>-		${WRKSRC}/module/ownet/python/ownet/connection.py
>-	@${REINPLACE_CMD} -e "s/$__version__ = .*$ [+].*/\1/" \
>-		${WRKSRC}/module/swig/python/ow/__init__.py
>-
> # This takes a few seconds so give the user some notice
> pre-configure:
> 	${MKDIR} ${WRKSRC}/m4
>diff --git a/comms/owfs/Makefile.options b/comms/owfs/Makefile.options
>index d7681dd..480ae29 100644
>--- a/comms/owfs/Makefile.options
>+++ b/comms/owfs/Makefile.options
>@@ -1,6 +1,8 @@
> # $FreeBSD: head/comms/owfs/Makefile.options 365069 2014-08-16 09:15:17Z marino $
> 
>-OPTIONS_DEFINE = OWDEBUG \
>+OPTIONS_DEFINE = \
>+	OWDEBUG \
>+	OWMUTEXDEBUG \
> 	OWSHELL \
> 	OWNET \
> 	I2C \
>@@ -27,6 +29,7 @@ OPTIONS_DEFINE = OWDEBUG \
> 
> 
> 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)
>diff --git a/comms/owfs/distinfo b/comms/owfs/distinfo
>index 9e560fc..fd09966 100644
>--- a/comms/owfs/distinfo
>+++ b/comms/owfs/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (owfs-2.9p5.tar.gz) = f7e11bae6cd29d58726e6d29b297834e5656d6069a407d798067ae25cb0812ea
>-SIZE (owfs-2.9p5.tar.gz) = 1444365
>+SHA256 (owfs-2.9p7.tar.gz) = 8f74d24e9a98958d4fc7e505bc110c94d35f5aae70e260e99d94fc632dfe1f85
>+SIZE (owfs-2.9p7.tar.gz) = 1454288
>diff --git a/comms/owfs/pkg-plist b/comms/owfs/pkg-plist
>index ee49983..a33cee9 100644
>--- a/comms/owfs/pkg-plist
>+++ b/comms/owfs/pkg-plist
>@@ -1,14 +1,14 @@
> %%OWCAPI%%include/owcapi.h
>-%%OWCAPI%%lib/libowcapi-2.9.so.5
>-%%OWCAPI%%lib/libowcapi-2.9.so.5.0.0
>+%%OWCAPI%%lib/libowcapi-2.9.so.7
>+%%OWCAPI%%lib/libowcapi-2.9.so.7.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.5
>-%%OWNETLIB%%lib/libownet-2.9.so.5.0.0
>+%%OWNETLIB%%lib/libownet-2.9.so.7
>+%%OWNETLIB%%lib/libownet-2.9.so.7.0.0
> %%OWNETLIB%%lib/libownet.so
> %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
> %%OWNETPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet/.packlist
>@@ -24,7 +24,7 @@
> %%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
> %%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
> %%OWPERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OW
>-%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p5-py2.7.egg-info
>+%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p7-py2.7.egg-info
> %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
> %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
> %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
>@@ -44,9 +44,16 @@
> %%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
> bin/owexternal
> include/owfs_config.h
>-lib/libow-2.9.so.5
>-lib/libow-2.9.so.5.0.0
>+lib/libow-2.9.so.7
>+lib/libow-2.9.so.7.0.0
> lib/libow.so
>+man/man1/cmdline_mini.1so.gz
>+man/man1/configuration.1so.gz
>+man/man1/description.1so.gz
>+man/man1/device.1so.gz
>+man/man1/format.1so.gz
>+man/man1/help.1so.gz
>+man/man1/job_control.1so.gz
> man/man1/libowcapi.1.gz
> man/man1/libownet.1.gz
> man/man1/owcapi.1.gz
>@@ -65,6 +72,11 @@ man/man1/owserver.1.gz
> man/man1/owshell.1.gz
> man/man1/owtap.1.gz
> man/man1/owwrite.1.gz
>+man/man1/persistent_thresholds.1so.gz
>+man/man1/pressure.1so.gz
>+man/man1/seealso.1so.gz
>+man/man1/temperature.1so.gz
>+man/man1/timeout.1so.gz
> man/man3/DS1427.3.gz
> man/man3/DS1821.3.gz
> man/man3/DS1822.3.gz
>@@ -158,12 +170,25 @@ man/man3/MAX31851.3.gz
> man/man3/OWNet.3.gz
> man/man3/Thermachron.3.gz
> man/man3/UVI.3.gz
>+man/man3/addressing.3so.gz
>+man/man3/description.3so.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/man3/seealso.3so.gz
>+man/man3/standard.3so.gz
>+man/man3/standard_mini.3so.gz
>+man/man3/temperature_errata.3so.gz
>+man/man3/temperature_threshold.3so.gz
>+man/man3/temperatures_mini.3so.gz
>+man/man5/description.5so.gz
>+man/man5/format.5so.gz
> man/man5/owfs.5.gz
> man/man5/owfs.conf.5.gz
>+man/man5/seealso.5so.gz
>+man/mann/description.nso.gz
> man/mann/ow.n.gz
> man/mann/owtcl.n.gz
>+man/mann/seealso.nso.gz

Actions: View | Diff

Attachments on bug 194261: 148128 | 148518 | 148519