From owner-svn-ports-head@freebsd.org Fri Nov 11 09:00:14 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AF3EC3AE65; Fri, 11 Nov 2016 09:00:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31B111B68; Fri, 11 Nov 2016 09:00:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAB90D63024500; Fri, 11 Nov 2016 09:00:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAB90Ds1024499; Fri, 11 Nov 2016 09:00:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201611110900.uAB90Ds1024499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 11 Nov 2016 09:00:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425876 - head/net/sixxs-aiccu X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2016 09:00:14 -0000 Author: amdmi3 Date: Fri Nov 11 09:00:13 2016 New Revision: 425876 URL: https://svnweb.freebsd.org/changeset/ports/425876 Log: - Switch to options helpers Modified: head/net/sixxs-aiccu/Makefile Modified: head/net/sixxs-aiccu/Makefile ============================================================================== --- head/net/sixxs-aiccu/Makefile Fri Nov 11 08:57:31 2016 (r425875) +++ head/net/sixxs-aiccu/Makefile Fri Nov 11 09:00:13 2016 (r425876) @@ -15,29 +15,26 @@ COMMENT= SixXS IPv6 TIC+ tunnel broker h LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/doc/LICENSE +WRKSRC= ${WRKDIR}/aiccu +BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console + USE_RC_SUBR= sixxs-aiccu USES= gmake - +MAKE_ARGS= CC="${CC}" LDFLAGS="${LDFLAGS}" CFLAGS+= -D_REENTRANT -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib -MAKE_ARGS+= CC="${CC}" LDFLAGS="${LDFLAGS}" -WRKSRC= ${WRKDIR}/aiccu -BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console + PORTDOCS= README OPTIONS_DEFINE= GNUTLS LOG_DAEMON DOCS +OPTIONS_DEFAULT= GNUTLS + GNUTLS_DESC= Use gnutls to secure TIC supporting starttls LOG_DAEMON_DESC=Log to LOG_DAEMON instead to LOG_LOCAL7 -OPTIONS_DEFAULT+= GNUTLS - -.include - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:security/gnutls -CFLAGS+= -DAICCU_GNUTLS -LDFLAGS+= -lgnutls -.endif +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CFLAGS= -DAICCU_GNUTLS +GNUTLS_LDFLAGS= -lgnutls post-patch: @${REINPLACE_CMD} \ @@ -49,17 +46,17 @@ post-patch: -e 's:ipv6_interface sixxs:ipv6_interface gif0:' \ ${WRKSRC}/doc/aiccu.conf -.if ${PORT_OPTIONS:MLOG_DAEMON} -do-configure: +post-patch-LOG_DAEMON-on: @${REINPLACE_CMD} \ -e 's:LOG_LOCAL7:LOG_DAEMON:' \ ${WRKSRC}/common/common.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${STAGEDIR}${PREFIX}/sbin/sixxs-aiccu - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${STAGEDIR}${PREFIX}/etc/aiccu.conf.sample +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR} + .include