From 3f77d0bfb109742b85245fdd9cb21e87fd34e835 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Fri, 19 Nov 2010 19:44:49 +0000 Subject: [PATCH] gogoc is gogoCLIENT, which is needed to connect to Freenet6 tunnel. Freenet6 Tunnel is an IPv6 access service which enables thousands of people from all over the world to experience the best solution for a smooth and incremental deployment of IPv6. Freenet6 Tunnel users can get IPv6 connectivity from anywhere, including from behind any NAT device or from outside of their home network. WWW: http://gogonet.gogo6.com/page/freenet6-services Two similar PRs were sent for the port, take the first one with some modifications from the second one. Tomaz will be the maintainer. patch-env by rene@ PR: ports/147944, ports/149682 Submitted by: Tomaz Muraus [kami 5-storitve.net] , Andrey [drurus gmail.com] --- net/Makefile | 1 + net/gogoc/Makefile | 49 ++++++++++ net/gogoc/distinfo | 2 + net/gogoc/files/gogoc.in | 31 +++++++ net/gogoc/files/patch-env | 190 ++++++++++++++++++++++++++++++++++++++ net/gogoc/pkg-descr | 9 ++ net/gogoc/pkg-plist | 7 ++ 7 files changed, 289 insertions(+) create mode 100644 net/gogoc/Makefile create mode 100644 net/gogoc/distinfo create mode 100644 net/gogoc/files/gogoc.in create mode 100644 net/gogoc/files/patch-env create mode 100644 net/gogoc/pkg-descr create mode 100644 net/gogoc/pkg-plist diff --git a/net/Makefile b/net/Makefile index 7b035183d935..17026180b40a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -196,6 +196,7 @@ SUBDIR += gnu-dico SUBDIR += gnu-radius SUBDIR += gofish + SUBDIR += gogoc SUBDIR += googlecl SUBDIR += googolplex SUBDIR += gopher diff --git a/net/gogoc/Makefile b/net/gogoc/Makefile new file mode 100644 index 000000000000..56eee61223fe --- /dev/null +++ b/net/gogoc/Makefile @@ -0,0 +1,49 @@ +# New ports collection makefile for: gogoc +# Date created: 17 June 2010 +# Whom: Tomaž Muraus +# +# $FreeBSD$ +# + +PORTNAME= gogoc +PORTVERSION= 1.2 +CATEGORIES= net ipv6 +MASTER_SITES= http://gogo6.com/downloads/ +DISTNAME= gogoc-1_2-RELEASE + +MAINTAINER= kami@k5-storitve.net +COMMENT= GogoCLIENT, connect to Freenet6 tunnel + +USE_GMAKE= yes +USE_RC_SUBR= gogoc +USE_OPENSSL= yes + +MAKE_JOBS_UNSAFE= yes + +MAN5= gogoc.conf.5 +MAN8= gogoc.8 + +PORTDOCS= README CLIENT-LICENSE.TXT GUI-LICENSE.TXT + +SUB_FILES= gogoc +SUB_LIST= LOCALBASE=${LOCALBASE} + +do-install: + cd ${WRKSRC}/gogoc-tsp/ && \ + ${GMAKE} platform=freebsd installdir=${PREFIX} install + ${RM} ${PREFIX}/bin/gogoc.conf* + ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${EXAMPLESDIR} + +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif + + @if [ ! -f ${PREFIX}/etc/gogoc.conf ]; then \ + ${TOUCH} ${PREFIX}/etc/gogoc.conf ; \ + fi + +.include diff --git a/net/gogoc/distinfo b/net/gogoc/distinfo new file mode 100644 index 000000000000..b74375d14f21 --- /dev/null +++ b/net/gogoc/distinfo @@ -0,0 +1,2 @@ +SHA256 (gogoc-1_2-RELEASE.tar.gz) = a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49 +SIZE (gogoc-1_2-RELEASE.tar.gz) = 249286 diff --git a/net/gogoc/files/gogoc.in b/net/gogoc/files/gogoc.in new file mode 100644 index 000000000000..14ebd3897313 --- /dev/null +++ b/net/gogoc/files/gogoc.in @@ -0,0 +1,31 @@ +#!/bin/sh + +# PROVIDE: gogoc +# REQUIRE: NETWORK +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# gogoc_enable (bool): Set to NO by default. +# Set it to YES to enable gogoc. +# +# Additional configurable variables: +# gogoc_config (path): Set to %%LOCALBASE%%/etc/gogoc.conf +# by default. + +. /etc/rc.subr + +name="gogoc" +rcvar=${name}_enable + +command=%%LOCALBASE%%/bin/${name} + +load_rc_config $name + +: ${gogoc_enable="NO"} +: ${gogoc_config="%%LOCALBASE%%/etc/gogoc.conf"} + +command_args="-f $gogoc_config" + +run_rc_command "$1" + diff --git a/net/gogoc/files/patch-env b/net/gogoc/files/patch-env new file mode 100644 index 000000000000..fa769e653f81 --- /dev/null +++ b/net/gogoc/files/patch-env @@ -0,0 +1,190 @@ +--- gogoc-pal/Makefile.orig 2010-03-07 17:38:30.000000000 +0100 ++++ gogoc-pal/Makefile 2010-11-19 19:40:21.000000000 +0100 +@@ -27,11 +27,10 @@ + PLATFORM :=$(shell [ -z "$(platform)" ] && uname | tr "[A-Z]" "[a-z]" || echo "$(platform)" ) + + SUPPORTED_PLATFORMS=linux netbsd freebsd openbsd darwin sunos gogocpe +-CC=gcc ++CC?=gcc +- + + # Export these variables to sub-makes. +-export PLATFORM PLATFORM_DIR OBJS_DIR DEFS_DIR OUT_INC_DIR CC DEBUG ++export PLATFORM PLATFORM_DIR OBJS_DIR DEFS_DIR OUT_INC_DIR DEBUG + + + # +--- gogoc-tsp/src/lib/Makefile.orig 2009-11-20 17:53:36.000000000 +0100 ++++ gogoc-tsp/src/lib/Makefile 2010-11-19 19:42:39.000000000 +0100 +@@ -14,11 +14,11 @@ + + + ifdef DEBUG +-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG ++CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG + else +-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT ++CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT + endif +-CC=gcc ++CC?=gcc + + OBJS=$(OBJS_DIR)/base64.o \ + $(OBJS_DIR)/cli.o \ +--- gogoc-tsp/src/net/Makefile.orig 2009-11-20 17:53:38.000000000 +0100 ++++ gogoc-tsp/src/net/Makefile 2010-11-19 19:43:55.000000000 +0100 +@@ -14,11 +14,11 @@ + + + ifdef DEBUG +-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG ++CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG + else +-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT ++CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT + endif +-CC=gcc ++CC?=gcc + + OBJS=$(OBJS_DIR)/net.o \ + $(OBJS_DIR)/net_rudp.o \ +--- gogoc-tsp/src/tsp/Makefile.orig 2009-11-20 17:53:40.000000000 +0100 ++++ gogoc-tsp/src/tsp/Makefile 2010-11-19 19:50:22.000000000 +0100 +@@ -14,11 +14,11 @@ + + + ifdef DEBUG +-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG ++CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG + else +-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT ++CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT + endif +-CC=gcc ++CC?=gcc + + OBJS=$(OBJS_DIR)/tsp_auth.o \ + $(OBJS_DIR)/tsp_cap.o \ +--- gogoc-tsp/src/xml/Makefile.orig 2009-11-20 17:53:42.000000000 +0100 ++++ gogoc-tsp/src/xml/Makefile 2010-11-19 19:51:14.000000000 +0100 +@@ -14,11 +14,11 @@ + + + ifdef DEBUG +-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG ++CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG + else +-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT ++CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT + endif +-CC=gcc ++CC?=gcc + + OBJS=$(OBJS_DIR)/xmlparse.o \ + $(OBJS_DIR)/xml_req.o \ +--- gogoc-tsp/platform/freebsd/Makefile.orig 2009-11-20 17:53:23.000000000 +0100 ++++ gogoc-tsp/platform/freebsd/Makefile 2010-11-19 19:53:22.000000000 +0100 +@@ -13,13 +13,13 @@ + -include platform.mak + + ifdef DEBUG +-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG +-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ ++CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG ++LDFLAGS+=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -pthread -lstdc++ + else +-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT +-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ ++CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT ++LDFLAGS+=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -pthread -lstdc++ + endif +-CC=gcc ++CC?=gcc + + OBJS=$(OBJS_DIR)/tsp_local.o \ + $(OBJS_DIR)/tsp_tun.o +--- gogoc-tsp/platform/unix-common/Makefile.orig 2009-11-20 17:53:30.000000000 +0100 ++++ gogoc-tsp/platform/unix-common/Makefile 2010-11-19 19:53:49.000000000 +0100 +@@ -13,11 +13,11 @@ + -include $(PLATFORM_DIR)/$(PLATFORM)/platform.mak + + ifdef DEBUG +-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG ++CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG + else +-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) ++CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) + endif +-CC=gcc ++CC?=gcc + + OS_UNAME=os_uname.h + OBJS=$(OBJS_DIR)/unix-main.o +--- gogoc-config/Makefile.orig 2009-11-20 17:30:23.000000000 +0100 ++++ gogoc-config/Makefile 2010-11-19 20:06:16.000000000 +0100 +@@ -23,20 +23,20 @@ + GOGOCPALLIB_DIR=$(GOGOCPAL)/out_lib + GOGOCPALLIB=gogocpal + +-CC=gcc ++CC?=gcc +-CXX=g++ ++CXX?=g++ +-LD=g++ ++LD?=g++ +-RANLIB=ranlib ++RANLIB?=ranlib +-AR=ar ++AR?=ar + + ifdef DEBUG +-CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) +-CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) +-LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) ++CXXFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) ++CFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) ++LDFLAGS+=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) + else +-CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) +-CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) +-LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) ++CXXFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) ++CFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) ++LDFLAGS+=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) + endif + + +--- gogoc-messaging/Makefile.orig 2009-11-20 17:34:50.000000000 +0100 ++++ gogoc-messaging/Makefile 2010-11-19 20:11:29.000000000 +0100 +@@ -21,20 +21,20 @@ + GOGOCPALLIB_DIR=$(GOGOCPAL)/out_lib + GOGOCPALLIB=gogocpal + +-CC=gcc ++CC?=gcc +-CXX=g++ ++CXX?=g++ +-LD=g++ ++LD?=g++ +-RANLIB=ranlib ++RANLIB?=ranlib +-AR=ar ++AR?=ar + + ifdef DEBUG +-CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) +-CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) +-LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) ++CXXFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) ++CFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) ++LDFLAGS+=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) + else +-CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) +-CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) +-LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) ++CXXFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS) ++CFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS) ++LDFLAGS+=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS) + endif + + diff --git a/net/gogoc/pkg-descr b/net/gogoc/pkg-descr new file mode 100644 index 000000000000..be67c67fe4ce --- /dev/null +++ b/net/gogoc/pkg-descr @@ -0,0 +1,9 @@ +gogoc is gogoCLIENT, which is needed to connect to Freenet6 tunnel. + +Freenet6 Tunnel is an IPv6 access service which enables thousands of people +from all over the world to experience the best solution for a smooth and +incremental deployment of IPv6. Freenet6 Tunnel users can get IPv6 connectivity +from anywhere, including from behind any NAT device or from outside of their +home network. + +WWW: http://gogonet.gogo6.com/page/freenet6-services diff --git a/net/gogoc/pkg-plist b/net/gogoc/pkg-plist new file mode 100644 index 000000000000..654afdb5360f --- /dev/null +++ b/net/gogoc/pkg-plist @@ -0,0 +1,7 @@ +bin/gogoc +%%ETCDIR%%.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gogoc.conf.sample +template/README +template/freebsd.sh +@dirrm template +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%