cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove @conflict.

Browse Source 
ok landry@
This commit is contained in:
ajacoutot 2012-10-30 10:53:41 +00:00
parent 4d94d0cc3a
commit 70e1603401
6 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/notification-daemon/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.27 2012/09/03 15:26:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2012/10/30 10:53:41 ajacoutot Exp $
COMMENT= send small notifications to your desktop
GNOME_VERSION= 0.7.6
GNOME_PROJECT= notification-daemon
REVISION= 0
CATEGORIES= sysutils net

4
sysutils/notification-daemon/pkg/PLIST
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2012/09/03 15:26:02 ajacoutot Exp $
@conflict notification-daemon-xfce-*
@conflict xfce4-notifyd-*
@comment $OpenBSD: PLIST,v 1.11 2012/10/30 10:53:41 ajacoutot Exp $
@bin libexec/notification-daemon
share/applications/notification-daemon.desktop
share/locale/af/

4
x11/xfce4/notification-daemon-xfce/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2012/06/15 08:30:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.29 2012/10/30 10:53:41 ajacoutot Exp $
COMMENT= Xfce4 notification daemon
XFCE_VERSION= 0.3.7
XFCE_GOODIE= notification-daemon-xfce
REVISION= 18
REVISION= 19
MASTER_SITES= http://archive.xfce.org/src/archive/${XFCE_GOODIE}/${XFCE_BRANCH}/
# GPLv2

4
x11/xfce4/notification-daemon-xfce/pkg/PLIST
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2012/06/15 08:30:24 ajacoutot Exp $
@conflict notification-daemon-*
@conflict xfce4-notifyd-*
@comment $OpenBSD: PLIST,v 1.12 2012/10/30 10:53:41 ajacoutot Exp $
@bin bin/notification-settings
lib/notification-daemon-xfce-1.0/
lib/notification-daemon-xfce-1.0/engines/

4
x11/xfce4/xfce4-notifyd/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2012/04/30 13:29:04 landry Exp $
# $OpenBSD: Makefile,v 1.15 2012/10/30 10:53:41 ajacoutot Exp $
COMMENT= Xfce4 alternative notification daemon
XFCE_VERSION= 0.2.2
XFCE_GOODIE= xfce4-notifyd
REVISION = 1
REVISION = 2
# GPLv2
PERMIT_DISTFILES_CDROM= Yes

4
x11/xfce4/xfce4-notifyd/pkg/PLIST
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2012/04/30 13:29:04 landry Exp $
@conflict notification-daemon-*
@conflict notification-daemon-xfce-*
@comment $OpenBSD: PLIST,v 1.7 2012/10/30 10:53:41 ajacoutot Exp $
@bin bin/xfce4-notifyd-config
lib/xfce4/notifyd/
@bin lib/xfce4/notifyd/xfce4-notifyd