Attachment 157826 Details for Bug 200245 – combined with pyo, -O and without do-build

[patch] combined with pyo, -O and without do-build

owfs.diff (text/plain), 5.35 KB, created by admin on 2015-06-17 06:32:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: admin

Created: 2015-06-17 06:32:44 UTC

Size: 5.35 KB

patch

obsolete

>diff -Nru comms/owfs.orig/Makefile comms/owfs/Makefile
>--- comms/owfs.orig/Makefile	2015-06-17 09:14:38.000000000 +0300
>+++ comms/owfs/Makefile	2015-06-17 09:23:22.000000000 +0300
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/comms/owfs/Makefile 380688 2015-03-07 13:19:46Z antoine $
> 
> PORTNAME=	owfs
>-PORTVERSION=	2.9p8
>-PORTREVISION=	2
>+PORTVERSION=	3.1p0
> CATEGORIES=	comms
> MASTER_SITES=	SF/owfs/owfs/${PORTVERSION}
> 
>@@ -12,7 +11,7 @@
> 
> LICENSE=	GPLv2
> 
>-USES=		autoreconf libtool gmake
>+USES=		autoreconf gmake libtool pkgconfig
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>@@ -66,7 +65,7 @@
> # XXX Broken due to -lgcc_p
> PROFILING_CONFIGURE_ENABLE=	profiling
> 
>-# XXX: Not tested, it compiles, but not sure if fusefs actually works
>+# work on 10.1 amd64, USB DS9097, --passive=/dev/cuaU0
> OWFS_CONFIGURE_ENABLE=		owfs
> OWFS_USES=			fuse
> 
>@@ -113,19 +112,21 @@
> 
> # This takes a few seconds so give the user some notice
> pre-configure:
>-	${MKDIR} ${WRKSRC}/m4
>+	@${MKDIR} ${WRKSRC}/m4
> 	@echo "Preparing build using autotools..."
> 
> # Workarounds for different problems
> post-install:
> .if ${PORT_OPTIONS:MOWPYTHON}
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
> 	(cd ${STAGEDIR}${PREFIX} \
>-	 && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
>-	 -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so
>+		&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
>+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
>+
> .endif
> .if ${PORT_OPTIONS:MOWPERL}
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so
> .endif
> 
> .include <bsd.port.mk>
>diff -Nru comms/owfs.orig/Makefile.options comms/owfs/Makefile.options
>--- comms/owfs.orig/Makefile.options	2015-06-17 09:14:38.000000000 +0300
>+++ comms/owfs/Makefile.options	2015-06-17 09:15:24.000000000 +0300
>@@ -46,7 +46,7 @@
> OWPYTHON_DESC=		Enable Python binding 
> OWTCL_DESC=		Enable TCL binding
> PROFILING_DESC=		Enable profiling (BROKEN)
>-OWFS_DESC=		Enable FUSE support (UNTESTED)
>+OWFS_DESC=		Enable FUSE support
> ZERO_DESC=		Enable Zeroconf/bonjour (UNTESTED)
> USB_DESC=		Enable 1-Wire usb DS2490 support
> 
>@@ -57,9 +57,11 @@
> OPTIONS_DEFAULT=OWDEBUG\
> 	OWSHELL\
> 	OWNET\
>+	I2C\
> 	OWHTTPD\
> 	OWFTPD\
> 	OWSERVER\
> 	OWCAPI\
>+	OWFS\
> 	USB
> 
>diff -Nru comms/owfs.orig/distinfo comms/owfs/distinfo
>--- comms/owfs.orig/distinfo	2015-06-17 09:14:38.000000000 +0300
>+++ comms/owfs/distinfo	2015-06-17 09:15:24.000000000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (owfs-2.9p8.tar.gz) = 8af8785599d39f22fa060d7a04e3c0052cb5be6be1ab461136dbdab87aef2ef2
>-SIZE (owfs-2.9p8.tar.gz) = 1471486
>+SHA256 (owfs-3.1p0.tar.gz) = 62fca1b3e908cd4515c9eb499bf2b05020bbbea4a5b73611ddc6f205adec7a54
>+SIZE (owfs-3.1p0.tar.gz) = 1523086
>diff -Nru comms/owfs.orig/files/patch-module_owfs_src_c_ow_rwlock.c comms/owfs/files/patch-module_owfs_src_c_ow_rwlock.c
>--- comms/owfs.orig/files/patch-module_owfs_src_c_ow_rwlock.c	1970-01-01 03:00:00.000000000 +0300
>+++ comms/owfs/files/patch-module_owfs_src_c_ow_rwlock.c	2015-06-17 09:15:24.000000000 +0300
>@@ -0,0 +1,10 @@
>+--- module/owlib/src/c/ow_rwlock.c	2015-01-11 01:31:32 UTC
>++++ module/owlib/src/c/ow_rwlock.c	
>+@@ -25,7 +25,6 @@ void my_rwlock_init(my_rwlock_t * rwlock
>+ 	int semrc;
>+ 	semrc = pthread_rwlock_init(rwlock, NULL);
>+ 	if(semrc != 0) {
>+-		if ( 
>+ 		LOCK_DEBUG("semrc=%d [%s] RWLOCK INIT", semrc, strerror(errno));
>+ 		debug_crash();
>+ 	}
>diff -Nru comms/owfs.orig/pkg-plist comms/owfs/pkg-plist
>--- comms/owfs.orig/pkg-plist	2015-06-17 09:14:38.000000000 +0300
>+++ comms/owfs/pkg-plist	2015-06-17 09:17:45.000000000 +0300
>@@ -1,28 +1,31 @@
> %%OWCAPI%%include/owcapi.h
>-%%OWCAPI%%lib/libowcapi-2.9.so.8
>-%%OWCAPI%%lib/libowcapi-2.9.so.8.0.0
>+%%OWCAPI%%lib/libowcapi-3.1.so.0
>+%%OWCAPI%%lib/libowcapi-3.1.so.0.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.8
>-%%OWNETLIB%%lib/libownet-2.9.so.8.0.0
>+%%OWNETLIB%%lib/libownet-3.1.so.0
>+%%OWNETLIB%%lib/libownet-3.1.so.0.0.0
> %%OWNETLIB%%lib/libownet.so
> %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
> %%OWNETPERL%%%%SITE_PERL%%/OWNet.pm
> %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet-0.3-py2.7.egg-info
> %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.py
> %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyc
>+%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyo
> %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.py
> %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyc
>+%%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyo
> %%OWPERL%%%%SITE_ARCH%%/OW.pm
> %%OWPERL%%%%SITE_ARCH%%/auto/OW/OW.so
>-%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p8-py2.7.egg-info
>+%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-3.1p0-py2.7.egg-info
> %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
> %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
> %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
>+%%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyo
> %%OWSERVER%%bin/owserver
> %%OWSHELL%%bin/owdir
> %%OWSHELL%%bin/owexist
>@@ -37,8 +40,8 @@
> %%OWTCL%%lib/owtcl-1.0/pkgIndex.tcl
> bin/owexternal
> include/owfs_config.h
>-lib/libow-2.9.so.8
>-lib/libow-2.9.so.8.0.0
>+lib/libow-3.1.so.0
>+lib/libow-3.1.so.0.0.0
> lib/libow.so
> man/man1/libowcapi.1.gz
> man/man1/libownet.1.gz

Actions: View | Diff

Attachments on bug 200245: 156834 | 156859 | 156861 | 156863 | 156864 | 156865 | 156889 | 156994 | 157649 | 157826 | 157827