diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-02-22 21:01:44 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-02-22 21:01:44 +0000 |
| commit | 95d2f52b0fee629e46daf5177c0f60a69d8486f1 (patch) | |
| tree | 67eb9f79c8472058d1ec2b2c3b3621d528089a10 /deskutils/notification-daemon/Makefile | |
| parent | Update to Wine 1.7.37. This includes the following changes: (diff) | |
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@)
Notes
Notes:
svn path=/head/; revision=379629
Diffstat (limited to 'deskutils/notification-daemon/Makefile')
| -rw-r--r-- | deskutils/notification-daemon/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index afc807dbeae7..62a2ba203a3c 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -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 |