aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2009-10-22 12:12:29 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2009-10-22 12:12:29 +0000
commit305f4eaf68dbd8975f5dce3eccf0edebd30b0cc3 (patch)
treef10ce3a79a8cd2837a7a25df367d8dcb9558749e /deskutils
parent74c3e17cb2c3f7b9ce0d09bbc200028e56c6bbc4 (diff)
downloadports-305f4eaf68dbd8975f5dce3eccf0edebd30b0cc3.tar.gz
ports-305f4eaf68dbd8975f5dce3eccf0edebd30b0cc3.zip
Register CONFLICTS
Notes
Notes: svn path=/head/; revision=243214
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/notification-daemon/Makefile4
-rw-r--r--deskutils/xfce4-notification-daemon/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 3d5222bd5d5c..a594e88e93ba 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= notification-daemon
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/
@@ -33,6 +33,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= notification-daemon.schemas
-CONFLICTS= xfce4-notification-daemon-[0-9]*
+CONFLICTS= xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
.include <bsd.port.mk>
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index f765ce62c176..d62d7c58054d 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= notification-daemon
PORTVERSION= 0.3.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/notification-daemon-xfce/ \
CRITICAL
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/xfce4 \
--libexecdir=${PREFIX}/libexec/xfce4 \
--with-dbus-services=${PREFIX}/share/dbus-1/services
-CONFLICTS= notification-daemon-[0-9]*
+CONFLICTS= notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
OPTIONS= GRADIENT "Show a gradient look in the default theme" off \
CLOSE "Show the close button in the default theme" on \