Attachment #180931 for bug #217838

View | Details | Raw Unified | Return to bug 217838
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	zerotier
PORTVERSION=	1.2.2
CATEGORIES=	net

MAINTAINER=	dch@skunkwerks.at
COMMENT=	Network virtualization everywhere

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE.GPL-3

USES=		gmake compiler:c11
USE_RC_SUBR=	zerotier

USE_GITHUB=	yes
GH_ACCOUNT=	zerotier
GH_PROJECT=	ZeroTierOne

CFLAGS+=	-flax-vector-conversions

PLIST_FILES=	bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one

OPTIONS_DEFINE=	CONTROLLER

CONTROLLER_DESC=	Network management controller microservice support
CONTROLLER_USES=	sqlite
CONTROLLER_MAKE_ARGS=	ZT_ENABLE_NETWORK_CONTROLLER=1

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/
.for l in zerotier-cli zerotier-idtool

Lines 1-3 Link Here

(-)b/net/zerotier/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1475533093	1	TIMESTAMP = 1489815977
2	SHA256 (zerotier-ZeroTierOne-1.1.14_GH0.tar.gz) = d206069ad21c665159cdececb0a20a21758849ad73d91234d709962b26f634af	2	SHA256 (zerotier-ZeroTierOne-1.2.2_GH0.tar.gz) = b00040e859ac1d2b6ad9f22a5f4ad3bd876bb7e7b6bbd37d1ca2e59bbdf11a15
3	SIZE (zerotier-ZeroTierOne-1.1.14_GH0.tar.gz) = 11320427	3	SIZE (zerotier-ZeroTierOne-1.2.2_GH0.tar.gz) = 7926523




--- make-freebsd.mk.orig	2016-07-22 03:29:15 UTC
+++ make-freebsd.mk
@@ -1,5 +1,5 @@
-CC=cc
-CXX=c++
+CC?=cc
+CXX?=c++
 
 INCLUDES=
 DEFS=
@@ -18,6 +18,14 @@ ifeq ($(ZT_ENABLE_CLUSTER),1)
 	DEFS+=-DZT_ENABLE_CLUSTER
 endif
 
+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with SQLite network controller
+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
+	DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
+	INCLUDES+=-I$(LOCALBASE)/include
+	LDFLAGS+=-L$(LOCALBASE)/lib -lsqlite3
+	OBJS+=controller/SqliteNetworkController.o
+endif
+
 # "make debug" is a shortcut for this
 ifeq ($(ZT_DEBUG),1)
 	DEFS+=-DZT_TRACE

Return to bug 217838

Lines 2-31 Link Here

(-)b/net/zerotier/Makefile (-9 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zerotier	4	PORTNAME= zerotier
5	PORTVERSION= 1.1.14	5	PORTVERSION= 1.2.2
6	CATEGORIES= net	6	CATEGORIES= net
7		7
8	MAINTAINER= corsmith@gmail.com	8	MAINTAINER= dch@skunkwerks.at
9	COMMENT= Network virtualization everywhere	9	COMMENT= Network virtualization everywhere
10		10
11	LICENSE= GPLv3	11	LICENSE= GPLv3
12	LICENSE_FILE= ${WRKSRC}/LICENSE.GPL-3	12	LICENSE_FILE= ${WRKSRC}/LICENSE.GPL-3
13		13
14	USES= gmake	14	USES= gmake compiler:c11
15	USE_RC_SUBR= zerotier	15	USE_RC_SUBR= zerotier
16		16
17	USE_GITHUB= yes	17	USE_GITHUB= yes
		18	GH_ACCOUNT= zerotier
18	GH_PROJECT= ZeroTierOne	19	GH_PROJECT= ZeroTierOne
		20
19	CFLAGS+= -flax-vector-conversions	21	CFLAGS+= -flax-vector-conversions
20		22
21	PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one	23	PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one
22		24
23	OPTIONS_DEFINE= CONTROLLER
24
25	CONTROLLER_DESC= Network management controller microservice support
26	CONTROLLER_USES= sqlite
27	CONTROLLER_MAKE_ARGS= ZT_ENABLE_NETWORK_CONTROLLER=1
28
29	do-install:	25	do-install:
30	${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/	26	${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/
31	.for l in zerotier-cli zerotier-idtool	27	.for l in zerotier-cli zerotier-idtool

Removed Link Here

(-)a/net/zerotier/files/patch-make-freebsd.mk (-25 lines)
1	--- make-freebsd.mk.orig 2016-07-22 03:29:15 UTC
2	+++ make-freebsd.mk
3	@@ -1,5 +1,5 @@
4	-CC=cc
5	-CXX=c++
6	+CC?=cc
7	+CXX?=c++
8
9	INCLUDES=
10	DEFS=
11	@@ -18,6 +18,14 @@ ifeq ($(ZT_ENABLE_CLUSTER),1)
12	DEFS+=-DZT_ENABLE_CLUSTER
13	endif
14
15	+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with SQLite network controller
16	+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
17	+ DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
18	+ INCLUDES+=-I$(LOCALBASE)/include
19	+ LDFLAGS+=-L$(LOCALBASE)/lib -lsqlite3
20	+ OBJS+=controller/SqliteNetworkController.o
21	+endif
22	+
23	# "make debug" is a shortcut for this
24	ifeq ($(ZT_DEBUG),1)
25	DEFS+=-DZT_TRACE