From owner-svn-ports-all@freebsd.org Thu Mar 31 14:54:46 2016 Return-Path: Delivered-To: svn-ports-all@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 E841BAE4908; Thu, 31 Mar 2016 14:54:46 +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 C3B1F1774; Thu, 31 Mar 2016 14:54:46 +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 u2VEsj9U024374; Thu, 31 Mar 2016 14:54:45 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2VEsjZM024372; Thu, 31 Mar 2016 14:54:45 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603311454.u2VEsjZM024372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 31 Mar 2016 14:54:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412229 - head/security/ike X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2016 14:54:47 -0000 Author: amdmi3 Date: Thu Mar 31 14:54:45 2016 New Revision: 412229 URL: https://svnweb.freebsd.org/changeset/ports/412229 Log: - Switch to USES=tar:tbz2 - Switch to options helpers - Fix typo - Fix plist for WITH=QTGUI case Approved by: portmgr blanket Modified: head/security/ike/Makefile head/security/ike/pkg-plist Modified: head/security/ike/Makefile ============================================================================== --- head/security/ike/Makefile Thu Mar 31 14:52:39 2016 (r412228) +++ head/security/ike/Makefile Thu Mar 31 14:54:45 2016 (r412229) @@ -7,7 +7,6 @@ PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= https://www.shrew.net/download/ike/ DISTNAME= ${PORTNAME}-${PORTVERSION}-release -EXTRACT_SUFX= .tbz2 MAINTAINER= mgrooms@shrew.net COMMENT= Shrew Soft IKE daemon and client tools @@ -15,60 +14,45 @@ COMMENT= Shrew Soft IKE daemon and clien ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= iked -USES= bison cmake libedit tar:bzip2 +USES= bison cmake libedit tar:tbz2 USE_OPENSSL= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} -CMAKE_ARGS+= -DETCDIR:PATH="${PREFIX}/etc" \ +CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \ -DBINDIR:PATH="${PREFIX}/bin" \ -DSBINDIR:PATH="${PREFIX}/sbin" \ -DLIBDIR:PATH="${PREFIX}/lib" \ -DMANDIR:PATH="${PREFIX}/man" OPTIONS_DEFINE= QTGUI NATT LDAP DEBUG +OPTIONS_SUB= yes + QTGUI_DESC= Enable QT client front end applications NATT_DESC= Enable NAT-Traversal LDAP_DESC= Enable LDAP XAuth daemon support -.include +DEBUG_CMAKE_ON= -DDEBUG=YES -.if ${PORT_OPTIONS:MDEBUG} -CMAKE_ARGS+= -DDEBUG=YES -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= YES -CMAKE_ARGS+= -DLDAP=YES -.endif - -.if ${PORT_OPTIONS:MNATT} -CMAKE_ARGS+= -DNATT=YES -.endif - -.if ${PORT_OPTIONS:MQTGUI} -CMAKE_ARGS+= -DQTGUI=YES -USE_QT_VER= 4 -USE_QT4= gui moc_build qmake_build rcc_build uic_build -MAN1+= qikea.1 qikec.1 -PLIST_SUB+= QTGUI="" -.else -PLIST_SUB+= QTGUI="@comment " -.endif +LDAP_USE= OPENLDAP=yes +LDAP_CMAKE_ON= -DLDAP=YES +NATT_CMAKE_ON= -DNATT=YES +QTGUI_CMAKE_ON= -DQTGUI=YES +QTGUI_USE= QT4=gui,moc_build,qmake_build,rcc_build,uic_build post-install: @if ! ${SYSCTL} -a | ${GREP} -q ipsec; then \ ${ECHO_MSG} "===> -------------------------------------------------------------------------"; \ - ${ECHO_MSG} "===> WARNNG: You need IPsec support in your kernel, please see:"; \ + ${ECHO_MSG} "===> WARNING: You need IPsec support in your kernel, please see:"; \ ${ECHO_MSG} "===> http://www.freebsd.org/doc/en/books/handbook/ipsec.html"; \ ${ECHO_MSG} "===> -------------------------------------------------------------------------"; \ fi ; -.if ${PORT_OPTIONS:MNATT} + +post-install-NATT-on: @${ECHO_MSG} "===> -------------------------------------------------------------------------" @${ECHO_MSG} "===> WARNING: To use NAT Traversal ( NAT-T ) support, please be sure to" @${ECHO_MSG} "===> include the following line in your kernel config file." @${ECHO_MSG} "===> options IPSEC_NAT_T" @${ECHO_MSG} "===> -------------------------------------------------------------------------" -.endif .include Modified: head/security/ike/pkg-plist ============================================================================== --- head/security/ike/pkg-plist Thu Mar 31 14:52:39 2016 (r412228) +++ head/security/ike/pkg-plist Thu Mar 31 14:54:45 2016 (r412229) @@ -16,5 +16,7 @@ lib/libss_log.so.2.2.1 lib/libss_pfk.so lib/libss_pfk.so.2.2.1 man/man1/ikec.1.gz +%%QTGUI%%man/man1/qikea.1.gz +%%QTGUI%%man/man1/qikec.1.gz man/man5/iked.conf.5.gz man/man8/iked.8.gz