Index: head/net-mgmt/ccnet-client/Makefile =================================================================== --- head/net-mgmt/ccnet-client/Makefile (revision 432375) +++ head/net-mgmt/ccnet-client/Makefile (revision 432376) @@ -1,40 +1,39 @@ # $FreeBSD$ PORTNAME= ccnet-client -PORTVERSION= 6.0.1 +PORTVERSION= 6.0.2 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt devel MAINTAINER= ultima1252@gmail.com COMMENT= Framework for writing networked applications LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENCE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libsqlite3.so:databases/sqlite3 \ libzdb.so:databases/libzdb \ libuuid.so:misc/e2fsprogs-libuuid \ libevent.so:devel/libevent2 \ libjansson.so:devel/jansson CONFLICTS= ccnet-server-[0-9]* USE_GITHUB= yes GH_ACCOUNT= haiwen GH_PROJECT= ccnet USES= autoreconf gettext libtool localbase pathfix pkgconfig \ - python:-2.7 shebangfix ssl + python:-2.7 ssl USE_GNOME= glib20 USE_LDCONFIG= yes USE_OPENLDAP= yes -SHEBANG_FILES= tools/*.py CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-ldap INSTALL_TARGET= install-strip .include Index: head/net-mgmt/ccnet-client/distinfo =================================================================== --- head/net-mgmt/ccnet-client/distinfo (revision 432375) +++ head/net-mgmt/ccnet-client/distinfo (revision 432376) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481772896 -SHA256 (haiwen-ccnet-v6.0.1_GH0.tar.gz) = fc477904240ada0e3f20d840d40e50c4f1693959e6dc78817616f5f49aa4d227 -SIZE (haiwen-ccnet-v6.0.1_GH0.tar.gz) = 222193 +TIMESTAMP = 1484493215 +SHA256 (haiwen-ccnet-v6.0.2_GH0.tar.gz) = c78e4bc7b42fbaa8afae4edc5d474da72ae2d4c06745e3452e4926316d832862 +SIZE (haiwen-ccnet-v6.0.2_GH0.tar.gz) = 176698 Index: head/net-mgmt/ccnet-client/files/patch-Makefile.am =================================================================== --- head/net-mgmt/ccnet-client/files/patch-Makefile.am (revision 432375) +++ head/net-mgmt/ccnet-client/files/patch-Makefile.am (revision 432376) @@ -1,16 +1,15 @@ ---- Makefile.am.orig 2015-11-26 15:34:14 UTC +--- Makefile.am.orig 2017-01-15 15:09:00 UTC +++ Makefile.am -@@ -24,9 +24,13 @@ ACLOCAL_AMFLAGS = -I m4 - install-data-local: +@@ -15,8 +15,12 @@ install-data-local: if MACOS sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) -+else + else +if BSD + sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles) - else ++else ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles) endif +endif dist-hook: git log --format='%H' -1 > $(distdir)/latest_commit Index: head/net-mgmt/ccnet-client/files/patch-configure.ac =================================================================== --- head/net-mgmt/ccnet-client/files/patch-configure.ac (revision 432375) +++ head/net-mgmt/ccnet-client/files/patch-configure.ac (revision 432376) @@ -1,78 +1,78 @@ ---- configure.ac.orig 2015-11-11 09:50:52 UTC +--- configure.ac.orig 2017-01-05 06:13:46 UTC +++ configure.ac -@@ -51,8 +51,16 @@ else +@@ -52,8 +52,16 @@ else AC_MSG_RESULT(no) fi +AC_MSG_CHECKING(for BSD) +if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then + bbsd=true + AC_MSG_RESULT(compile in BSD) +else + AC_MSG_RESULT(no) +fi + AC_MSG_CHECKING(for Linux) -if test "$bmac" != "true" -a "$bwin32" != "true"; then +if test "$bmac" != "true" -a "$bwin32" != "true" -a "$bbsd" != "true"; then blinux=true AC_MSG_RESULT(compile in linux) else -@@ -154,6 +162,7 @@ AM_CONDITIONAL([COMPILE_DEMO], [test "${ +@@ -63,6 +71,7 @@ fi AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) +AM_CONDITIONAL([BSD], [test "$bbsd" = "true"]) # check libraries -@@ -213,6 +222,7 @@ if test "$bwin32" = true; then +@@ -122,6 +131,7 @@ if test "$bwin32" = true; then LIBS= LIB_RESOLV= LIB_UUID=-lrpcrt4 + LIB_KVM= LIB_IPHLPAPI=-liphlpapi LIB_SHELL32=-lshell32 LIB_PSAPI=-lpsapi -@@ -225,11 +235,25 @@ elif test "$bmac" = true ; then +@@ -134,11 +144,25 @@ elif test "$bmac" = true ; then LIB_INTL= LIB_RESOLV=-lresolv LIB_UUID= + LIB_KVM= LIB_IPHLPAPI= LIB_SHELL32= LIB_PSAPI= MSVC_CFLAGS= LIB_DIRWATCH="-framework CoreServices" +elif test "$bbsd" = true ; then + LIB_WS32= + LIB_GDI32= + LIB_RT= + LIB_INTL= + LIB_RESOLV= + LIB_UUID=-luuid + LIB_KVM=-lkvm + LIB_IPHLPAPI= + LIB_SHELL32= + LIB_PSAPI= + MSVC_CFLAGS= + LIB_DIRWATCH= else LIB_WS32= LIB_GDI32= -@@ -237,6 +261,7 @@ else +@@ -146,6 +170,7 @@ else LIB_INTL= LIB_RESOLV=-lresolv LIB_UUID=-luuid + LIB_KVM= LIB_IPHLPAPI= LIB_SHELL32= LIB_PSAPI= -@@ -250,6 +275,7 @@ AC_SUBST(LIB_RT) +@@ -159,6 +184,7 @@ AC_SUBST(LIB_RT) AC_SUBST(LIB_INTL) AC_SUBST(LIB_RESOLV) AC_SUBST(LIB_UUID) +AC_SUBST(LIB_KVM) AC_SUBST(LIB_IPHLPAPI) AC_SUBST(LIB_SHELL32) AC_SUBST(LIB_PSAPI) Index: head/net-mgmt/ccnet-client/pkg-plist =================================================================== --- head/net-mgmt/ccnet-client/pkg-plist (revision 432375) +++ head/net-mgmt/ccnet-client/pkg-plist (revision 432376) @@ -1,84 +1,79 @@ bin/ccnet -bin/ccnet-demo-client -bin/ccnet-demo-server -bin/ccnet-init -bin/ccnet-servtool -bin/ccnet-tool include/ccnet.h include/ccnet/async-rpc-proc.h include/ccnet/ccnet-client.h include/ccnet/ccnet-object.h include/ccnet/ccnet-session-base.h include/ccnet/ccnetrpc-transport.h include/ccnet/cevent.h include/ccnet/invoke-service-proc.h include/ccnet/job-mgr.h include/ccnet/message.h include/ccnet/mqclient-proc.h include/ccnet/option.h include/ccnet/packet.h include/ccnet/peer.h include/ccnet/proc-factory.h include/ccnet/processor.h include/ccnet/rpcserver-proc.h include/ccnet/sendcmd-proc.h include/ccnet/status-code.h include/ccnet/threaded-rpcserver-proc.h include/ccnet/timer.h include/ccnet/valid-check.h lib/libccnet.a lib/libccnet.so lib/libccnet.so.0 lib/libccnet.so.0.0.0 %%PYTHON_SITELIBDIR%%/ccnet/__init__.py %%PYTHON_SITELIBDIR%%/ccnet/__init__.pyc %%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py %%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py %%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py %%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/processor.py %%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py %%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py %%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo %%PYTHON_SITELIBDIR%%/ccnet/async/timer.py %%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc %%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo %%PYTHON_SITELIBDIR%%/ccnet/client.py %%PYTHON_SITELIBDIR%%/ccnet/client.pyc %%PYTHON_SITELIBDIR%%/ccnet/client.pyo %%PYTHON_SITELIBDIR%%/ccnet/errors.py %%PYTHON_SITELIBDIR%%/ccnet/errors.pyc %%PYTHON_SITELIBDIR%%/ccnet/errors.pyo %%PYTHON_SITELIBDIR%%/ccnet/message.py %%PYTHON_SITELIBDIR%%/ccnet/message.pyc %%PYTHON_SITELIBDIR%%/ccnet/message.pyo %%PYTHON_SITELIBDIR%%/ccnet/packet.py %%PYTHON_SITELIBDIR%%/ccnet/packet.pyc %%PYTHON_SITELIBDIR%%/ccnet/packet.pyo %%PYTHON_SITELIBDIR%%/ccnet/pool.py %%PYTHON_SITELIBDIR%%/ccnet/pool.pyc %%PYTHON_SITELIBDIR%%/ccnet/pool.pyo %%PYTHON_SITELIBDIR%%/ccnet/rpc.py %%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc %%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo %%PYTHON_SITELIBDIR%%/ccnet/status_code.py %%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc %%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo %%PYTHON_SITELIBDIR%%/ccnet/sync_client.py %%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc %%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo %%PYTHON_SITELIBDIR%%/ccnet/utils.py %%PYTHON_SITELIBDIR%%/ccnet/utils.pyc %%PYTHON_SITELIBDIR%%/ccnet/utils.pyo libdata/pkgconfig/libccnet.pc