From owner-svn-ports-all@FreeBSD.ORG Thu May 2 14:04:26 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C6D0D290; Thu, 2 May 2013 14:04:26 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B887B1EA8; Thu, 2 May 2013 14:04:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42E4QCl073329; Thu, 2 May 2013 14:04:26 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42E4PoM073326; Thu, 2 May 2013 14:04:25 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201305021404.r42E4PoM073326@svn.freebsd.org> From: Pawel Pekala Date: Thu, 2 May 2013 14:04:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317114 - in head/security/ike: . files 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.14 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, 02 May 2013 14:04:26 -0000 Author: pawel Date: Thu May 2 14:04:25 2013 New Revision: 317114 URL: http://svnweb.freebsd.org/changeset/ports/317114 Log: Update to version 2.2.0 PR: ports/178100 Submitted by: Matthew Grooms (maintainer) Deleted: head/security/ike/files/patch-CMakeLists.txt Modified: head/security/ike/Makefile head/security/ike/distinfo (contents, props changed) head/security/ike/pkg-plist (contents, props changed) Modified: head/security/ike/Makefile ============================================================================== --- head/security/ike/Makefile Thu May 2 13:29:28 2013 (r317113) +++ head/security/ike/Makefile Thu May 2 14:04:25 2013 (r317114) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= ike -PORTVERSION= 2.1.7 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= security net -MASTER_SITES= http://www.shrew.net/download/ike/ +MASTER_SITES= https://www.shrew.net/download/ike/ DISTNAME= ${PORTNAME}-${PORTVERSION}-release EXTRACT_SUFX= .tbz2 @@ -22,6 +21,8 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} CMAKE_ARGS+= -DETCDIR:PATH="${PREFIX}/etc" \ + -DBINDIR:PATH="${PREFIX}/bin" \ + -DSBINDIR:PATH="${PREFIX}/sbin" \ -DLIBDIR:PATH="${PREFIX}/lib" \ -DMANDIR:PATH="${PREFIX}/man" @@ -32,6 +33,7 @@ LDAP_DESC= Enable LDAP XAuth daemon supp .include +MAN1= ikec.1 MAN5= iked.conf.5 MAN8= iked.8 @@ -50,8 +52,9 @@ CMAKE_ARGS+= -DNATT=YES .if ${PORT_OPTIONS:MQTGUI} CMAKE_ARGS+= -DQTGUI=YES -USE_QT_VER= 3 -MAN1= ikea.1 ikec.1 +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 " @@ -70,16 +73,6 @@ post-patch: @sleep 3 . endif .endif - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ - ${WRKSRC}/CMakeLists.txt - -post-build: -# QT 3.3 UIC (User Interface Compiler) creates these, so remove them. -# Otherwise x11-toolkits/qt33 would have to be patched, as Gentoo did. -.for f in .qt_plugins_* qt_plugins_* - @${RM} -f ${LOCALBASE}/etc/settings/${f} -.endfor - @${RMDIR} ${LOCALBASE}/etc/settings || ${TRUE} post-install: @if ! ${SYSCTL} -a | ${GREP} -q ipsec; then \ Modified: head/security/ike/distinfo ============================================================================== --- head/security/ike/distinfo Thu May 2 13:29:28 2013 (r317113) +++ head/security/ike/distinfo Thu May 2 14:04:25 2013 (r317114) @@ -1,2 +1,2 @@ -SHA256 (ike-2.1.7-release.tbz2) = 28e64efcec165522a775657a6c2c2263a3d03a78b114f62f5e30f4d38602edba -SIZE (ike-2.1.7-release.tbz2) = 581284 +SHA256 (ike-2.2.0-release.tbz2) = 94a62f9a13dbf37c2ccba168cbc21c4a663d0f4d36aa0cf04fdac7061ba8dc48 +SIZE (ike-2.2.0-release.tbz2) = 671927 Modified: head/security/ike/pkg-plist ============================================================================== --- head/security/ike/pkg-plist Thu May 2 13:29:28 2013 (r317113) +++ head/security/ike/pkg-plist Thu May 2 14:04:25 2013 (r317114) @@ -1,10 +1,19 @@ @unexec if cmp -s %D/etc/iked.conf %D/etc/iked.conf.sample; then rm -f %D/etc/iked.conf; fi etc/iked.conf.sample @exec [ -f %D/etc/iked.conf ] || cp %D/etc/iked.conf.sample %D/etc/iked.conf +bin/ikec sbin/iked -%%QTGUI%%bin/ikea -%%QTGUI%%bin/ikec -lib/libike.so -lib/libike.so.2.1.7 -lib/libpfk.so -lib/libpfk.so.2.1.7 +%%QTGUI%%bin/qikea +%%QTGUI%%bin/qikec +lib/libss_idb.so +lib/libss_idb.so.2.2.0 +lib/libss_ike.so +lib/libss_ike.so.2.2.0 +lib/libss_ip.so +lib/libss_ip.so.2.2.0 +lib/libss_ith.so +lib/libss_ith.so.2.2.0 +lib/libss_log.so +lib/libss_log.so.2.2.0 +lib/libss_pfk.so +lib/libss_pfk.so.2.2.0