mark a conflict with old gdm. ok aja@

This commit is contained in:
sthen 2011-10-18 14:53:25 +00:00
parent 80121089d8
commit c4176e516e
2 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2011/10/17 15:33:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.45 2011/10/18 14:53:25 sthen Exp $
# XXX Binary files patch-panels_info_hostnames-test_txt and
# patch-panels_info_hostnames-test_txt.new differ
@ -10,6 +10,7 @@ COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.2.1
REVISION= 0
SHARED_LIBS += gnome-control-center 0.0 # 1.0

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.18 2011/09/27 12:15:23 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.19 2011/10/18 14:53:25 sthen Exp $
@conflict control-center-1*
@conflict control-center2-*
@conflict gnome-media-<2.91.2p3
@conflict gdm-<3.0.4
@pkgpath x11/gnome/controlcenter2
@bin bin/gnome-control-center
@bin bin/gnome-sound-applet