ports/105941: [patch] update deskutils/contacts to 0.2

[Piotr Smyrak]

>Number:         105941
>Category:       ports
>Synopsis:       [patch] update deskutils/contacts to 0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 28 09:50:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Piotr Smyrak
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.1-STABLE #1: Wed Aug 23 12:18:00 CEST 2006
    root at psmyrak.intra:/usr/obj/usr/src/sys/JOB



>Description:


The attached patch updates the port to newly released version 0.2 and removes one obsolte patch. It also fixes problems in the port caused by the recent GNOME update.


>How-To-Repeat:


N/A


>Fix:


--- contacts.patch begins here ---
diff -Naru /usr/ports/deskutils/contacts/Makefile contacts/Makefile
--- /usr/ports/deskutils/contacts/Makefile	Sat Oct 14 10:52:41 2006
+++ contacts/Makefile	Tue Nov 28 10:36:34 2006
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	contacts
-PORTVERSION=	0.1
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://www.openedhand.com/~chris/ \
+MASTER_SITES=	http://projects.o-hand.com/sources/contacts/ \
 		http://smyru.petronet.pl/freebsd/
 DIST_SUBDIR=	gnome2
 
@@ -19,9 +18,9 @@
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 gnomehier evolutiondataserver
 USE_AUTOTOOLS=	libtool:15
+GCONF_SCHEMAS=	contacts.schemas
 # CFLAGS+=	-g
 
 .include <bsd.port.mk>
diff -Naru /usr/ports/deskutils/contacts/distinfo contacts/distinfo
--- /usr/ports/deskutils/contacts/distinfo	Sun Aug 20 11:38:50 2006
+++ contacts/distinfo	Thu Nov 23 18:42:48 2006
@@ -1,3 +1,3 @@
-MD5 (gnome2/contacts-0.1.tar.gz) = dc5a650445f0904392039006d929f192
-SHA256 (gnome2/contacts-0.1.tar.gz) = 7add3642aecedb363dbf30674021c6b75c4ef7c772c889b8050590fe996c7e1c
-SIZE (gnome2/contacts-0.1.tar.gz) = 330231
+MD5 (gnome2/contacts-0.2.tar.gz) = ad8a4297af14930d45a56d17b39cf0d5
+SHA256 (gnome2/contacts-0.2.tar.gz) = a8b6ebf62c39b235549c4f11b8a191b0d470a75ddd73a8a39361abd7fdde4cca
+SIZE (gnome2/contacts-0.2.tar.gz) = 401486
diff -Naru /usr/ports/deskutils/contacts/files/patch-src_constacts-utils.c contacts/files/patch-src_constacts-utils.c
--- /usr/ports/deskutils/contacts/files/patch-src_constacts-utils.c	Sat Oct 14 10:52:41 2006
+++ contacts/files/patch-src_constacts-utils.c	Thu Jan  1 01:00:00 1970
@@ -1,44 +0,0 @@
---- src/contacts-utils.c.orig	Sat Sep 30 02:02:40 2006
-+++ src/contacts-utils.c	Sat Sep 30 02:03:54 2006
-@@ -180,13 +180,13 @@
- 
- /* TODO: Would adding a struct for this be gratuititous? RB: NOT AT ALL */
- static const gchar **contacts_field_types[] = {
--	(gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
-+	(const gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
- 			    "Cell", "Video", "Pager", "BBS", "Modem", "Car",
- 			    "ISDN", "PCS", NULL },
--	(gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
--	(gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
-+	(const gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
-+	(const gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
- 			    "Pref", NULL },
--	(gchar *[]){ NULL }
-+	(const gchar *[]){ NULL }
- };
- 
- const gchar **
-@@ -357,8 +357,8 @@
- 			switch (photo->type) {
- 			case E_CONTACT_PHOTO_TYPE_INLINED :
- 				gdk_pixbuf_loader_write (loader,
--					photo->inlined.data,
--					photo->inlined.length, NULL);
-+					photo->data.inlined.data,
-+					photo->data.inlined.length, NULL);
- 				break;
- 			case E_CONTACT_PHOTO_TYPE_URI :
- 			default :
-@@ -545,9 +545,9 @@
- 				int *length;
- #if HAVE_PHOTO_TYPE
- 				new_photo.type = E_CONTACT_PHOTO_TYPE_INLINED;
--				data = &new_photo.inlined.data;
--				length = &new_photo.inlined.length;
--				new_photo.inlined.mime_type = NULL;
-+				data = &new_photo.data.inlined.data;
-+				length = &new_photo.data.inlined.length;
-+				new_photo.data.inlined.mime_type = NULL;
- #else
- 				data = &new_photo.data;
- 				length = &new_photo.length;
diff -Naru /usr/ports/deskutils/contacts/pkg-plist contacts/pkg-plist
--- /usr/ports/deskutils/contacts/pkg-plist	Sun Aug 20 11:38:50 2006
+++ contacts/pkg-plist	Tue Nov 28 09:48:25 2006
@@ -1,6 +1,8 @@
 bin/contacts
 share/applications/contacts.desktop
 %%DATADIR%%/contacts.glade
+share/locale/et/LC_MESSAGES/Contacts.mo
+share/locale/fr/LC_MESSAGES/Contacts.mo
 share/pixmaps/oh-contacts.png
 @dirrmtry share/applications
- at dirrm share/contacts
+ at dirrm %%DATADIR%%
--- contacts.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: