10 files changed, 10 insertions, 74 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 9b48ce0bcf90..c01bce1de7b8 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomepim
-PORTVERSION=	1.4.6
-PORTREVISION=	1
+PORTVERSION=	1.4.8
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	http://me.in-berlin.de/~jroger/gnome-pim/ \
+		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-pim
 DISTNAME=	gnome-pim-${PORTVERSION}
 DIST_SUBDIR=	gnome
diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo
index 2e860eae0a4d..1d2971d1ec25 100644
--- a/deskutils/gnome-pim/distinfo
+++ b/deskutils/gnome-pim/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pim-1.4.6.tar.gz) = a694c66ab5431c8bee36323758beb3c0
+MD5 (gnome/gnome-pim-1.4.8.tar.gz) = e55c4a0666d244d944fe836d293d4bad
diff --git a/deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat b/deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat
deleted file mode 100644
index 78c2aef7c068..000000000000
--- a/deskutils/gnome-pim/files/patch-gncal_doc_C_topic.dat
+++ /dev/null
@@ -1,6 +0,0 @@
---- gncal/doc/C/topic.dat.orig	Sat Jun  1 13:10:13 2002
-+++ gncal/doc/C/topic.dat	Sat Jun  1 13:10:21 2002
-@@ -1,2 +1,2 @@
--gnomecal.html	Manual
-+index.html	Manual
- cmdline.html	Command line options 
diff --git a/deskutils/gnome-pim/files/patch-gncal_gnome-cal.c b/deskutils/gnome-pim/files/patch-gncal_gnome-cal.c
deleted file mode 100644
index cd3d8ba44c22..000000000000
--- a/deskutils/gnome-pim/files/patch-gncal_gnome-cal.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- gncal/gnome-cal.c.orig	Sat Jun  1 13:08:01 2002
-+++ gncal/gnome-cal.c	Sat Jun  1 13:09:41 2002
-@@ -76,7 +76,13 @@
- static GtkWidget *
- get_current_page (GnomeCalendar *gcal)
- {
--	return GTK_NOTEBOOK (gcal->notebook)->cur_page->child;
-+    	GtkNotebookPage *page;
-+
-+	page = GTK_NOTEBOOK (gcal->notebook)->cur_page;
-+	if (page)
-+	    	return page->child;
-+	else
-+	    	return NULL;
- }
- 
- char *
-@@ -111,6 +117,9 @@
- 	g_return_if_fail (new_time != -1);
- 
- 	current = get_current_page (gcal);
-+	if (!current)
-+	    	return;
-+
- 	new_time = time_day_begin (new_time);
- 
- 	if (current == gcal->day_view) {
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 53ab637abf3d..99bb32c8d11c 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -76,6 +76,7 @@ share/locale/sl/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/tr/LC_MESSAGES/gnome-pim.mo
 share/locale/uk/LC_MESSAGES/gnome-pim.mo
+share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 9b48ce0bcf90..c01bce1de7b8 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomepim
-PORTVERSION=	1.4.6
-PORTREVISION=	1
+PORTVERSION=	1.4.8
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	http://me.in-berlin.de/~jroger/gnome-pim/ \
+		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-pim
 DISTNAME=	gnome-pim-${PORTVERSION}
 DIST_SUBDIR=	gnome
diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo
index 2e860eae0a4d..1d2971d1ec25 100644
--- a/deskutils/gnomepim/distinfo
+++ b/deskutils/gnomepim/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pim-1.4.6.tar.gz) = a694c66ab5431c8bee36323758beb3c0
+MD5 (gnome/gnome-pim-1.4.8.tar.gz) = e55c4a0666d244d944fe836d293d4bad
diff --git a/deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat b/deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat
deleted file mode 100644
index 78c2aef7c068..000000000000
--- a/deskutils/gnomepim/files/patch-gncal_doc_C_topic.dat
+++ /dev/null
@@ -1,6 +0,0 @@
---- gncal/doc/C/topic.dat.orig	Sat Jun  1 13:10:13 2002
-+++ gncal/doc/C/topic.dat	Sat Jun  1 13:10:21 2002
-@@ -1,2 +1,2 @@
--gnomecal.html	Manual
-+index.html	Manual
- cmdline.html	Command line options 
diff --git a/deskutils/gnomepim/files/patch-gncal_gnome-cal.c b/deskutils/gnomepim/files/patch-gncal_gnome-cal.c
deleted file mode 100644
index cd3d8ba44c22..000000000000
--- a/deskutils/gnomepim/files/patch-gncal_gnome-cal.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- gncal/gnome-cal.c.orig	Sat Jun  1 13:08:01 2002
-+++ gncal/gnome-cal.c	Sat Jun  1 13:09:41 2002
-@@ -76,7 +76,13 @@
- static GtkWidget *
- get_current_page (GnomeCalendar *gcal)
- {
--	return GTK_NOTEBOOK (gcal->notebook)->cur_page->child;
-+    	GtkNotebookPage *page;
-+
-+	page = GTK_NOTEBOOK (gcal->notebook)->cur_page;
-+	if (page)
-+	    	return page->child;
-+	else
-+	    	return NULL;
- }
- 
- char *
-@@ -111,6 +117,9 @@
- 	g_return_if_fail (new_time != -1);
- 
- 	current = get_current_page (gcal);
-+	if (!current)
-+	    	return;
-+
- 	new_time = time_day_begin (new_time);
- 
- 	if (current == gcal->day_view) {
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 53ab637abf3d..99bb32c8d11c 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -76,6 +76,7 @@ share/locale/sl/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
 share/locale/tr/LC_MESSAGES/gnome-pim.mo
 share/locale/uk/LC_MESSAGES/gnome-pim.mo
+share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo