View | Details | Raw Unified | Return to bug 194261 | Differences between
and this patch

Collapse All | Expand All

(-)b/comms/owfs/Makefile (-14 / +5 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/comms/owfs/Makefile 368126 2014-09-13 18:25:04Z tijl $
2
# $FreeBSD: head/comms/owfs/Makefile 368126 2014-09-13 18:25:04Z tijl $
3
3
4
PORTNAME=	owfs
4
PORTNAME=	owfs
5
PORTVERSION=	2.9p5
5
PORTVERSION=	2.9p7
6
CATEGORIES=	comms
6
CATEGORIES=	comms
7
MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
7
MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
8
8
Lines 18-23 USE_AUTOTOOLS= libtoolize aclocal autoheader autoconf automake Link Here
18
AUTOMAKE_ARGS=	--add-missing
18
AUTOMAKE_ARGS=	--add-missing
19
GNU_CONFIGURE=	On
19
GNU_CONFIGURE=	On
20
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
21
USE_LDCONFIG=	yes
21
22
22
.include "Makefile.options"
23
.include "Makefile.options"
23
24
Lines 30-35 CONFIGURE_ARGS+= --disable-w1 Link Here
30
CONFIGURE_ARGS+=	--disable-parport
31
CONFIGURE_ARGS+=	--disable-parport
31
32
32
OWDEBUG_CONFIGURE_ENABLE=	debug
33
OWDEBUG_CONFIGURE_ENABLE=	debug
34
OWMUTEXDEBUG_CONFIGURE_ENABLE=	mutexdebug
33
OWSHELL_CONFIGURE_ENABLE=	owshell
35
OWSHELL_CONFIGURE_ENABLE=	owshell
34
OWNET_CONFIGURE_ENABLE=		ownet
36
OWNET_CONFIGURE_ENABLE=		ownet
35
37
Lines 39-51 OWFTPD_CONFIGURE_ENABLE= owftpd Link Here
39
OWSERVER_CONFIGURE_ENABLE=	owserver
41
OWSERVER_CONFIGURE_ENABLE=	owserver
40
42
41
OWTAP_CONFIGURE_ENABLE=		owtap
43
OWTAP_CONFIGURE_ENABLE=		owtap
42
OWTAP_USE=			tk=yes tk_wrapper=yes
44
OWTAP_USES=			tk:wrapper
43
45
44
OWMALLOC_CONFIGURE_ENABLE=	owmalloc
46
OWMALLOC_CONFIGURE_ENABLE=	owmalloc
45
OWTRAFFIC_CONFIGURE_ENABLE=	owtraffic
47
OWTRAFFIC_CONFIGURE_ENABLE=	owtraffic
46
48
47
OWMON_CONFIGURE_ENABLE=		owmon
49
OWMON_CONFIGURE_ENABLE=		owmon
48
OWMON_USE=			tk=yes tk_wrapper=yes
50
OWMON_USES=			tk:wrapper
49
51
50
OWCAPI_CONFIGURE_ENABLE=	owcapi
52
OWCAPI_CONFIGURE_ENABLE=	owcapi
51
53
Lines 111-127 CONFIGURE_ARGS+= --disable-swig Link Here
111
CONFIGURE_ARGS+=		--enable-owtcl --with-tcl=${TCL_LIBDIR}
113
CONFIGURE_ARGS+=		--enable-owtcl --with-tcl=${TCL_LIBDIR}
112
.endif
114
.endif
113
115
114
# These __version__ fixes should be unnecessary on next release
115
post-patch:
116
	@${REINPLACE_CMD} \
117
		-e "s/^\(__version__ = '[[:digit:]]\.[[:digit:]]\).*/\1'/" \
118
		${WRKSRC}/module/swig/python/unittest/*.py \
119
		${WRKSRC}/module/ownet/python/ownet/__init__.py
120
	@${REINPLACE_CMD} -e "s/\(__version__ =\).*/\1 '1.9'/" \
121
		${WRKSRC}/module/ownet/python/ownet/connection.py
122
	@${REINPLACE_CMD} -e "s/\(__version__ = .*\) [+].*/\1/" \
123
		${WRKSRC}/module/swig/python/ow/__init__.py
124
125
# This takes a few seconds so give the user some notice
116
# This takes a few seconds so give the user some notice
126
pre-configure:
117
pre-configure:
127
	${MKDIR} ${WRKSRC}/m4
118
	${MKDIR} ${WRKSRC}/m4
(-)b/comms/owfs/Makefile.options (-1 / +4 lines)
Lines 1-6 Link Here
1
# $FreeBSD: head/comms/owfs/Makefile.options 365069 2014-08-16 09:15:17Z marino $
1
# $FreeBSD: head/comms/owfs/Makefile.options 365069 2014-08-16 09:15:17Z marino $
2
2
3
OPTIONS_DEFINE = OWDEBUG \
3
OPTIONS_DEFINE = \
4
	OWDEBUG \
5
	OWMUTEXDEBUG \
4
	OWSHELL \
6
	OWSHELL \
5
	OWNET \
7
	OWNET \
6
	I2C \
8
	I2C \
Lines 27-32 OPTIONS_DEFINE = OWDEBUG \ Link Here
27
29
28
30
29
OWDEBUG_DESC=		Enable debug output
31
OWDEBUG_DESC=		Enable debug output
32
OWMUTEXDEBUG_DESC=	Enable mutex debug
30
OWSHELL_DESC=		Enable CLI utils
33
OWSHELL_DESC=		Enable CLI utils
31
OWNET_DESC=		Enable network communication
34
OWNET_DESC=		Enable network communication
32
I2C_DESC=		Enable i2c (DS2482-x00) support (UNTESTED)
35
I2C_DESC=		Enable i2c (DS2482-x00) support (UNTESTED)
(-)b/comms/owfs/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (owfs-2.9p5.tar.gz) = f7e11bae6cd29d58726e6d29b297834e5656d6069a407d798067ae25cb0812ea
1
SHA256 (owfs-2.9p7.tar.gz) = 8f74d24e9a98958d4fc7e505bc110c94d35f5aae70e260e99d94fc632dfe1f85
2
SIZE (owfs-2.9p5.tar.gz) = 1444365
2
SIZE (owfs-2.9p7.tar.gz) = 1454288
(-)b/comms/owfs/pkg-plist (-7 / +32 lines)
Lines 1-14 Link Here
1
%%OWCAPI%%include/owcapi.h
1
%%OWCAPI%%include/owcapi.h
2
%%OWCAPI%%lib/libowcapi-2.9.so.5
2
%%OWCAPI%%lib/libowcapi-2.9.so.7
3
%%OWCAPI%%lib/libowcapi-2.9.so.5.0.0
3
%%OWCAPI%%lib/libowcapi-2.9.so.7.0.0
4
%%OWCAPI%%lib/libowcapi.so
4
%%OWCAPI%%lib/libowcapi.so
5
%%OWFS%%bin/owfs
5
%%OWFS%%bin/owfs
6
%%OWFTPD%%bin/owftpd
6
%%OWFTPD%%bin/owftpd
7
%%OWHTTPD%%bin/owhttpd
7
%%OWHTTPD%%bin/owhttpd
8
%%OWMON%%bin/owmon
8
%%OWMON%%bin/owmon
9
%%OWNETLIB%%include/ownetapi.h
9
%%OWNETLIB%%include/ownetapi.h
10
%%OWNETLIB%%lib/libownet-2.9.so.5
10
%%OWNETLIB%%lib/libownet-2.9.so.7
11
%%OWNETLIB%%lib/libownet-2.9.so.5.0.0
11
%%OWNETLIB%%lib/libownet-2.9.so.7.0.0
12
%%OWNETLIB%%lib/libownet.so
12
%%OWNETLIB%%lib/libownet.so
13
%%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
13
%%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
14
%%OWNETPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet/.packlist
14
%%OWNETPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet/.packlist
Lines 24-30 Link Here
24
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
24
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
25
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
25
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
26
%%OWPERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OW
26
%%OWPERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OW
27
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p5-py2.7.egg-info
27
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p7-py2.7.egg-info
28
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
28
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
29
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
29
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
30
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
30
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
Lines 44-52 Link Here
44
%%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
44
%%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
45
bin/owexternal
45
bin/owexternal
46
include/owfs_config.h
46
include/owfs_config.h
47
lib/libow-2.9.so.5
47
lib/libow-2.9.so.7
48
lib/libow-2.9.so.5.0.0
48
lib/libow-2.9.so.7.0.0
49
lib/libow.so
49
lib/libow.so
50
man/man1/cmdline_mini.1so.gz
51
man/man1/configuration.1so.gz
52
man/man1/description.1so.gz
53
man/man1/device.1so.gz
54
man/man1/format.1so.gz
55
man/man1/help.1so.gz
56
man/man1/job_control.1so.gz
50
man/man1/libowcapi.1.gz
57
man/man1/libowcapi.1.gz
51
man/man1/libownet.1.gz
58
man/man1/libownet.1.gz
52
man/man1/owcapi.1.gz
59
man/man1/owcapi.1.gz
Lines 65-70 man/man1/owserver.1.gz Link Here
65
man/man1/owshell.1.gz
72
man/man1/owshell.1.gz
66
man/man1/owtap.1.gz
73
man/man1/owtap.1.gz
67
man/man1/owwrite.1.gz
74
man/man1/owwrite.1.gz
75
man/man1/persistent_thresholds.1so.gz
76
man/man1/pressure.1so.gz
77
man/man1/seealso.1so.gz
78
man/man1/temperature.1so.gz
79
man/man1/timeout.1so.gz
68
man/man3/DS1427.3.gz
80
man/man3/DS1427.3.gz
69
man/man3/DS1821.3.gz
81
man/man3/DS1821.3.gz
70
man/man3/DS1822.3.gz
82
man/man3/DS1822.3.gz
Lines 158-169 man/man3/MAX31851.3.gz Link Here
158
man/man3/OWNet.3.gz
170
man/man3/OWNet.3.gz
159
man/man3/Thermachron.3.gz
171
man/man3/Thermachron.3.gz
160
man/man3/UVI.3.gz
172
man/man3/UVI.3.gz
173
man/man3/addressing.3so.gz
174
man/man3/description.3so.gz
161
man/man3/mAM001.3.gz
175
man/man3/mAM001.3.gz
162
man/man3/mCM001.3.gz
176
man/man3/mCM001.3.gz
163
man/man3/mDI001.3.gz
177
man/man3/mDI001.3.gz
164
man/man3/mRS001.3.gz
178
man/man3/mRS001.3.gz
165
man/man3/owperl.3.gz
179
man/man3/owperl.3.gz
180
man/man3/seealso.3so.gz
181
man/man3/standard.3so.gz
182
man/man3/standard_mini.3so.gz
183
man/man3/temperature_errata.3so.gz
184
man/man3/temperature_threshold.3so.gz
185
man/man3/temperatures_mini.3so.gz
186
man/man5/description.5so.gz
187
man/man5/format.5so.gz
166
man/man5/owfs.5.gz
188
man/man5/owfs.5.gz
167
man/man5/owfs.conf.5.gz
189
man/man5/owfs.conf.5.gz
190
man/man5/seealso.5so.gz
191
man/mann/description.nso.gz
168
man/mann/ow.n.gz
192
man/mann/ow.n.gz
169
man/mann/owtcl.n.gz
193
man/mann/owtcl.n.gz
194
man/mann/seealso.nso.gz

Return to bug 194261