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

Collapse All | Expand All

(-)comms/owfs/Makefile (-9 / +10 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/comms/owfs/Makefile 380688 2015-03-07 13:19:46Z antoine $
2
# $FreeBSD: head/comms/owfs/Makefile 380688 2015-03-07 13:19:46Z antoine $
3
3
4
PORTNAME=	owfs
4
PORTNAME=	owfs
5
PORTVERSION=	2.9p8
5
PORTVERSION=	3.1p0
6
PORTREVISION=	2
7
CATEGORIES=	comms
6
CATEGORIES=	comms
8
MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
7
MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
9
8
Lines 12-18 Link Here
12
11
13
LICENSE=	GPLv2
12
LICENSE=	GPLv2
14
13
15
USES=		autoreconf libtool gmake
14
USES=		autoreconf gmake libtool pkgconfig
16
15
17
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
18
INSTALL_TARGET=	install-strip
17
INSTALL_TARGET=	install-strip
Lines 66-72 Link Here
66
# XXX Broken due to -lgcc_p
65
# XXX Broken due to -lgcc_p
67
PROFILING_CONFIGURE_ENABLE=	profiling
66
PROFILING_CONFIGURE_ENABLE=	profiling
68
67
69
# XXX: Not tested, it compiles, but not sure if fusefs actually works
68
# work on 10.1 amd64, USB DS9097, --passive=/dev/cuaU0
70
OWFS_CONFIGURE_ENABLE=		owfs
69
OWFS_CONFIGURE_ENABLE=		owfs
71
OWFS_USES=			fuse
70
OWFS_USES=			fuse
72
71
Lines 113-131 Link Here
113
112
114
# This takes a few seconds so give the user some notice
113
# This takes a few seconds so give the user some notice
115
pre-configure:
114
pre-configure:
116
	${MKDIR} ${WRKSRC}/m4
115
	@${MKDIR} ${WRKSRC}/m4
117
	@echo "Preparing build using autotools..."
116
	@echo "Preparing build using autotools..."
118
117
119
# Workarounds for different problems
118
# Workarounds for different problems
120
post-install:
119
post-install:
121
.if ${PORT_OPTIONS:MOWPYTHON}
120
.if ${PORT_OPTIONS:MOWPYTHON}
121
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
122
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
122
	(cd ${STAGEDIR}${PREFIX} \
123
	(cd ${STAGEDIR}${PREFIX} \
123
	 && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
124
		&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
124
	 -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
125
		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
125
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
126
126
.endif
127
.endif
127
.if ${PORT_OPTIONS:MOWPERL}
128
.if ${PORT_OPTIONS:MOWPERL}
128
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
129
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
129
.endif
130
.endif
130
131
131
.include <bsd.port.mk>
132
.include <bsd.port.mk>
(-)comms/owfs/Makefile.options (-1 / +3 lines)
Lines 46-52 Link Here
46
OWPYTHON_DESC=		Enable Python binding 
46
OWPYTHON_DESC=		Enable Python binding 
47
OWTCL_DESC=		Enable TCL binding
47
OWTCL_DESC=		Enable TCL binding
48
PROFILING_DESC=		Enable profiling (BROKEN)
48
PROFILING_DESC=		Enable profiling (BROKEN)
49
OWFS_DESC=		Enable FUSE support (UNTESTED)
49
OWFS_DESC=		Enable FUSE support
50
ZERO_DESC=		Enable Zeroconf/bonjour (UNTESTED)
50
ZERO_DESC=		Enable Zeroconf/bonjour (UNTESTED)
51
USB_DESC=		Enable 1-Wire usb DS2490 support
51
USB_DESC=		Enable 1-Wire usb DS2490 support
52
52
Lines 57-65 Link Here
57
OPTIONS_DEFAULT=OWDEBUG\
57
OPTIONS_DEFAULT=OWDEBUG\
58
	OWSHELL\
58
	OWSHELL\
59
	OWNET\
59
	OWNET\
60
	I2C\
60
	OWHTTPD\
61
	OWHTTPD\
61
	OWFTPD\
62
	OWFTPD\
62
	OWSERVER\
63
	OWSERVER\
63
	OWCAPI\
64
	OWCAPI\
65
	OWFS\
64
	USB
66
	USB
65
67
(-)comms/owfs/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (owfs-2.9p8.tar.gz) = 8af8785599d39f22fa060d7a04e3c0052cb5be6be1ab461136dbdab87aef2ef2
1
SHA256 (owfs-3.1p0.tar.gz) = 62fca1b3e908cd4515c9eb499bf2b05020bbbea4a5b73611ddc6f205adec7a54
2
SIZE (owfs-2.9p8.tar.gz) = 1471486
2
SIZE (owfs-3.1p0.tar.gz) = 1523086
(-)comms/owfs/files/patch-module_owfs_src_c_ow_rwlock.c (+10 lines)
Line 0 Link Here
1
--- module/owlib/src/c/ow_rwlock.c	2015-01-11 01:31:32 UTC
2
+++ module/owlib/src/c/ow_rwlock.c	
3
@@ -25,7 +25,6 @@ void my_rwlock_init(my_rwlock_t * rwlock
4
 	int semrc;
5
 	semrc = pthread_rwlock_init(rwlock, NULL);
6
 	if(semrc != 0) {
7
-		if ( 
8
 		LOCK_DEBUG("semrc=%d [%s] RWLOCK INIT", semrc, strerror(errno));
9
 		debug_crash();
10
 	}
(-)comms/owfs/pkg-plist (-7 / +10 lines)
Lines 1-28 Link Here
1
%%OWCAPI%%include/owcapi.h
1
%%OWCAPI%%include/owcapi.h
2
%%OWCAPI%%lib/libowcapi-2.9.so.8
2
%%OWCAPI%%lib/libowcapi-3.1.so.0
3
%%OWCAPI%%lib/libowcapi-2.9.so.8.0.0
3
%%OWCAPI%%lib/libowcapi-3.1.so.0.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.8
10
%%OWNETLIB%%lib/libownet-3.1.so.0
11
%%OWNETLIB%%lib/libownet-2.9.so.8.0.0
11
%%OWNETLIB%%lib/libownet-3.1.so.0.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%%/OWNet.pm
14
%%OWNETPERL%%%%SITE_PERL%%/OWNet.pm
15
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet-0.3-py2.7.egg-info
15
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet-0.3-py2.7.egg-info
16
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.py
16
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.py
17
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyc
17
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyc
18
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyo
18
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.py
19
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.py
19
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyc
20
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyc
21
%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyo
20
%%OWPERL%%%%SITE_ARCH%%/OW.pm
22
%%OWPERL%%%%SITE_ARCH%%/OW.pm
21
%%OWPERL%%%%SITE_ARCH%%/auto/OW/OW.so
23
%%OWPERL%%%%SITE_ARCH%%/auto/OW/OW.so
22
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p8-py2.7.egg-info
24
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-3.1p0-py2.7.egg-info
23
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
25
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
24
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
26
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
25
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
27
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
28
%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyo
26
%%OWSERVER%%bin/owserver
29
%%OWSERVER%%bin/owserver
27
%%OWSHELL%%bin/owdir
30
%%OWSHELL%%bin/owdir
28
%%OWSHELL%%bin/owexist
31
%%OWSHELL%%bin/owexist
Lines 37-44 Link Here
37
%%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
40
%%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
38
bin/owexternal
41
bin/owexternal
39
include/owfs_config.h
42
include/owfs_config.h
40
lib/libow-2.9.so.8
43
lib/libow-3.1.so.0
41
lib/libow-2.9.so.8.0.0
44
lib/libow-3.1.so.0.0.0
42
lib/libow.so
45
lib/libow.so
43
man/man1/libowcapi.1.gz
46
man/man1/libowcapi.1.gz
44
man/man1/libownet.1.gz
47
man/man1/libownet.1.gz

Return to bug 200245