From owner-svn-ports-head@FreeBSD.ORG Sun Jul 27 11:10:44 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 064E11F5; Sun, 27 Jul 2014 11:10:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E619B2088; Sun, 27 Jul 2014 11:10:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6RBAhnk044434; Sun, 27 Jul 2014 11:10:43 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6RBAhLU044433; Sun, 27 Jul 2014 11:10:43 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407271110.s6RBAhLU044433@svn.freebsd.org> From: John Marino Date: Sun, 27 Jul 2014 11:10:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363045 - head/deskutils/cairo-dock-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2014 11:10:44 -0000 Author: marino Date: Sun Jul 27 11:10:43 2014 New Revision: 363045 URL: http://svnweb.freebsd.org/changeset/ports/363045 QAT: https://qat.redports.org/buildarchive/r363045/ Log: cairo-dock-plugins: Resolve conflict seen with XFCE_INTEGRATION option PR: 188233 Submitted by: maintainer (Ivan Klymenko) Modified: head/deskutils/cairo-dock-plugins/Makefile Modified: head/deskutils/cairo-dock-plugins/Makefile ============================================================================== --- head/deskutils/cairo-dock-plugins/Makefile Sun Jul 27 11:02:09 2014 (r363044) +++ head/deskutils/cairo-dock-plugins/Makefile Sun Jul 27 11:10:43 2014 (r363045) @@ -2,7 +2,7 @@ PORTNAME= cairo-dock-plugins DISTVERSION= 3.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= https://launchpadlibrarian.net/137290159/ \ http://pazzle.otdux.com.ua/ @@ -57,8 +57,7 @@ post-patch: s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g' .if ${PORT_OPTIONS:MXFCE_INTEGRATION} -LIB_DEPENDS+= libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs \ - libexif.so:${PORTSDIR}/graphics/libexif +LIB_DEPENDS+= libexif.so:${PORTSDIR}/graphics/libexif CMAKE_ARGS+= -Denable-xfce-integration:BOOL=TRUE .else CMAKE_ARGS+= -Denable-xfce-integration:BOOL=FALSE