Date: Sun, 22 Feb 2015 21:01:45 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> 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 Message-ID: <201502222101.t1ML1j9g057579@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <woodsb02@gmail.com> 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 <bsd.port.options.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502222101.t1ML1j9g057579>