* Use the correct version of Evolution

* Fix the calendar pop-up on the clock applet [1]

Obtained from:	GNOME CVS [1]


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5180 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 132 insertions, 10 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index e33452d05..444f46205 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.111 2005/11/06 02:19:01 ahze Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.112 2005/11/16 01:55:05 marcus Exp $
 #
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.13.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
@@ -58,7 +59,7 @@ CONFIGURE_ARGS+=--disable-eds
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \
+	@${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.6.desktop|g' \
 		${WRKSRC}/gnome-panel/panel-default-setup.entries.in
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index ccf5378b1..4c9d37b61 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,5 +1,5 @@
---- applets/clock/clock.c.orig	Tue Jan 13 11:55:58 2004
-+++ applets/clock/clock.c	Wed Jan 14 15:43:39 2004
+--- applets/clock/clock.c.orig	Mon Oct 24 02:25:11 2005
++++ applets/clock/clock.c	Tue Nov 22 02:47:05 2005
 @@ -47,7 +47,9 @@
  #include <dirent.h>
  #include <string.h>
@@ -10,7 +10,7 @@
  
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
-@@ -539,7 +541,11 @@
+@@ -545,7 +547,11 @@ clock_locale_format (void)
  {
          const char *am;
  
@@ -22,3 +22,63 @@
          return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
  }
  
+@@ -1319,7 +1325,7 @@ add_appointments_and_tasks (ClockData *c
+         update_frame_visibility (cd->appointment_list, GTK_TREE_MODEL (cd->appointments_model));
+ 
+         switch (cd->orient) {
+-        case PANEL_APPLET_ORIENT_DOWN:
++	case PANEL_APPLET_ORIENT_UP:
+                 gtk_box_pack_start (GTK_BOX (vbox), cd->appointment_list, TRUE, TRUE, 0);
+                 gtk_box_pack_start (GTK_BOX (vbox), cd->task_list, TRUE, TRUE, 0);
+                 break;
+@@ -1409,7 +1415,7 @@ create_calendar (ClockData *cd,
+         gtk_calendar_select_day (GTK_CALENDAR (cd->calendar), tm->tm_mday);
+ 
+ 	switch (cd->orient) {
+-        case PANEL_APPLET_ORIENT_DOWN:
++	case PANEL_APPLET_ORIENT_UP:
+                 add_appointments_and_tasks (cd, vbox);
+                 gtk_box_pack_start (GTK_BOX (vbox), cd->calendar, TRUE, FALSE, 0);
+                 break;
+@@ -1498,7 +1504,7 @@ position_calendar_popup (ClockData *cd,
+ 			gravity = GDK_GRAVITY_NORTH_EAST;
+ 
+ 		break;
+-	case PANEL_APPLET_ORIENT_UP:
++	case PANEL_APPLET_ORIENT_DOWN:
+ 		y += button_h;
+ 		if ((x + w) > monitor.x + monitor.width)
+ 			x -= (x + w) - (monitor.x + monitor.width);
+@@ -1506,7 +1512,7 @@ position_calendar_popup (ClockData *cd,
+ 		gravity = GDK_GRAVITY_NORTH_WEST;
+ 
+ 		break;
+-	case PANEL_APPLET_ORIENT_DOWN:
++	case PANEL_APPLET_ORIENT_UP:
+ 		y -= h;
+ 		if ((x + w) > monitor.x + monitor.width)
+ 			x -= (x + w) - (monitor.x + monitor.width);
+@@ -1657,9 +1663,9 @@ create_clock_widget (ClockData *cd)
+ 	cd->orient = panel_applet_get_orient (PANEL_APPLET (cd->applet));
+ 
+ 	/* Initialize label orientation */
+-	if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
++	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+ 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
+-	else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
++	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
+ 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
+ 	else
+ 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
+@@ -1686,9 +1692,9 @@ applet_change_orient (PanelApplet       
+ {
+         cd->orient = orient;
+         
+-        if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
++	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
+-        else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
++	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
+                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
+         else
+                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index e33452d05..444f46205 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.111 2005/11/06 02:19:01 ahze Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.112 2005/11/16 01:55:05 marcus Exp $
 #
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.13.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
@@ -58,7 +59,7 @@ CONFIGURE_ARGS+=--disable-eds
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \
+	@${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.6.desktop|g' \
 		${WRKSRC}/gnome-panel/panel-default-setup.entries.in
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c
index ccf5378b1..4c9d37b61 100644
--- a/x11/gnomepanel/files/patch-applets_clock_clock.c
+++ b/x11/gnomepanel/files/patch-applets_clock_clock.c
@@ -1,5 +1,5 @@
---- applets/clock/clock.c.orig	Tue Jan 13 11:55:58 2004
-+++ applets/clock/clock.c	Wed Jan 14 15:43:39 2004
+--- applets/clock/clock.c.orig	Mon Oct 24 02:25:11 2005
++++ applets/clock/clock.c	Tue Nov 22 02:47:05 2005
 @@ -47,7 +47,9 @@
  #include <dirent.h>
  #include <string.h>
@@ -10,7 +10,7 @@
  
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
-@@ -539,7 +541,11 @@
+@@ -545,7 +547,11 @@ clock_locale_format (void)
  {
          const char *am;
  
@@ -22,3 +22,63 @@
          return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
  }
  
+@@ -1319,7 +1325,7 @@ add_appointments_and_tasks (ClockData *c
+         update_frame_visibility (cd->appointment_list, GTK_TREE_MODEL (cd->appointments_model));
+ 
+         switch (cd->orient) {
+-        case PANEL_APPLET_ORIENT_DOWN:
++	case PANEL_APPLET_ORIENT_UP:
+                 gtk_box_pack_start (GTK_BOX (vbox), cd->appointment_list, TRUE, TRUE, 0);
+                 gtk_box_pack_start (GTK_BOX (vbox), cd->task_list, TRUE, TRUE, 0);
+                 break;
+@@ -1409,7 +1415,7 @@ create_calendar (ClockData *cd,
+         gtk_calendar_select_day (GTK_CALENDAR (cd->calendar), tm->tm_mday);
+ 
+ 	switch (cd->orient) {
+-        case PANEL_APPLET_ORIENT_DOWN:
++	case PANEL_APPLET_ORIENT_UP:
+                 add_appointments_and_tasks (cd, vbox);
+                 gtk_box_pack_start (GTK_BOX (vbox), cd->calendar, TRUE, FALSE, 0);
+                 break;
+@@ -1498,7 +1504,7 @@ position_calendar_popup (ClockData *cd,
+ 			gravity = GDK_GRAVITY_NORTH_EAST;
+ 
+ 		break;
+-	case PANEL_APPLET_ORIENT_UP:
++	case PANEL_APPLET_ORIENT_DOWN:
+ 		y += button_h;
+ 		if ((x + w) > monitor.x + monitor.width)
+ 			x -= (x + w) - (monitor.x + monitor.width);
+@@ -1506,7 +1512,7 @@ position_calendar_popup (ClockData *cd,
+ 		gravity = GDK_GRAVITY_NORTH_WEST;
+ 
+ 		break;
+-	case PANEL_APPLET_ORIENT_DOWN:
++	case PANEL_APPLET_ORIENT_UP:
+ 		y -= h;
+ 		if ((x + w) > monitor.x + monitor.width)
+ 			x -= (x + w) - (monitor.x + monitor.width);
+@@ -1657,9 +1663,9 @@ create_clock_widget (ClockData *cd)
+ 	cd->orient = panel_applet_get_orient (PANEL_APPLET (cd->applet));
+ 
+ 	/* Initialize label orientation */
+-	if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
++	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+ 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
+-	else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
++	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
+ 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
+ 	else
+ 		gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);
+@@ -1686,9 +1692,9 @@ applet_change_orient (PanelApplet       
+ {
+         cd->orient = orient;
+         
+-        if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
++	if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 90);
+-        else if (cd->orient == PANEL_APPLET_ORIENT_RIGHT)
++	else if (cd->orient == PANEL_APPLET_ORIENT_LEFT)
+                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 270);
+         else
+                 gtk_label_set_angle (GTK_LABEL (cd->clockw), 0);