svn commit: r429523 - in head: . net-mgmt net-mgmt/ccnet net-mgmt/ccnet-client net-mgmt/seafile-gui

Thomas Zander riggs at FreeBSD.org
Mon Dec 26 14:26:48 UTC 2016 

Author: riggs
Date: Mon Dec 26 14:26:47 2016
New Revision: 429523
URL: https://svnweb.freebsd.org/changeset/ports/429523

Log:
  Move net-mgmt/ccnet to net-mgmt/ccnet-client, update to upstream ver 6.0.1
  
  PR:		215359
  Submitted by:	Ultima1252 at gmail.com (maintainer)

Added:
  head/net-mgmt/ccnet-client/
     - copied from r429522, head/net-mgmt/ccnet/
Deleted:
  head/net-mgmt/ccnet/
Modified:
  head/MOVED
  head/net-mgmt/Makefile
  head/net-mgmt/ccnet-client/Makefile
  head/net-mgmt/ccnet-client/distinfo
  head/net-mgmt/ccnet-client/pkg-plist
  head/net-mgmt/seafile-gui/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Dec 26 14:12:26 2016	(r429522)
+++ head/MOVED	Mon Dec 26 14:26:47 2016	(r429523)
@@ -8848,3 +8848,4 @@ x11-toolkits/py-kiwi|x11-toolkits/py-kiw
 www/py33-requests|www/py3-requests|2016-12-26|No need for 4 versions of py-requests
 www/py34-requests|www/py3-requests|2016-12-26|No need for 4 versions of py-requests
 www/py35-requests|www/py3-requests|2016-12-26|No need for 4 versions of py-requests
+net-mgmt/ccnet|net-mgmt/ccnet-client|2016-12-26|Split into -client and -server parts

Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile	Mon Dec 26 14:12:26 2016	(r429522)
+++ head/net-mgmt/Makefile	Mon Dec 26 14:26:47 2016	(r429523)
@@ -27,7 +27,7 @@
     SUBDIR += bwm-ng
     SUBDIR += cacti
     SUBDIR += cacti-spine
-    SUBDIR += ccnet
+    SUBDIR += ccnet-client
     SUBDIR += ccnet-server
     SUBDIR += cdpd
     SUBDIR += cdpr

Modified: head/net-mgmt/ccnet-client/Makefile
==============================================================================
--- head/net-mgmt/ccnet/Makefile	Mon Dec 26 14:12:26 2016	(r429522)
+++ head/net-mgmt/ccnet-client/Makefile	Mon Dec 26 14:26:47 2016	(r429523)
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	ccnet
-PORTVERSION=	6.0.0
+PORTNAME=	ccnet-client
+PORTVERSION=	6.0.1
 DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	-server
-PORTREVISION=	1
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima1252 at gmail.com
@@ -27,6 +25,7 @@ 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
@@ -35,39 +34,13 @@ SHEBANG_FILES=	tools/*.py
 
 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
-SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
-SEABIN=		${SEAFILE_SERVER}/seafile/bin
-SEALIB=		${SEAFILE_SERVER}/seafile/lib
-
-USERS=		seafile
-GROUPS=		${USERS}
-
-PLIST_SUB=	USERS=${USERS} \
-		GROUPS=${GROUPS} \
-		SEAFILE_SERVER=${SEAFILE_SERVER} \
-		HAIWENDIR=${HAIWENDIR}
-
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 WITH_OPENSSL_PORT=	yes
 .endif
 
-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
-	(cd ${STAGEDIR}${PREFIX}/lib && \
-		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
-	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
-
 .include <bsd.port.mk>

Modified: head/net-mgmt/ccnet-client/distinfo
==============================================================================
--- head/net-mgmt/ccnet/distinfo	Mon Dec 26 14:12:26 2016	(r429522)
+++ head/net-mgmt/ccnet-client/distinfo	Mon Dec 26 14:26:47 2016	(r429523)
@@ -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 = 1481772896
+SHA256 (haiwen-ccnet-v6.0.1_GH0.tar.gz) = fc477904240ada0e3f20d840d40e50c4f1693959e6dc78817616f5f49aa4d227
+SIZE (haiwen-ccnet-v6.0.1_GH0.tar.gz) = 222193

Modified: head/net-mgmt/ccnet-client/pkg-plist
==============================================================================
--- head/net-mgmt/ccnet/pkg-plist	Mon Dec 26 14:12:26 2016	(r429522)
+++ head/net-mgmt/ccnet-client/pkg-plist	Mon Dec 26 14:26:47 2016	(r429523)
@@ -1,8 +1,9 @@
 bin/ccnet
 bin/ccnet-demo-client
 bin/ccnet-demo-server
+bin/ccnet-init
+bin/ccnet-servtool
 bin/ccnet-tool
-bin/ccnet-server
 include/ccnet.h
 include/ccnet/async-rpc-proc.h
 include/ccnet/ccnet-client.h
@@ -29,59 +30,55 @@ 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
-%%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
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/__init__.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/async_client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/mqclientproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/processor.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/rpcserverproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/sendcmdproc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/async/timer.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/errors.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/message.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/packet.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/pool.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/rpc.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/status_code.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/sync_client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/ccnet/utils.pyo
- at dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%

Modified: head/net-mgmt/seafile-gui/Makefile
==============================================================================
--- head/net-mgmt/seafile-gui/Makefile	Mon Dec 26 14:12:26 2016	(r429522)
+++ head/net-mgmt/seafile-gui/Makefile	Mon Dec 26 14:26:47 2016	(r429523)
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 		libsearpc.so:devel/libsearpc \
 		libseafile.so:net-mgmt/seafile \
 		libsqlite3.so:databases/sqlite3 \
-		libccnet.so:net-mgmt/ccnet \
+		libccnet.so:net-mgmt/ccnet-client \
 		libjansson.so:devel/jansson \
 		libevent.so:devel/libevent2 \
 		libuuid.so:misc/e2fsprogs-libuuid

More information about the svn-ports-all mailing list