diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-04-26 19:23:16 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-04-26 19:23:16 +0800 |
| commit | 613b43090f18ebf78cb6ffd8eac82a763a0ce226 (patch) | |
| tree | 354d034bd9c67d4eb99b87bbf62940c463f1cc0a | |
| parent | 9ac7d9933d2513d8b6520327948efcc4ce351fca (diff) | |
| download | marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.tar marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.tar.gz marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.tar.bz2 marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.tar.lz marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.tar.xz marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.tar.zst marcuscom-ports-613b43090f18ebf78cb6ffd8eac82a763a0ce226.zip | |
The mate-panel and gnome-panel are no longer in conflict, so remove mate-panel
from CONFLICTS. Bump the PORTREVISION.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18392 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 03ad685be..53dedd847 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-panel PORTVERSION= 2.32.1 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -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]* mate-panel-* +CONFLICTS= gnome-panel-3.[0-9]* USE_GETTEXT= yes USE_XORG= ice sm x11 xau xrandr diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile index fe3ec55eb..bbef9d056 100644 --- a/x11/gnome-panel3/Makefile +++ b/x11/gnome-panel3/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-panel PORTVERSION= 3.4.2.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -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]* mate-panel-* +CONFLICTS= gnome-panel-2.[0-9]* LATEST_LINK= gnome-panel3 USE_GETTEXT= yes |