From owner-svn-ports-all@FreeBSD.ORG  Fri Jan 24 17:45:54 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 280D1117;
 Fri, 24 Jan 2014 17:45:54 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 144BB182B;
 Fri, 24 Jan 2014 17:45:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0OHjrXc047338;
 Fri, 24 Jan 2014 17:45:53 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0OHjrdd047337;
 Fri, 24 Jan 2014 17:45:53 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201401241745.s0OHjrdd047337@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 24 Jan 2014 17:45:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340921 - head/net/py-avahi
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jan 2014 17:45:54 -0000

Author: kwm
Date: Fri Jan 24 17:45:53 2014
New Revision: 340921
URL: http://svnweb.freebsd.org/changeset/ports/340921
QAT: https://qat.redports.org/buildarchive/r340921/

Log:
  Fix file conflict with avahi-app.
  
  PR:		ports/185998
  Submitted by:	Volodymyr Kostyrko <arcade@b1t.name>

Modified:
  head/net/py-avahi/pkg-plist

Modified: head/net/py-avahi/pkg-plist
==============================================================================
--- head/net/py-avahi/pkg-plist	Fri Jan 24 16:53:49 2014	(r340920)
+++ head/net/py-avahi/pkg-plist	Fri Jan 24 17:45:53 2014	(r340921)
@@ -13,6 +13,5 @@ lib/avahi/service-types.db
 man/man1/avahi-bookmarks.1.gz
 man/man1/avahi-discover.1.gz
 share/applications/avahi-discover.desktop
-%%DATADIR%%/service-types
 @dirrm %%PYTHON_SITELIBDIR%%/avahi_discover
 @dirrm %%PYTHON_SITELIBDIR%%/avahi