diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-10-25 17:21:00 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-10-25 17:21:00 +0800 |
| commit | cca16bcede6b313e656f92a1608c97e8454b671c (patch) | |
| tree | aad2f743156cd5ffa8882f4fbe96a2962b0b73ff | |
| parent | 9a5913e4bb2544726ad0d18d22199de8a87581f9 (diff) | |
| download | marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.tar marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.tar.gz marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.tar.bz2 marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.tar.lz marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.tar.xz marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.tar.zst marcuscom-ports-cca16bcede6b313e656f92a1608c97e8454b671c.zip | |
Register conflict with gnome-panel.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17138 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gnome-panel/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-panel3/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 0b92615cc..a5efa74e9 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.235 2011/06/04 22:51:28 mezz Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.236 2012/09/03 16:28:29 mezz Exp $ # PORTNAME= gnome-panel @@ -24,7 +24,7 @@ LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra -CONFLICTS= gnome-panel-3.[0-9]* +CONFLICTS= gnome-panel-3.[0-9]* mate-panel-* USE_GETTEXT= yes USE_XORG= ice sm x11 xau xrandr diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile index 36edeac92..d95103b8a 100644 --- a/x11/gnome-panel3/Makefile +++ b/x11/gnome-panel3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel3/Makefile,v 1.24 2011/10/16 17:55:24 kwm Exp $ +# $MCom: ports/x11/gnome-panel3/Makefile,v 1.25 2012/06/13 20:17:08 mezz Exp $ # PORTNAME= gnome-panel @@ -26,7 +26,7 @@ LIB_DEPENDS= gweather-3.0:${PORTSDIR}/net/libgweather3 \ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon -CONFLICTS= gnome-panel-2.[0-9]* +CONFLICTS= gnome-panel-2.[0-9]* mate-panel-* LATEST_LINK= gnome-panel3 USE_GETTEXT= yes |