Enable gnomepilot support.

Submitted by:	Jan Stocker <Jan.Stocker@t-online.de>

8 files changed, 112 insertions, 26 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index ed2e23a23b81..886095b0d7b7 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -7,16 +7,18 @@
 
 PORTNAME=	evolution
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf
 #ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
 #						   it actually works
+RUN_DEPENDS=	${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
 
 #BROKEN=		"Out of sync with latest gal"
 
@@ -29,8 +31,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db3-libs=${LOCALBASE}/lib \
 		--with-html-dir=${PREFIX}/share/gnome/html \
 		--with-openssl-includes=${OPENSSLBASE}/include \
-		--with-openssl-libs=${OPENSSLBASE}/lib
-# --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
+		--with-openssl-libs=${OPENSSLBASE}/lib \
+		--with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
index 77894e6f79f9..2aad42d959df 100644
--- a/mail/evolution-devel/files/patch-aa
+++ b/mail/evolution-devel/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Sep 28 13:40:57 2001
-+++ configure	Fri Sep 28 13:43:29 2001
-@@ -9255,7 +9255,7 @@
+--- configure.orig	Fri Dec 14 14:08:27 2001
++++ configure	Fri Dec 14 14:17:45 2001
+@@ -9253,7 +9253,7 @@
  
  CPPFLAGS_save="$CPPFLAGS"
  CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -9329,7 +9329,7 @@
+@@ -9327,7 +9327,7 @@
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -21,17 +21,17 @@ $FreeBSD$
  fi
  rm -f conftest*
  
-@@ -9349,7 +9349,7 @@
+@@ -9347,7 +9347,7 @@
  	ac_cv_db3_ldadd=""
  
  	for name in db db3 db-3.1; do
 -		LIBS="$LIBS_save $with_db3_libs/lib${name}.a"
 +		LIBS="$LIBS_save $with_db3_libs/lib${name}.so"
  		cat > conftest.$ac_ext <<EOF
- #line 9355 "configure"
+ #line 9353 "configure"
  #include "confdefs.h"
-@@ -9370,7 +9370,7 @@
- if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9368,7 +9368,7 @@
+ if { (eval echo configure:9369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
 -			ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a"
@@ -39,7 +39,7 @@ $FreeBSD$
  			break
  		
  else
-@@ -9440,7 +9440,7 @@
+@@ -9438,7 +9438,7 @@
  
  echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
  if test "$ac_cv_db3_lib_version_match" = no; then
@@ -48,7 +48,16 @@ $FreeBSD$
  fi
  
  CPPFLAGS="$CPPFLAGS_save"
-@@ -12738,10 +12738,10 @@
+@@ -11059,7 +11059,7 @@
+ 	size_t utf8_real_len = strlen (utf8);
+ 	char *pstring;	
+ 
+-	if (convert_ToPilotChar ("UTF8", utf8, utf8_real_len, &pstring) == -1)
++	if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
+ 	        exit (1);
+ 
+ 	exit (0);
+@@ -12680,10 +12680,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution-devel/files/patch-e-util::e-pilot-util.c b/mail/evolution-devel/files/patch-e-util::e-pilot-util.c
new file mode 100644
index 000000000000..aea980ec11ae
--- /dev/null
+++ b/mail/evolution-devel/files/patch-e-util::e-pilot-util.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- e-util/e-pilot-util.c	2001/12/14 12:11:21	1.1
++++ e-util/e-pilot-util.c	2001/12/14 12:12:08
+@@ -36,7 +36,7 @@
+ 	if (!string)
+ 		return NULL;
+ 	
+-	res = convert_ToPilotChar ("UTF8", string, strlen (string), &pstring);
++	res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
+ 
+ 	if (res != 0)
+ 		pstring = strdup (string);
+@@ -53,7 +53,7 @@
+ 	if (!string)
+ 		return NULL;
+ 	
+-	res = convert_FromPilotChar ("UTF8", string, strlen (string), &ustring);
++	res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
+ 	
+ 	if (res != 0)
+ 		ustring = strdup (string);
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index 64861dfacfb3..e85d67f3b44a 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -198,6 +198,12 @@ lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so.0
 lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.a
 lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so
 lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so.0
+lib/gnome-pilot/conduits/libeaddress_conduit.a
+lib/gnome-pilot/conduits/libeaddress_conduit.so
+lib/gnome-pilot/conduits/libecalendar_conduit.a
+lib/gnome-pilot/conduits/libecalendar_conduit.so
+lib/gnome-pilot/conduits/libetodo_conduit.a
+lib/gnome-pilot/conduits/libetodo_conduit.so
 lib/libcal-client.a
 lib/libcal-client.so
 lib/libcal-client.so.0
@@ -316,6 +322,9 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
+share/gnome/gnome-pilot/conduits/e-address.conduit
+share/gnome/gnome-pilot/conduits/e-calendar.conduit
+share/gnome/gnome-pilot/conduits/e-todo.conduit
 share/gnome/help/evolution/C/apx-gloss.html
 share/gnome/help/evolution/C/authors.html
 share/gnome/help/evolution/C/bugs.html
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ed2e23a23b81..886095b0d7b7 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,16 +7,18 @@
 
 PORTNAME=	evolution
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf
 #ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
 #						   it actually works
+RUN_DEPENDS=	${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
 
 #BROKEN=		"Out of sync with latest gal"
 
@@ -29,8 +31,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db3-libs=${LOCALBASE}/lib \
 		--with-html-dir=${PREFIX}/share/gnome/html \
 		--with-openssl-includes=${OPENSSLBASE}/include \
-		--with-openssl-libs=${OPENSSLBASE}/lib
-# --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
+		--with-openssl-libs=${OPENSSLBASE}/lib \
+		--with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 77894e6f79f9..2aad42d959df 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Sep 28 13:40:57 2001
-+++ configure	Fri Sep 28 13:43:29 2001
-@@ -9255,7 +9255,7 @@
+--- configure.orig	Fri Dec 14 14:08:27 2001
++++ configure	Fri Dec 14 14:17:45 2001
+@@ -9253,7 +9253,7 @@
  
  CPPFLAGS_save="$CPPFLAGS"
  CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -9329,7 +9329,7 @@
+@@ -9327,7 +9327,7 @@
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -21,17 +21,17 @@ $FreeBSD$
  fi
  rm -f conftest*
  
-@@ -9349,7 +9349,7 @@
+@@ -9347,7 +9347,7 @@
  	ac_cv_db3_ldadd=""
  
  	for name in db db3 db-3.1; do
 -		LIBS="$LIBS_save $with_db3_libs/lib${name}.a"
 +		LIBS="$LIBS_save $with_db3_libs/lib${name}.so"
  		cat > conftest.$ac_ext <<EOF
- #line 9355 "configure"
+ #line 9353 "configure"
  #include "confdefs.h"
-@@ -9370,7 +9370,7 @@
- if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9368,7 +9368,7 @@
+ if { (eval echo configure:9369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
 -			ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a"
@@ -39,7 +39,7 @@ $FreeBSD$
  			break
  		
  else
-@@ -9440,7 +9440,7 @@
+@@ -9438,7 +9438,7 @@
  
  echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
  if test "$ac_cv_db3_lib_version_match" = no; then
@@ -48,7 +48,16 @@ $FreeBSD$
  fi
  
  CPPFLAGS="$CPPFLAGS_save"
-@@ -12738,10 +12738,10 @@
+@@ -11059,7 +11059,7 @@
+ 	size_t utf8_real_len = strlen (utf8);
+ 	char *pstring;	
+ 
+-	if (convert_ToPilotChar ("UTF8", utf8, utf8_real_len, &pstring) == -1)
++	if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
+ 	        exit (1);
+ 
+ 	exit (0);
+@@ -12680,10 +12680,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution/files/patch-e-util::e-pilot-util.c b/mail/evolution/files/patch-e-util::e-pilot-util.c
new file mode 100644
index 000000000000..aea980ec11ae
--- /dev/null
+++ b/mail/evolution/files/patch-e-util::e-pilot-util.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- e-util/e-pilot-util.c	2001/12/14 12:11:21	1.1
++++ e-util/e-pilot-util.c	2001/12/14 12:12:08
+@@ -36,7 +36,7 @@
+ 	if (!string)
+ 		return NULL;
+ 	
+-	res = convert_ToPilotChar ("UTF8", string, strlen (string), &pstring);
++	res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
+ 
+ 	if (res != 0)
+ 		pstring = strdup (string);
+@@ -53,7 +53,7 @@
+ 	if (!string)
+ 		return NULL;
+ 	
+-	res = convert_FromPilotChar ("UTF8", string, strlen (string), &ustring);
++	res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
+ 	
+ 	if (res != 0)
+ 		ustring = strdup (string);
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 64861dfacfb3..e85d67f3b44a 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -198,6 +198,12 @@ lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so.0
 lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.a
 lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so
 lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so.0
+lib/gnome-pilot/conduits/libeaddress_conduit.a
+lib/gnome-pilot/conduits/libeaddress_conduit.so
+lib/gnome-pilot/conduits/libecalendar_conduit.a
+lib/gnome-pilot/conduits/libecalendar_conduit.so
+lib/gnome-pilot/conduits/libetodo_conduit.a
+lib/gnome-pilot/conduits/libetodo_conduit.so
 lib/libcal-client.a
 lib/libcal-client.so
 lib/libcal-client.so.0
@@ -316,6 +322,9 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
+share/gnome/gnome-pilot/conduits/e-address.conduit
+share/gnome/gnome-pilot/conduits/e-calendar.conduit
+share/gnome/gnome-pilot/conduits/e-todo.conduit
 share/gnome/help/evolution/C/apx-gloss.html
 share/gnome/help/evolution/C/authors.html
 share/gnome/help/evolution/C/bugs.html