diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-11 07:04:42 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-11 07:04:42 +0800 |
| commit | 97cf8787170972b5943577d008920532253aa94b (patch) | |
| tree | 813458d644a289eae4a2ad0becebfbbc5607585e | |
| parent | f3f2005435aca8e95a441c549bca2359d187586f (diff) | |
| download | marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.tar marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.tar.gz marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.tar.bz2 marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.tar.lz marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.tar.xz marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.tar.zst marcuscom-ports-97cf8787170972b5943577d008920532253aa94b.zip | |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16056 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 3b6d89e8b..685bd4876 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.187 2011/06/03 19:56:54 kwm Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.188 2011/06/03 21:27:51 mezz Exp $ # PORTNAME= gdm @@ -28,6 +28,8 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ gnome-session:${PORTSDIR}/x11/gnome-session \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +CONFLICTS= gdm-3.[0-9]* + USERS= gdm GROUPS= gdm diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index bcbecbc57..413cc0fca 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm3/Makefile,v 1.8 2011/05/31 21:49:31 kwm Exp $ +# $MCom: ports/x11/gdm3/Makefile,v 1.9 2011/06/10 22:59:10 mezz Exp $ # PORTNAME= gdm @@ -33,6 +33,8 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +CONFLICTS= gdm-2.[0-9]* + USERS= gdm GROUPS= gdm |