From owner-svn-ports-all@FreeBSD.ORG Sun Feb 22 21:01:46 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67FF725B; Sun, 22 Feb 2015 21:01:46 +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 391BF3B6; Sun, 22 Feb 2015 21:01:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ML1kVp057582; Sun, 22 Feb 2015 21:01:46 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ML1j9g057579; Sun, 22 Feb 2015 21:01:45 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201502222101.t1ML1j9g057579@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 22 Feb 2015 21:01:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379629 - in head/deskutils: notification-daemon xfce4-notification-daemon xfce4-notifyd 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2015 21:01:46 -0000 Author: kwm Date: Sun Feb 22 21:01:44 2015 New Revision: 379629 URL: https://svnweb.freebsd.org/changeset/ports/379629 QAT: https://qat.redports.org/buildarchive/r379629/ Log: Update CONFLICTS. xfce4-notifyd was updated to no longer conflict with notification-daemon. There is no conflict anymore between notification-daemon and xfce4-notification-daemon Only notify-osd and xfce4-notification-daemon conflict with each other. PR: 197851 (based on) Submitted by: Ben Woods Reviewed by: maintainer (ehaupt@) Modified: head/deskutils/notification-daemon/Makefile head/deskutils/xfce4-notification-daemon/Makefile head/deskutils/xfce4-notifyd/Makefile Modified: head/deskutils/notification-daemon/Makefile ============================================================================== --- head/deskutils/notification-daemon/Makefile Sun Feb 22 20:58:48 2015 (r379628) +++ head/deskutils/notification-daemon/Makefile Sun Feb 22 21:01:44 2015 (r379629) @@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 -CONFLICTS= xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]* - USE_GNOME= gnomeprefix intlhack gtk30 USES= gettext gmake pathfix pkgconfig tar:xz USE_XORG= x11 Modified: head/deskutils/xfce4-notification-daemon/Makefile ============================================================================== --- head/deskutils/xfce4-notification-daemon/Makefile Sun Feb 22 20:58:48 2015 (r379628) +++ head/deskutils/xfce4-notification-daemon/Makefile Sun Feb 22 21:01:44 2015 (r379629) @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ --libexecdir=${PREFIX}/libexec/xfce4 \ --with-dbus-services=${PREFIX}/share/dbus-1/services -CONFLICTS= notification-daemon-[0-9]* xfce4-notifyd-[0-9]* notify-osd-[0-9]* +CONFLICTS= notify-osd-[0-9]* OPTIONS_DEFINE= GRADIENT CLOSE NLS Modified: head/deskutils/xfce4-notifyd/Makefile ============================================================================== --- head/deskutils/xfce4-notifyd/Makefile Sun Feb 22 20:58:48 2015 (r379628) +++ head/deskutils/xfce4-notifyd/Makefile Sun Feb 22 21:01:44 2015 (r379629) @@ -23,8 +23,6 @@ USE_XFCE= configenv libmenu libutil xfco INSTALLS_ICONS= yes USE_XORG= x11 -CONFLICTS= notification-daemon-[0-9]* xfce4-notification-daemon-[0-9]* - OPTIONS_DEFINE= NLS .include