svn commit: r429432 - in head/net-mgmt: . ccnet-server ccnet-server/files
Thomas Zander
riggs at FreeBSD.org
Sun Dec 25 14:38:37 UTC 2016
Author: riggs
Date: Sun Dec 25 14:38:34 2016
New Revision: 429432
URL: https://svnweb.freebsd.org/changeset/ports/429432
Log:
Prepare split of net-mgmt/ccnet in client / server ports; update to 6.0.6
PR: 215292
Submitted by: Ultima1252 at gmail.com (maintainer)
Added:
head/net-mgmt/ccnet-server/
- copied from r429314, head/net-mgmt/ccnet/
Modified:
head/net-mgmt/Makefile
head/net-mgmt/ccnet-server/Makefile
head/net-mgmt/ccnet-server/distinfo
head/net-mgmt/ccnet-server/files/patch-Makefile.am
head/net-mgmt/ccnet-server/files/patch-configure.ac
head/net-mgmt/ccnet-server/files/patch-lib_Makefile.am
head/net-mgmt/ccnet-server/files/patch-lib_net.c
head/net-mgmt/ccnet-server/files/patch-lib_utils.c
head/net-mgmt/ccnet-server/files/patch-net_common_getgateway.c
head/net-mgmt/ccnet-server/pkg-descr
head/net-mgmt/ccnet-server/pkg-plist
Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile Sun Dec 25 14:33:14 2016 (r429431)
+++ head/net-mgmt/Makefile Sun Dec 25 14:38:34 2016 (r429432)
@@ -28,6 +28,7 @@
SUBDIR += cacti
SUBDIR += cacti-spine
SUBDIR += ccnet
+ SUBDIR += ccnet-server
SUBDIR += cdpd
SUBDIR += cdpr
SUBDIR += cdpsnarf
Modified: head/net-mgmt/ccnet-server/Makefile
==============================================================================
--- head/net-mgmt/ccnet/Makefile Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/Makefile Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,16 +1,16 @@
# $FreeBSD$
-PORTNAME= ccnet
-PORTVERSION= 6.0.0
+PORTNAME= ccnet-server
+PORTVERSION= 6.0.6
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= -server
CATEGORIES= net-mgmt devel
MAINTAINER= ultima1252 at gmail.com
-COMMENT= Framework for writing networked applications
+COMMENT= Internal communication framework for Seafile server
LICENSE= GPLv3
-LICENSE_FILE= ${WRKSRC}/LICENCE.txt
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libsearpc.so:devel/libsearpc \
@@ -22,17 +22,20 @@ LIB_DEPENDS= libsearpc.so:devel/libsearp
libjansson.so:devel/jansson \
libldap.so:net/openldap24-client
+CONFLICT= ccnet-[0-9]*
+
USE_GITHUB= yes
GH_ACCOUNT= haiwen
-USES= autoreconf gettext libtool localbase pathfix pkgconfig \
- python:-2.7 shebangfix ssl
+USES= autoreconf gettext libtool localbase mysql:client \
+ pathfix pgsql pkgconfig python:-2.7 shebangfix ssl
USE_LDCONFIG= yes
SHEBANG_FILES= tools/*.py
+PATHFIX_MAKEFILEIN= Makefile.am
CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-server --enable-ldap
+CONFIGURE_ARGS+= --enable-ldap
INSTALL_TARGET= install-strip
HAIWENDIR= www/haiwen
@@ -58,13 +61,11 @@ post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${SEABIN} ${STAGEDIR}${PREFIX}/${SEALIB}
${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-init ${STAGEDIR}${PREFIX}/${SEABIN}
${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-server ${STAGEDIR}${PREFIX}/${SEABIN}
- ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-servtool ${STAGEDIR}${PREFIX}/${SEABIN}
${RM} ${STAGEDIR}${PREFIX}/bin/ccnet-init \
- ${STAGEDIR}${PREFIX}/bin/ccnet-server \
- ${STAGEDIR}${PREFIX}/bin/ccnet-servtool
+ ${STAGEDIR}${PREFIX}/bin/ccnet-server
(cd ${STAGEDIR}${PREFIX}/lib && \
${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
+ @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
.include <bsd.port.mk>
Modified: head/net-mgmt/ccnet-server/distinfo
==============================================================================
--- head/net-mgmt/ccnet/distinfo Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/distinfo Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470238343
-SHA256 (haiwen-ccnet-v6.0.0-server_GH0.tar.gz) = bb7be1c4a6c0a6d4cc9456089c6d16bbeba72541a4a9b59ead8a4075f067fc93
-SIZE (haiwen-ccnet-v6.0.0-server_GH0.tar.gz) = 222098
+TIMESTAMP = 1481476651
+SHA256 (haiwen-ccnet-server-v6.0.6-server_GH0.tar.gz) = a8bb1cc138d64e535006ae39423ccf1f5e1bdc920a5fbe54769f52d0f5444f02
+SIZE (haiwen-ccnet-server-v6.0.6-server_GH0.tar.gz) = 210290
Modified: head/net-mgmt/ccnet-server/files/patch-Makefile.am
==============================================================================
--- head/net-mgmt/ccnet/files/patch-Makefile.am Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/files/patch-Makefile.am Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,13 +1,12 @@
---- Makefile.am.orig 2015-11-26 15:34:14 UTC
+--- Makefile.am.orig 2016-10-05 10:33:03 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
Modified: head/net-mgmt/ccnet-server/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/ccnet/files/patch-configure.ac Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/files/patch-configure.ac Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2015-11-11 09:50:52 UTC
+--- configure.ac.orig 2016-10-05 10:33:03 UTC
+++ configure.ac
-@@ -51,8 +51,16 @@ else
+@@ -52,8 +52,16 @@ else
AC_MSG_RESULT(no)
fi
@@ -18,7 +18,7 @@
blinux=true
AC_MSG_RESULT(compile in linux)
else
-@@ -154,6 +162,7 @@ AM_CONDITIONAL([COMPILE_DEMO], [test "${
+@@ -73,6 +81,7 @@ AM_CONDITIONAL([COMPILE_PYTHON], [test "
AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
@@ -26,7 +26,7 @@
# check libraries
-@@ -213,6 +222,7 @@ if test "$bwin32" = true; then
+@@ -132,6 +141,7 @@ if test "$bwin32" = true; then
LIBS=
LIB_RESOLV=
LIB_UUID=-lrpcrt4
@@ -34,7 +34,7 @@
LIB_IPHLPAPI=-liphlpapi
LIB_SHELL32=-lshell32
LIB_PSAPI=-lpsapi
-@@ -225,11 +235,25 @@ elif test "$bmac" = true ; then
+@@ -144,11 +154,25 @@ elif test "$bmac" = true ; then
LIB_INTL=
LIB_RESOLV=-lresolv
LIB_UUID=
@@ -60,7 +60,7 @@
else
LIB_WS32=
LIB_GDI32=
-@@ -237,6 +261,7 @@ else
+@@ -156,6 +180,7 @@ else
LIB_INTL=
LIB_RESOLV=-lresolv
LIB_UUID=-luuid
@@ -68,7 +68,7 @@
LIB_IPHLPAPI=
LIB_SHELL32=
LIB_PSAPI=
-@@ -250,6 +275,7 @@ AC_SUBST(LIB_RT)
+@@ -169,6 +194,7 @@ AC_SUBST(LIB_RT)
AC_SUBST(LIB_INTL)
AC_SUBST(LIB_RESOLV)
AC_SUBST(LIB_UUID)
Modified: head/net-mgmt/ccnet-server/files/patch-lib_Makefile.am
==============================================================================
--- head/net-mgmt/ccnet/files/patch-lib_Makefile.am Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/files/patch-lib_Makefile.am Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,4 +1,4 @@
---- lib/Makefile.am.orig 2015-11-26 15:34:14 UTC
+--- lib/Makefile.am.orig 2016-10-20 15:27:27 UTC
+++ lib/Makefile.am
@@ -61,6 +61,7 @@ libccnetd_la_SOURCES = utils.c db.c job-
libccnetd_la_LDFLAGS = -no-undefined
Modified: head/net-mgmt/ccnet-server/files/patch-lib_net.c
==============================================================================
--- head/net-mgmt/ccnet/files/patch-lib_net.c Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/files/patch-lib_net.c Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,4 +1,4 @@
---- lib/net.c.orig 2015-11-11 09:50:52 UTC
+--- lib/net.c.orig 2016-10-05 10:33:03 UTC
+++ lib/net.c
@@ -152,7 +152,11 @@ ccnet_net_bind_tcp (int port, int nonblo
Modified: head/net-mgmt/ccnet-server/files/patch-lib_utils.c
==============================================================================
--- head/net-mgmt/ccnet/files/patch-lib_utils.c Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/files/patch-lib_utils.c Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,4 +1,4 @@
---- lib/utils.c.orig 2016-01-08 11:43:49 UTC
+--- lib/utils.c.orig 2016-10-05 10:33:03 UTC
+++ lib/utils.c
@@ -43,6 +43,16 @@
Modified: head/net-mgmt/ccnet-server/files/patch-net_common_getgateway.c
==============================================================================
--- head/net-mgmt/ccnet/files/patch-net_common_getgateway.c Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/files/patch-net_common_getgateway.c Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,4 +1,4 @@
---- net/common/getgateway.c.orig 2015-11-11 09:50:52 UTC
+--- net/common/getgateway.c.orig 2016-10-05 10:33:03 UTC
+++ net/common/getgateway.c
@@ -34,7 +34,7 @@
#undef USE_SYSCTL_NET_ROUTE
Modified: head/net-mgmt/ccnet-server/pkg-descr
==============================================================================
--- head/net-mgmt/ccnet/pkg-descr Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/pkg-descr Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,6 +1,7 @@
Ccnet is a framework for writing networked applications in C. It provides
the services of peer identification, connection management, service
-invocation, and message sending. Server has the management of user, group,
-and cluster.
+invocation, and message sending. In ccnet network, there are two types of
+nodes, i.e., client and server. Server has the following functions, User
+management, Group management.
-WWW: https://github.com/haiwen/ccnet
+WWW: https://github.com/haiwen/ccnet-server
Modified: head/net-mgmt/ccnet-server/pkg-plist
==============================================================================
--- head/net-mgmt/ccnet/pkg-plist Sat Dec 24 08:40:18 2016 (r429314)
+++ head/net-mgmt/ccnet-server/pkg-plist Sun Dec 25 14:38:34 2016 (r429432)
@@ -1,7 +1,3 @@
-bin/ccnet
-bin/ccnet-demo-client
-bin/ccnet-demo-server
-bin/ccnet-tool
bin/ccnet-server
include/ccnet.h
include/ccnet/async-rpc-proc.h
@@ -32,7 +28,6 @@ lib/libccnet.so.0.0.0
libdata/pkgconfig/libccnet.pc
%%SEAFILE_SERVER%%/seafile/bin/ccnet-init
%%SEAFILE_SERVER%%/seafile/bin/ccnet-server
-%%SEAFILE_SERVER%%/seafile/bin/ccnet-servtool
%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.py
%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyc
%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/__init__.pyo
More information about the svn-ports-head
mailing list