From owner-freebsd-ports@FreeBSD.ORG Mon May 24 02:50:09 2010 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 323961065673 for ; Mon, 24 May 2010 02:50:09 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.159]) by mx1.freebsd.org (Postfix) with ESMTP id A86AE8FC18 for ; Mon, 24 May 2010 02:50:08 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id 22so800601fge.13 for ; Sun, 23 May 2010 19:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:received :x-authentication-warning:date:from:to:subject:message-id :mime-version:content-type:content-disposition:user-agent; bh=IYh8Q4LFURVqdU3rO3E5rw18FfLAfPm/XtfIqF51kug=; b=Gs1yRPERIDUKao5Y8K36xCKge2zvmEpSazJBadXsnTeYva4JaN+jLGqPLSbE5CPRx1 vRbGdPbf7qzULm8/exaD2iANZfUZaReXzP0tePHeKZqIbK9JBw9HzdcIpxSTF88tzvbU Ws/y16okmS60XBoIk6eVWLnkVTgwGWFcFwQs4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=x-authentication-warning:date:from:to:subject:message-id :mime-version:content-type:content-disposition:user-agent; b=s9n+G81L43gFAFjeylrlAewwXkin4Cv3fHFkysS35pR5rtan+DEYA+IR+hVCohpHpw FtUFqSnmmTEgQytl1JRDxf6QFnsd3rvmNaOpgkWiM50h31KmRVtrt+CZ3f78buWuG1KG raSBuYLUVm+P0zZME5BnzIi+LuTLBJZD73f94= Received: by 10.86.239.37 with SMTP id m37mr7492836fgh.72.1274669407483; Sun, 23 May 2010 19:50:07 -0700 (PDT) Received: from darklight.org.ru ([213.132.76.142]) by mx.google.com with ESMTPS id 12sm3150422fgg.29.2010.05.23.19.50.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 23 May 2010 19:50:07 -0700 (PDT) Received: from darklight.org.ru (yuri@darklight.org.ru [127.0.0.1]) by darklight.org.ru (8.14.4/8.14.4) with ESMTP id o4O2o4W8057582; Mon, 24 May 2010 06:50:04 +0400 (MSD) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by darklight.org.ru (8.14.4/8.14.4/Submit) id o4O2o49x057237; Mon, 24 May 2010 06:50:04 +0400 (MSD) (envelope-from yuri.pankov@gmail.com) X-Authentication-Warning: darklight.org.ru: yuri set sender to yuri.pankov@gmail.com using -f Date: Mon, 24 May 2010 06:50:03 +0400 From: Yuri Pankov To: kde-freebsd@kde.org, ports@freebsd.org Message-ID: <20100524025003.GA96707@darklight.org.ru> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="XsQoSWH+UP9D9v3l" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Subject: kdebase4-runtime doesn't pull in libssh if compat7x is installed X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2010 02:50:09 -0000 --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, x11/kdebase4-runtime doesn't in pull security/libssh as dependency if we have misc/compat7x installed (installs libssh.so.4 as well, in different location). Detection of security/libssh could be changed to ${LOCALBASE}/include/libssh/libssh.h. Patch attached. Thanks, Yuri --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="kdebase4-runtime.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/kdebase4-runtime/Makefile,v retrieving revision 1.235 diff -u -r1.235 Makefile --- Makefile 21 May 2010 16:22:40 -0000 1.235 +++ Makefile 24 May 2010 02:27:58 -0000 @@ -8,7 +8,7 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,10 +17,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system +BUILD_DEPENDS= ${LOCALBASE}/include/libssh/libssh.h LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp \ - attica.0:${PORTSDIR}/x11-toolkits/attica \ - ssh.4:${PORTSDIR}/security/libssh + attica.0:${PORTSDIR}/x11-toolkits/attica +RUN_DEPENDS= ${LOCALBASE}/include/libssh/libssh.h USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs KDE4_BUILDENV= yes --XsQoSWH+UP9D9v3l--