From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 23 15:20:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3444E1065673 for ; Wed, 23 Feb 2011 15:20:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E99AD8FC1A for ; Wed, 23 Feb 2011 15:20:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1NFKBUL001828 for ; Wed, 23 Feb 2011 15:20:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1NFKBRT001827; Wed, 23 Feb 2011 15:20:11 GMT (envelope-from gnats) Resent-Date: Wed, 23 Feb 2011 15:20:11 GMT Resent-Message-Id: <201102231520.p1NFKBRT001827@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, Yuri Pankov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F5F4106566B for ; Wed, 23 Feb 2011 15:12:50 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from darklight.org.ru (darklight.org.ru [IPv6:2001:470:28:4ba::1]) by mx1.freebsd.org (Postfix) with ESMTP id 129B28FC14 for ; Wed, 23 Feb 2011 15:12:48 +0000 (UTC) Received: from darklight.org.ru (yuri@darklight.org.ru [IPv6:::1]) by darklight.org.ru (8.14.4/8.14.4) with ESMTP id p1NFCkk2082057; Wed, 23 Feb 2011 18:12:46 +0300 (MSK) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by darklight.org.ru (8.14.4/8.14.4/Submit) id p1NFCkAk082055; Wed, 23 Feb 2011 18:12:46 +0300 (MSK) (envelope-from yuri.pankov@gmail.com) Message-Id: <201102231512.p1NFCkAk082055@darklight.org.ru> Date: Wed, 23 Feb 2011 18:12:46 +0300 (MSK) From: Yuri Pankov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mgrooms@shrew.net Subject: ports/154973: [PATCH] security/ike: fix plist when QTGUI=off, respect PREFIX and LOCALBASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 15:20:12 -0000 >Number: 154973 >Category: ports >Synopsis: [PATCH] security/ike: fix plist when QTGUI=off, respect PREFIX and LOCALBASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 23 15:20:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r218953: Tue Feb 22 21:22:52 MSK >Description: - Fix plist when QTGUI is not selected - Respect PREFIX and LOCALBASE - Silence portlint (whitespaces...) - Remove MD5 Added file(s): - files/patch-CMakeLists.txt Port maintainer (mgrooms@shrew.net) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- ike-2.1.7.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/ike/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- Makefile 31 Oct 2010 00:17:43 -0000 1.12 +++ Makefile 23 Feb 2011 14:48:51 -0000 @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 -USE_RC_SUBR= iked +USE_RC_SUBR= iked USE_BISON= build USE_OPENSSL= yes USE_CMAKE= yes @@ -25,17 +25,20 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} +CMAKE_ARGS+= -DETCDIR:PATH="${PREFIX}/etc" \ + -DLIBDIR:PATH="${PREFIX}/lib" \ + -DMANDIR:PATH="${PREFIX}/man" + OPTIONS= QTGUI "Enable QT client front end applications" on \ NATT "Enable NAT-Traversal (kernel-patch required)" off \ LDAP "Enable LDAP XAuth daemon support" off \ DEBUG "Enable Debug support" off -MAN1= ikea.1 ikec.1 +.include + MAN5= iked.conf.5 MAN8= iked.8 -.include - .ifdef(WITH_DEBUG) CMAKE_ARGS+= -DDEBUG=YES .endif @@ -51,9 +54,15 @@ .ifdef(WITH_QTGUI) CMAKE_ARGS+= -DQTGUI=YES -LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 +USE_QT_VER= 3 +MAN1= ikea.1 ikec.1 +PLIST_SUB+= QTGUI="" +.else +PLIST_SUB+= QTGUI="@comment " .endif +.include + post-patch: .if defined(WITH_NATT) . if ${OSVERSION} < 800000 @@ -73,6 +82,8 @@ @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. Index: distinfo =================================================================== RCS file: /home/ncvs/ports/security/ike/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 31 Oct 2010 00:17:43 -0000 1.6 +++ distinfo 23 Feb 2011 14:48:51 -0000 @@ -1,3 +1,2 @@ -MD5 (ike-2.1.7-release.tbz2) = bc86e101809fc750013e18480c8c1040 SHA256 (ike-2.1.7-release.tbz2) = 28e64efcec165522a775657a6c2c2263a3d03a78b114f62f5e30f4d38602edba SIZE (ike-2.1.7-release.tbz2) = 581284 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/ike/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 31 Oct 2010 00:17:43 -0000 1.6 +++ pkg-plist 23 Feb 2011 14:48:51 -0000 @@ -2,8 +2,8 @@ etc/iked.conf.sample @exec [ -f %D/etc/iked.conf ] || cp %D/etc/iked.conf.sample %D/etc/iked.conf sbin/iked -bin/ikea -bin/ikec +%%QTGUI%%bin/ikea +%%QTGUI%%bin/ikec lib/libike.so lib/libike.so.2.1.7 lib/libpfk.so Index: files/patch-CMakeLists.txt =================================================================== RCS file: files/patch-CMakeLists.txt diff -N files/patch-CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-CMakeLists.txt 23 Feb 2011 14:48:51 -0000 @@ -0,0 +1,23 @@ +--- ./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 --- ike-2.1.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: