Attachment 148518 Details for Bug 194261 – comms/owfs patch to upgrade to 2.9p8

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

owfs-2.9p8.patch (text/plain), 6.35 KB, created by Johan Ström on 2014-10-20 19:12:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Ström

Created: 2014-10-20 19:12:01 UTC

Size: 6.35 KB

patch

obsolete

>diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
>index 383b1f6..8da675b 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.9p8
> 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..ae5df67 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.9p8.tar.gz) = 8af8785599d39f22fa060d7a04e3c0052cb5be6be1ab461136dbdab87aef2ef2
>+SIZE (owfs-2.9p8.tar.gz) = 1471486
>diff --git a/comms/owfs/pkg-plist b/comms/owfs/pkg-plist
>index 8c53ac2..0cdc345 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.8
>+%%OWCAPI%%lib/libowcapi-2.9.so.8.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.8
>+%%OWNETLIB%%lib/libownet-2.9.so.8.0.0
> %%OWNETLIB%%lib/libownet.so
> %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
> %%OWNETPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet/.packlist
>@@ -39,40 +39,22 @@
> %%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.8
>+lib/libow-2.9.so.8.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
>@@ -80,57 +62,20 @@ 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
>@@ -144,8 +89,6 @@ 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
>@@ -153,12 +96,5 @@ 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

Actions: View | Diff

Attachments on bug 194261: 148128 | 148518 | 148519