From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 24 05:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 EBFD34EA for ; Wed, 24 Apr 2013 05:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id CDB77102D for ; Wed, 24 Apr 2013 05:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3O5o0Md017079 for ; Wed, 24 Apr 2013 05:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3O5o0So017078; Wed, 24 Apr 2013 05:50:00 GMT (envelope-from gnats) Resent-Date: Wed, 24 Apr 2013 05:50:00 GMT Resent-Message-Id: <201304240550.r3O5o0So017078@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthew Grooms Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2A823380 for ; Wed, 24 Apr 2013 05:44:29 +0000 (UTC) (envelope-from mgrooms@ops.shrew.net) Received: from ops.shrew.net (ops.shrew.net [38.97.5.125]) by mx1.freebsd.org (Postfix) with ESMTP id EA3341FE5 for ; Wed, 24 Apr 2013 05:44:28 +0000 (UTC) Received: from ops.shrew.net (localhost [127.0.0.1]) by ops.shrew.net (8.14.5/8.14.5) with ESMTP id r3O5h5c4055372; Wed, 24 Apr 2013 00:43:05 -0500 (CDT) (envelope-from mgrooms@ops.shrew.net) Received: (from mgrooms@localhost) by ops.shrew.net (8.14.5/8.14.5/Submit) id r3O5h4fU055371; Wed, 24 Apr 2013 00:43:04 -0500 (CDT) (envelope-from mgrooms) Message-Id: <201304240543.r3O5h4fU055371@ops.shrew.net> Date: Wed, 24 Apr 2013 00:43:04 -0500 (CDT) From: Matthew Grooms To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/178100: Update ike port to 2.2.0 Cc: mgrooms@shrew.net X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Matthew Grooms List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 05:50:01 -0000 >Number: 178100 >Category: ports >Synopsis: Update ike port to 2.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 24 05:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Matthew Grooms >Release: FreeBSD 9.1-RELEASE amd64 >Organization: ShrewSoft Inc >Environment: System: FreeBSD ops.shrew.net 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update ike port from 2.1.7 to 2.2.0 >How-To-Repeat: n/a >Fix: n/a --- ike-2.2.0.diff begins here --- Index: ike/Makefile =================================================================== --- ike/Makefile (revision 315810) +++ ike/Makefile (working copy) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= ike -PORTVERSION= 2.1.7 -PORTREVISION= 1 +PORTVERSION= 2.2.0 +PORTREVISION= 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 +22,8 @@ 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" @@ -50,8 +52,8 @@ .ifdef(WITH_QTGUI) CMAKE_ARGS+= -DQTGUI=YES -USE_QT_VER= 3 -MAN1= ikea.1 ikec.1 +USE_QT_VER= 4 +MAN1= qikea.1 qikec.1 PLIST_SUB+= QTGUI="" .else PLIST_SUB+= QTGUI="@comment " @@ -70,17 +72,7 @@ @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 \ ${ECHO_MSG} "===> -------------------------------------------------------------------------"; \ Index: ike/distinfo =================================================================== --- ike/distinfo (revision 315810) +++ ike/distinfo (working copy) @@ -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 Index: ike/files/patch-CMakeLists.txt =================================================================== --- ike/files/patch-CMakeLists.txt (revision 315810) +++ ike/files/patch-CMakeLists.txt (working copy) @@ -1,23 +0,0 @@ ---- ./CMakeLists.txt.orig 2011-02-23 17:46:26.964357643 +0300 -+++ ./CMakeLists.txt 2011-02-23 17:56:25.405358356 +0300 -@@ -62,13 +62,13 @@ - # Path Option Checks - # - --if( NOT EXISTS ${CMAKE_INSTALL_PREFIX} ) -- -- set( -- CMAKE_INSTALL_PREFIX -- "/usr" ) -- --endif( NOT EXISTS ${CMAKE_INSTALL_PREFIX} ) -+#if( NOT EXISTS ${CMAKE_INSTALL_PREFIX} ) -+# -+# set( -+# CMAKE_INSTALL_PREFIX -+# "/usr" ) -+# -+#endif( NOT EXISTS ${CMAKE_INSTALL_PREFIX} ) - - message( - STATUS Index: ike/pkg-plist =================================================================== --- ike/pkg-plist (revision 315810) +++ ike/pkg-plist (working copy) @@ -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 --- ike-2.2.0.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: