Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

4 files changed, 46 insertions, 3 deletions

diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index a5c8c971ede6..caa00ee5137d 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -3,10 +3,11 @@
 # Whom:					kwm@rainbow-runner.nl
 #
 # $FreeBSD$
-#
+#    $MCom: ports/mail/contact-lookup-applet/Makefile,v 1.13 2006/09/30 23:58:38 ahze Exp $
 
 PORTNAME=	contact
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 PKGNAMESUFFIX=	-lookup-applet
diff --git a/mail/contact-lookup-applet/files/patch-src_contact-dialog.c b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
new file mode 100644
index 000000000000..52ab8653e75d
--- /dev/null
+++ b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
@@ -0,0 +1,11 @@
+--- src/contact-dialog.c.orig	Sat Sep 30 19:56:51 2006
++++ src/contact-dialog.c	Sat Sep 30 19:57:14 2006
+@@ -260,7 +260,7 @@
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-      if (!gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL)) {
++      if (!gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL)) {
+         gtk_widget_hide (photo_frame);
+       } else if( (pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)) != NULL ) {
+         GdkPixbuf *tmp;
diff --git a/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
new file mode 100644
index 000000000000..2ce6c8e62ca4
--- /dev/null
+++ b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
@@ -0,0 +1,13 @@
+--- src/e-contact-entry.c.orig	Sat Sep 30 19:54:33 2006
++++ src/e-contact-entry.c	Sat Sep 30 19:56:09 2006
+@@ -261,8 +261,8 @@
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+-			      photo->length, NULL))
++      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
++			      photo->data.inlined.length, NULL))
+         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 
+       if (pixbuf) {
diff --git a/mail/contact-lookup-applet/pkg-plist b/mail/contact-lookup-applet/pkg-plist
index 21f5ef334861..7c6a8865f85e 100644
--- a/mail/contact-lookup-applet/pkg-plist
+++ b/mail/contact-lookup-applet/pkg-plist
@@ -31,7 +31,25 @@ share/locale/vi/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/xh/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/zh_CN/LC_MESSAGES/contact-lookup-applet.mo
 @dirrm share/gnome/lookup-applet
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca