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.9p8
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.9p8.tar.gz) = 8af8785599d39f22fa060d7a04e3c0052cb5be6be1ab461136dbdab87aef2ef2
2
SIZE (owfs-2.9p5.tar.gz) = 1444365
2
SIZE (owfs-2.9p8.tar.gz) = 1471486
(-)b/comms/owfs/pkg-plist (-71 / +7 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.8
3
%%OWCAPI%%lib/libowcapi-2.9.so.5.0.0
3
%%OWCAPI%%lib/libowcapi-2.9.so.8.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.8
11
%%OWNETLIB%%lib/libownet-2.9.so.5.0.0
11
%%OWNETLIB%%lib/libownet-2.9.so.8.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 21-27 Link Here
21
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OW.pm
21
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OW.pm
22
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
22
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
23
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
23
%%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
24
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p5-py2.7.egg-info
24
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p8-py2.7.egg-info
25
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
25
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
26
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
26
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
27
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
27
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
Lines 39-78 Link Here
39
%%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
39
%%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
40
bin/owexternal
40
bin/owexternal
41
include/owfs_config.h
41
include/owfs_config.h
42
lib/libow-2.9.so.5
42
lib/libow-2.9.so.8
43
lib/libow-2.9.so.5.0.0
43
lib/libow-2.9.so.8.0.0
44
lib/libow.so
44
lib/libow.so
45
man/man1/libowcapi.1.gz
45
man/man1/libowcapi.1.gz
46
man/man1/libownet.1.gz
46
man/man1/libownet.1.gz
47
man/man1/owcapi.1.gz
48
man/man1/owdir.1.gz
47
man/man1/owdir.1.gz
49
man/man1/owfs.1.gz
50
man/man1/owftpd.1.gz
51
man/man1/owget.1.gz
48
man/man1/owget.1.gz
52
man/man1/owhttpd.1.gz
53
man/man1/owmon.1.gz
54
man/man1/ownet.1.gz
55
man/man1/ownetapi.1.gz
49
man/man1/ownetapi.1.gz
56
man/man1/ownetlib.1.gz
50
man/man1/ownetlib.1.gz
57
man/man1/owpresent.1.gz
51
man/man1/owpresent.1.gz
58
man/man1/owread.1.gz
52
man/man1/owread.1.gz
59
man/man1/owserver.1.gz
60
man/man1/owshell.1.gz
61
man/man1/owtap.1.gz
62
man/man1/owwrite.1.gz
53
man/man1/owwrite.1.gz
63
man/man3/DS1427.3.gz
54
man/man3/DS1427.3.gz
64
man/man3/DS1821.3.gz
65
man/man3/DS1822.3.gz
66
man/man3/DS1825.3.gz
67
man/man3/DS18B20.3.gz
68
man/man3/DS18S20.3.gz
69
man/man3/DS1904.3.gz
55
man/man3/DS1904.3.gz
70
man/man3/DS1920.3.gz
56
man/man3/DS1920.3.gz
71
man/man3/DS1921.3.gz
72
man/man3/DS1963L.3.gz
73
man/man3/DS1963S.3.gz
74
man/man3/DS1971.3.gz
57
man/man3/DS1971.3.gz
75
man/man3/DS1977.3.gz
76
man/man3/DS1982.3.gz
58
man/man3/DS1982.3.gz
77
man/man3/DS1982U.3.gz
59
man/man3/DS1982U.3.gz
78
man/man3/DS1985.3.gz
60
man/man3/DS1985.3.gz
Lines 80-136 man/man3/DS1985U.3.gz Link Here
80
man/man3/DS1986.3.gz
62
man/man3/DS1986.3.gz
81
man/man3/DS1986U.3.gz
63
man/man3/DS1986U.3.gz
82
man/man3/DS1990A.3.gz
64
man/man3/DS1990A.3.gz
83
man/man3/DS1991.3.gz
84
man/man3/DS1992.3.gz
85
man/man3/DS1993.3.gz
86
man/man3/DS1994.3.gz
65
man/man3/DS1994.3.gz
87
man/man3/DS1995.3.gz
88
man/man3/DS1996.3.gz
89
man/man3/DS2401.3.gz
90
man/man3/DS2404.3.gz
91
man/man3/DS2404S.3.gz
66
man/man3/DS2404S.3.gz
92
man/man3/DS2405.3.gz
93
man/man3/DS2406.3.gz
94
man/man3/DS2407.3.gz
67
man/man3/DS2407.3.gz
95
man/man3/DS2408.3.gz
96
man/man3/DS2409.3.gz
97
man/man3/DS2411.3.gz
68
man/man3/DS2411.3.gz
98
man/man3/DS2413.3.gz
99
man/man3/DS2415.3.gz
100
man/man3/DS2417.3.gz
69
man/man3/DS2417.3.gz
101
man/man3/DS2423.3.gz
102
man/man3/DS2430A.3.gz
103
man/man3/DS2431.3.gz
104
man/man3/DS2433.3.gz
105
man/man3/DS2436.3.gz
106
man/man3/DS2437.3.gz
107
man/man3/DS2438.3.gz
108
man/man3/DS2450.3.gz
109
man/man3/DS2502-E48.3.gz
70
man/man3/DS2502-E48.3.gz
110
man/man3/DS2502-UNW.3.gz
71
man/man3/DS2502-UNW.3.gz
111
man/man3/DS2502.3.gz
112
man/man3/DS2505-UNW.3.gz
72
man/man3/DS2505-UNW.3.gz
113
man/man3/DS2505.3.gz
114
man/man3/DS2506-UNW.3.gz
73
man/man3/DS2506-UNW.3.gz
115
man/man3/DS2506.3.gz
116
man/man3/DS2720.3.gz
117
man/man3/DS2740.3.gz
118
man/man3/DS2751.3.gz
119
man/man3/DS2755.3.gz
120
man/man3/DS2756.3.gz
74
man/man3/DS2756.3.gz
121
man/man3/DS2760.3.gz
122
man/man3/DS2761.3.gz
75
man/man3/DS2761.3.gz
123
man/man3/DS2762.3.gz
76
man/man3/DS2762.3.gz
124
man/man3/DS2770.3.gz
125
man/man3/DS2780.3.gz
126
man/man3/DS2781.3.gz
127
man/man3/DS2788.3.gz
77
man/man3/DS2788.3.gz
128
man/man3/DS2804.3.gz
78
man/man3/DS2804.3.gz
129
man/man3/DS2890.3.gz
130
man/man3/DS28E04.3.gz
131
man/man3/DS28EA00.3.gz
132
man/man3/DS28EC20.3.gz
133
man/man3/EDS.3.gz
134
man/man3/EDS0064.3.gz
79
man/man3/EDS0064.3.gz
135
man/man3/EDS0065.3.gz
80
man/man3/EDS0065.3.gz
136
man/man3/EDS0066.3.gz
81
man/man3/EDS0066.3.gz
Lines 144-151 man/man3/EDS0082.3.gz Link Here
144
man/man3/EDS0083.3.gz
89
man/man3/EDS0083.3.gz
145
man/man3/EDS0085.3.gz
90
man/man3/EDS0085.3.gz
146
man/man3/EDS0090.3.gz
91
man/man3/EDS0090.3.gz
147
man/man3/EEEF.3.gz
148
man/man3/LCD.3.gz
149
man/man3/MAX31820.3.gz
92
man/man3/MAX31820.3.gz
150
man/man3/MAX31826.3.gz
93
man/man3/MAX31826.3.gz
151
man/man3/MAX31850.3.gz
94
man/man3/MAX31850.3.gz
Lines 153-164 man/man3/MAX31851.3.gz Link Here
153
man/man3/OWNet.3.gz
96
man/man3/OWNet.3.gz
154
man/man3/Thermachron.3.gz
97
man/man3/Thermachron.3.gz
155
man/man3/UVI.3.gz
98
man/man3/UVI.3.gz
156
man/man3/mAM001.3.gz
157
man/man3/mCM001.3.gz
158
man/man3/mDI001.3.gz
159
man/man3/mRS001.3.gz
160
man/man3/owperl.3.gz
161
man/man5/owfs.5.gz
162
man/man5/owfs.conf.5.gz
99
man/man5/owfs.conf.5.gz
163
man/mann/ow.n.gz
100
man/mann/ow.n.gz
164
man/mann/owtcl.n.gz

Return to bug 194261