отличий, минимально
Код: Выделить всё
diff -Nru comms/owfs.orig/Makefile comms/owfs/Makefile
--- comms/owfs.orig/Makefile 2015-03-07 16:19:46.000000000 +0300
+++ comms/owfs/Makefile 2015-05-16 15:36:40.000000000 +0300
@@ -2,8 +2,8 @@
# $FreeBSD: head/comms/owfs/Makefile 380688 2015-03-07 13:19:46Z antoine $
PORTNAME= owfs
-PORTVERSION= 2.9p8
-PORTREVISION= 2
+PORTVERSION= 3.1p0
+#PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= SF/owfs/owfs/${PORTVERSION}
@@ -13,6 +13,7 @@
LICENSE= GPLv2
USES= autoreconf libtool gmake
+USE_GCC= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
@@ -66,7 +67,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
diff -Nru comms/owfs.orig/Makefile.options comms/owfs/Makefile.options
--- comms/owfs.orig/Makefile.options 2014-12-22 21:37:57.000000000 +0300
+++ comms/owfs/Makefile.options 2015-05-16 13:31:59.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
@@ -61,5 +61,6 @@
OWFTPD\
OWSERVER\
OWCAPI\
+ OWFS\
USB
diff -Nru comms/owfs.orig/distinfo comms/owfs/distinfo
--- comms/owfs.orig/distinfo 2014-11-07 20:52:36.000000000 +0300
+++ comms/owfs/distinfo 2015-05-16 15:16:55.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
Код: Выделить всё
/bin/sh ../../../../libtool --tag=CC --mode=compile gcc48 -DHAVE_CONFIG_H -I. -I../../../../src/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -D_THREAD_SAFE -pthread -O2 -pipe -fstack-protector -Wl,-rpath=/usr/local/lib/gcc48 -fno-strict-aliasing -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_rwlock.lo -MD -MP -MF .deps/ow_rwlock.Tpo -c -o ow_rwlock.lo ow_rwlock.c
libtool: compile: gcc48 -DHAVE_CONFIG_H -I. -I../../../../src/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -D_THREAD_SAFE -pthread -O2 -pipe -fstack-protector -Wl,-rpath=/usr/local/lib/gcc48 -fno-strict-aliasing -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_return_code.lo -MD -MP -MF .deps/ow_return_code.Tpo -c ow_return_code.c -o ow_return_code.o >/dev/null 2>&1
libtool: compile: gcc48 -DHAVE_CONFIG_H -I. -I../../../../src/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -D_THREAD_SAFE -pthread -O2 -pipe -fstack-protector -Wl,-rpath=/usr/local/lib/gcc48 -fno-strict-aliasing -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_rwlock.lo -MD -MP -MF .deps/ow_rwlock.Tpo -c ow_rwlock.c -fPIC -DPIC -o .libs/ow_rwlock.o
ow_rwlock.c: In function 'my_rwlock_init':
ow_rwlock.c:18:26: error: expected expression before 'if'
#define LOCK_DEBUG(...) if ( Globals.locks != 0 ) { LEVEL_DEFAULT(__VA_ARGS__) ; }
^
ow_rwlock.c:29:3: note: in expansion of macro 'LOCK_DEBUG'
LOCK_DEBUG("semrc=%d [%s] RWLOCK INIT", semrc, strerror(errno));
^
ow_rwlock.c:31:2: error: expected expression before '}' token
}
^
mv -f .deps/ow_return_code.Tpo .deps/ow_return_code.Plo
/bin/sh ../../../../libtool --tag=CC --mode=compile gcc48 -DHAVE_CONFIG_H -I. -I../../../../src/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -D_THREAD_SAFE -pthread -O2 -pipe -fstack-protector -Wl,-rpath=/usr/local/lib/gcc48 -fno-strict-aliasing -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_stats.lo -MD -MP -MF .deps/ow_stats.Tpo -c -o ow_stats.lo ow_stats.c
Makefile:1085: ошибка выполнения рецепта для цели «ow_rwlock.lo»
gmake[6]: *** [ow_rwlock.lo] Ошибка 1
gmake[6]: *** Ожидание завершения заданий…
libtool: compile: gcc48 -DHAVE_CONFIG_H -I. -I../../../../src/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -D_THREAD_SAFE -pthread -O2 -pipe -fstack-protector -Wl,-rpath=/usr/local/lib/gcc48 -fno-strict-aliasing -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_stats.lo -MD -MP -MF .deps/ow_stats.Tpo -c ow_stats.c -fPIC -DPIC -o .libs/ow_stats.o
libtool: compile: gcc48 -DHAVE_CONFIG_H -I. -I../../../../src/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -D_THREAD_SAFE -pthread -O2 -pipe -fstack-protector -Wl,-rpath=/usr/local/lib/gcc48 -fno-strict-aliasing -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_stats.lo -MD -MP -MF .deps/ow_stats.Tpo -c ow_stats.c -o ow_stats.o >/dev/null 2>&1
mv -f .deps/ow_stats.Tpo .deps/ow_stats.Plo
gmake[6]: выход из каталога «/usr/ports/comms/owfs/work/owfs-3.1p0/module/owlib/src/c»
Makefile:497: ошибка выполнения рецепта для цели «all-recursive»
gmake[5]: *** [all-recursive] Ошибка 1
gmake[5]: выход из каталога «/usr/ports/comms/owfs/work/owfs-3.1p0/module/owlib/src»
Makefile:497: ошибка выполнения рецепта для цели «all-recursive»
gmake[4]: *** [all-recursive] Ошибка 1
gmake[4]: выход из каталога «/usr/ports/comms/owfs/work/owfs-3.1p0/module/owlib»
Makefile:511: ошибка выполнения рецепта для цели «all-recursive»
gmake[3]: *** [all-recursive] Ошибка 1
gmake[3]: выход из каталога «/usr/ports/comms/owfs/work/owfs-3.1p0/module»
Makefile:566: ошибка выполнения рецепта для цели «all-recursive»
gmake[2]: *** [all-recursive] Ошибка 1
gmake[2]: выход из каталога «/usr/ports/comms/owfs/work/owfs-3.1p0»
===> Compilation failed unexpectedly.
Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to
the maintainer.
*** Error code 1
Stop.
make[1]: stopped in /usr/ports/comms/owfs
*** Error code 1
Stop.
make: stopped in /usr/ports/comms/owfs
неканает, ошибка.