Add gnomepilot-conduits2 after a repo copy from gnomepilot-conduits.

gnomepilot-conduits2 is a collection of PalmOS conduits for
gnomepilot2.

19 files changed, 63 insertions, 262 deletions

diff --git a/palm/Makefile b/palm/Makefile
index 80eece7c5eef..7cb2544585ea 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -5,6 +5,7 @@
     SUBDIR += coldsync
     SUBDIR += gnomepilot
     SUBDIR += gnomepilot-conduits
+    SUBDIR += gnomepilot-conduits2
     SUBDIR += gnomepilot2
     SUBDIR += hdconv
     SUBDIR += iSiloXC
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index b66cc07b7ea6..423be699ef3a 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -1,28 +1,28 @@
-# New ports collection makefile for:	gnomepilot-conduits
-# Date created:		16th March 2000
-# Whom:			Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	gnomepilot-conduits2
+# Date created:		15 April 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomepilot-conduits
-PORTVERSION=	0.9
+PORTNAME=	gnomepilot-conduits2
+PORTVERSION=	2.0.5
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/0.9
+MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
 DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
-DIST_SUBDIR=	gnome
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional conduits for gnome-pilot
+COMMENT=	Additional conduits for gnome-pilot2
 
-LIB_DEPENDS=	gpilotd.1:${PORTSDIR}/palm/gnomepilot
+LIB_DEPENDS=	gpilotd.2:${PORTSDIR}/palm/gnomepilot2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs libglade gnomevfs
+USE_BISON=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnome
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnome-pilot-conduits/distinfo b/palm/gnome-pilot-conduits/distinfo
index af5bbe79df92..1097222e2fa7 100644
--- a/palm/gnome-pilot-conduits/distinfo
+++ b/palm/gnome-pilot-conduits/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-conduits-0.9.tar.bz2) = 4f7d90ca9655896fb3d589fe1aa49e82
+MD5 (gnome2/gnome-pilot-conduits-2.0.5.tar.bz2) = 07f33638bdf2ee23c5f624aa722ff1f2
diff --git a/palm/gnome-pilot-conduits/files/patch-configure b/palm/gnome-pilot-conduits/files/patch-configure
index c6ace9918e19..f195f07b43c6 100644
--- a/palm/gnome-pilot-conduits/files/patch-configure
+++ b/palm/gnome-pilot-conduits/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 15 09:53:26 2002
-+++ configure	Tue Sep 17 18:46:34 2002
-@@ -5316,6 +5316,7 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,48 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -6497,7 +6498,7 @@
- 	else
- 	    PISOCK_CFLAGS="-I$withval/include"
- 	    incdir="$withval/include"
--	    PISOCK_LIBS="-L$withval/lib -lpisock"
-+	    PISOCK_LIBS="-L$withval/lib -lpisync -lpisock"
- 	    echo $ac_n "checking "for existance of $withval/lib/libpisock.so"""... $ac_c" 1>&6
- echo "configure:6503: checking "for existance of $withval/lib/libpisock.so"" >&5
- 	    if test -r $withval/lib/libpisock.so; then
-@@ -6610,7 +6611,7 @@
- 	                                                   piversion_include="$prefix/include/pi-version.h"
- 						           if test x$PISOCK_LIBDIR = x; then
- 							      incdir="$prefix/include"
--							      PISOCK_LIBS="-L$prefix/lib -lpisock"
-+							      PISOCK_LIBS="-L$prefix/lib -lpisync -lpisock"
-                                                            fi							  
- else
-   echo "$ac_t""no" 1>&6
-@@ -6661,7 +6662,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--   PISOCK_LIBS=-lpisock 
-+   PISOCK_LIBS=-lpisync -lpisock 
- else
-   echo "$ac_t""no" 1>&6
-  { echo "configure: error: "Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/."" 1>&2; exit 1; } 
-@@ -8031,7 +8032,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -8201,7 +8202,7 @@
- #		 USE_INCLUDED_LIBINTL=yes
- #		 CATOBJEXT=.cat
- #		 INSTOBJEXT=.cat
--#		 DATADIRNAME=lib
-+#		 DATADIRNAME=share
- #		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- #		 INTLLIBS=$INTLDEPS
- #		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/palm/gnome-pilot-conduits/files/patch-email_email_conduit.c b/palm/gnome-pilot-conduits/files/patch-email_email_conduit.c
new file mode 100644
index 000000000000..e10f9f7c1de5
--- /dev/null
+++ b/palm/gnome-pilot-conduits/files/patch-email_email_conduit.c
@@ -0,0 +1,11 @@
+--- email/email_conduit.c.orig	Tue Apr 15 02:29:36 2003
++++ email/email_conduit.c	Tue Apr 15 02:30:00 2003
+@@ -47,7 +47,7 @@
+ 	prefix = g_strdup_printf("/gnome-pilot.d/email-conduit/Pilot_%u/",pilotId);
+   
+ 	gnome_config_push_prefix(prefix);
+-	(*c)->sendmail = gnome_config_get_string( "sendmail=/usr/lib/sendmail -t -i");
++	(*c)->sendmail = gnome_config_get_string( "sendmail=/usr/sbin/sendmail -t -i");
+ 	(*c)->fromAddr = gnome_config_get_string( "from_address" );
+ 	(*c)->sendAction = gnome_config_get_string( "send_action=file");
+ 	(*c)->mhDirectory = gnome_config_get_string( "mh_directory" );
diff --git a/palm/gnome-pilot-conduits/files/patch-icon-path b/palm/gnome-pilot-conduits/files/patch-icon-path
deleted file mode 100644
index 61b499002a70..000000000000
--- a/palm/gnome-pilot-conduits/files/patch-icon-path
+++ /dev/null
@@ -1,36 +0,0 @@
---- email/sendmail.conduit.in.orig	Sun Dec  2 03:17:09 2001
-+++ email/sendmail.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -4,5 +4,5 @@
- <conduit-attribute name="description" value="Mails your Palm emails via sendmail"/>
- <conduit-attribute name="default-synctype" value="custom"/>
- <conduit-attribute name="settings" value="TRUE"/>
--<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-mailcheck.png"/>
-+<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-mailcheck.png"/>
- </gnome-pilot-conduit>
---- expense/expense.conduit.in.orig	Sun Dec  2 03:17:13 2001
-+++ expense/expense.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -5,5 +5,5 @@
- 	<conduit-attribute name="default-synctype" value="synchronize"/>
-      	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot"/>
-      	<conduit-attribute name="settings" value="TRUE"/>
--     	<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-money.png"/>
-+     	<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-money.png"/>
- </gnome-pilot-conduit>
---- memo_file/memofile.conduit.in.orig	Sun Dec  2 03:17:09 2001
-+++ memo_file/memofile.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -5,5 +5,5 @@
-      <conduit-attribute name="default-synctype" value="synchronize"/>
-      <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
-      <conduit-attribute name="settings" value="TRUE"/>
--     <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-note.png"/>
-+     <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-note.png"/>
- </gnome-pilot-conduit>
---- time/time.conduit.in.orig	Sun Dec  2 03:17:09 2001
-+++ time/time.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -5,5 +5,5 @@
-      <conduit-attribute name="default-synctype" value="synchronize"/>
-      <conduit-attribute name="valid-synctypes" value="synchronize"/>
-      <conduit-attribute name="settings" value="TRUE"/>
--     <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-clock.png"/>
-+     <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-clock.png"/>
- </gnome-pilot-conduit>
diff --git a/palm/gnome-pilot-conduits/files/patch-mal-conduit::mal::client::unix::MAL31DBConfig.c b/palm/gnome-pilot-conduits/files/patch-mal-conduit::mal::client::unix::MAL31DBConfig.c
deleted file mode 100644
index 6a454fa5e978..000000000000
--- a/palm/gnome-pilot-conduits/files/patch-mal-conduit::mal::client::unix::MAL31DBConfig.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- mal-conduit/mal/client/unix/MAL31DBConfig.c	2001/12/14 11:48:37	1.1
-+++ mal-conduit/mal/client/unix/MAL31DBConfig.c	2001/12/14 11:49:50
-@@ -20,7 +20,11 @@
-  */
- 
- #include <MAL31DBConfig.h>
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>

-+#endif
- 
- /*---------------------------------------------------------------------------*/
- void
diff --git a/palm/gnome-pilot-conduits/files/patch-mal-conduit_mal_client_unix_malsync.c b/palm/gnome-pilot-conduits/files/patch-mal-conduit_mal_client_unix_malsync.c
deleted file mode 100644
index aaa36fcc0938..000000000000
--- a/palm/gnome-pilot-conduits/files/patch-mal-conduit_mal_client_unix_malsync.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- mal-conduit/mal/client/unix/malsync.c.orig	Tue Sep 17 18:43:28 2002
-+++ mal-conduit/mal/client/unix/malsync.c	Tue Sep 17 18:43:45 2002
-@@ -1409,12 +1409,12 @@
-     signal(SIGSEGV, SigHandler);
- #endif
-     
--    if (!(sd = pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
-+    if (!(sd = pi_socket(PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
-         perror("pi_socket");
-         exit(1);
-     }
-     
--    addr.pi_family = PI_AF_SLP;
-+    addr.pi_family = PI_PF_SLP;
-     strcpy(addr.pi_device, device);
-     
-     ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
diff --git a/palm/gnome-pilot-conduits/pkg-descr b/palm/gnome-pilot-conduits/pkg-descr
index ea9bb0b0229b..a4dec8905fca 100644
--- a/palm/gnome-pilot-conduits/pkg-descr
+++ b/palm/gnome-pilot-conduits/pkg-descr
@@ -1,3 +1,3 @@
-Additional conduits for gnome-pilot
+Additional conduits for gnome-pilot2.
 
 WWW: http://www.gnome.org/gnome-pilot/
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index b5eb0040e93b..f8a8fb2e394c 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -10,7 +10,9 @@ share/gnome/gnome-pilot/conduits/sendmail.conduit
 share/gnome/gnome-pilot/conduits/time.conduit
 share/gnome/pixmaps/avantgo.png
 share/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/be/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ca/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/cs/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/da/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/de/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/el/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -18,6 +20,7 @@ share/locale/es/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/fi/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/fr/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/gl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/he/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/hu/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -31,5 +34,6 @@ share/locale/sk/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/sv/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/tr/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/vi/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index b66cc07b7ea6..423be699ef3a 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -1,28 +1,28 @@
-# New ports collection makefile for:	gnomepilot-conduits
-# Date created:		16th March 2000
-# Whom:			Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	gnomepilot-conduits2
+# Date created:		15 April 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomepilot-conduits
-PORTVERSION=	0.9
+PORTNAME=	gnomepilot-conduits2
+PORTVERSION=	2.0.5
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/0.9
+MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
 DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
-DIST_SUBDIR=	gnome
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional conduits for gnome-pilot
+COMMENT=	Additional conduits for gnome-pilot2
 
-LIB_DEPENDS=	gpilotd.1:${PORTSDIR}/palm/gnomepilot
+LIB_DEPENDS=	gpilotd.2:${PORTSDIR}/palm/gnomepilot2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs libglade gnomevfs
+USE_BISON=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnome
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot-conduits2/distinfo b/palm/gnomepilot-conduits2/distinfo
index af5bbe79df92..1097222e2fa7 100644
--- a/palm/gnomepilot-conduits2/distinfo
+++ b/palm/gnomepilot-conduits2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-conduits-0.9.tar.bz2) = 4f7d90ca9655896fb3d589fe1aa49e82
+MD5 (gnome2/gnome-pilot-conduits-2.0.5.tar.bz2) = 07f33638bdf2ee23c5f624aa722ff1f2
diff --git a/palm/gnomepilot-conduits2/files/patch-configure b/palm/gnomepilot-conduits2/files/patch-configure
index c6ace9918e19..f195f07b43c6 100644
--- a/palm/gnomepilot-conduits2/files/patch-configure
+++ b/palm/gnomepilot-conduits2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 15 09:53:26 2002
-+++ configure	Tue Sep 17 18:46:34 2002
-@@ -5316,6 +5316,7 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,48 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -6497,7 +6498,7 @@
- 	else
- 	    PISOCK_CFLAGS="-I$withval/include"
- 	    incdir="$withval/include"
--	    PISOCK_LIBS="-L$withval/lib -lpisock"
-+	    PISOCK_LIBS="-L$withval/lib -lpisync -lpisock"
- 	    echo $ac_n "checking "for existance of $withval/lib/libpisock.so"""... $ac_c" 1>&6
- echo "configure:6503: checking "for existance of $withval/lib/libpisock.so"" >&5
- 	    if test -r $withval/lib/libpisock.so; then
-@@ -6610,7 +6611,7 @@
- 	                                                   piversion_include="$prefix/include/pi-version.h"
- 						           if test x$PISOCK_LIBDIR = x; then
- 							      incdir="$prefix/include"
--							      PISOCK_LIBS="-L$prefix/lib -lpisock"
-+							      PISOCK_LIBS="-L$prefix/lib -lpisync -lpisock"
-                                                            fi							  
- else
-   echo "$ac_t""no" 1>&6
-@@ -6661,7 +6662,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--   PISOCK_LIBS=-lpisock 
-+   PISOCK_LIBS=-lpisync -lpisock 
- else
-   echo "$ac_t""no" 1>&6
-  { echo "configure: error: "Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/."" 1>&2; exit 1; } 
-@@ -8031,7 +8032,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -8201,7 +8202,7 @@
- #		 USE_INCLUDED_LIBINTL=yes
- #		 CATOBJEXT=.cat
- #		 INSTOBJEXT=.cat
--#		 DATADIRNAME=lib
-+#		 DATADIRNAME=share
- #		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- #		 INTLLIBS=$INTLDEPS
- #		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/palm/gnomepilot-conduits2/files/patch-email_email_conduit.c b/palm/gnomepilot-conduits2/files/patch-email_email_conduit.c
new file mode 100644
index 000000000000..e10f9f7c1de5
--- /dev/null
+++ b/palm/gnomepilot-conduits2/files/patch-email_email_conduit.c
@@ -0,0 +1,11 @@
+--- email/email_conduit.c.orig	Tue Apr 15 02:29:36 2003
++++ email/email_conduit.c	Tue Apr 15 02:30:00 2003
+@@ -47,7 +47,7 @@
+ 	prefix = g_strdup_printf("/gnome-pilot.d/email-conduit/Pilot_%u/",pilotId);
+   
+ 	gnome_config_push_prefix(prefix);
+-	(*c)->sendmail = gnome_config_get_string( "sendmail=/usr/lib/sendmail -t -i");
++	(*c)->sendmail = gnome_config_get_string( "sendmail=/usr/sbin/sendmail -t -i");
+ 	(*c)->fromAddr = gnome_config_get_string( "from_address" );
+ 	(*c)->sendAction = gnome_config_get_string( "send_action=file");
+ 	(*c)->mhDirectory = gnome_config_get_string( "mh_directory" );
diff --git a/palm/gnomepilot-conduits2/files/patch-icon-path b/palm/gnomepilot-conduits2/files/patch-icon-path
deleted file mode 100644
index 61b499002a70..000000000000
--- a/palm/gnomepilot-conduits2/files/patch-icon-path
+++ /dev/null
@@ -1,36 +0,0 @@
---- email/sendmail.conduit.in.orig	Sun Dec  2 03:17:09 2001
-+++ email/sendmail.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -4,5 +4,5 @@
- <conduit-attribute name="description" value="Mails your Palm emails via sendmail"/>
- <conduit-attribute name="default-synctype" value="custom"/>
- <conduit-attribute name="settings" value="TRUE"/>
--<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-mailcheck.png"/>
-+<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-mailcheck.png"/>
- </gnome-pilot-conduit>
---- expense/expense.conduit.in.orig	Sun Dec  2 03:17:13 2001
-+++ expense/expense.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -5,5 +5,5 @@
- 	<conduit-attribute name="default-synctype" value="synchronize"/>
-      	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot"/>
-      	<conduit-attribute name="settings" value="TRUE"/>
--     	<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-money.png"/>
-+     	<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-money.png"/>
- </gnome-pilot-conduit>
---- memo_file/memofile.conduit.in.orig	Sun Dec  2 03:17:09 2001
-+++ memo_file/memofile.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -5,5 +5,5 @@
-      <conduit-attribute name="default-synctype" value="synchronize"/>
-      <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
-      <conduit-attribute name="settings" value="TRUE"/>
--     <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-note.png"/>
-+     <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-note.png"/>
- </gnome-pilot-conduit>
---- time/time.conduit.in.orig	Sun Dec  2 03:17:09 2001
-+++ time/time.conduit.in	Sun Dec  2 03:19:29 2001
-@@ -5,5 +5,5 @@
-      <conduit-attribute name="default-synctype" value="synchronize"/>
-      <conduit-attribute name="valid-synctypes" value="synchronize"/>
-      <conduit-attribute name="settings" value="TRUE"/>
--     <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-clock.png"/>
-+     <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-clock.png"/>
- </gnome-pilot-conduit>
diff --git a/palm/gnomepilot-conduits2/files/patch-mal-conduit::mal::client::unix::MAL31DBConfig.c b/palm/gnomepilot-conduits2/files/patch-mal-conduit::mal::client::unix::MAL31DBConfig.c
deleted file mode 100644
index 6a454fa5e978..000000000000
--- a/palm/gnomepilot-conduits2/files/patch-mal-conduit::mal::client::unix::MAL31DBConfig.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- mal-conduit/mal/client/unix/MAL31DBConfig.c	2001/12/14 11:48:37	1.1
-+++ mal-conduit/mal/client/unix/MAL31DBConfig.c	2001/12/14 11:49:50
-@@ -20,7 +20,11 @@
-  */
- 
- #include <MAL31DBConfig.h>
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>

-+#endif
- 
- /*---------------------------------------------------------------------------*/
- void
diff --git a/palm/gnomepilot-conduits2/files/patch-mal-conduit_mal_client_unix_malsync.c b/palm/gnomepilot-conduits2/files/patch-mal-conduit_mal_client_unix_malsync.c
deleted file mode 100644
index aaa36fcc0938..000000000000
--- a/palm/gnomepilot-conduits2/files/patch-mal-conduit_mal_client_unix_malsync.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- mal-conduit/mal/client/unix/malsync.c.orig	Tue Sep 17 18:43:28 2002
-+++ mal-conduit/mal/client/unix/malsync.c	Tue Sep 17 18:43:45 2002
-@@ -1409,12 +1409,12 @@
-     signal(SIGSEGV, SigHandler);
- #endif
-     
--    if (!(sd = pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
-+    if (!(sd = pi_socket(PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
-         perror("pi_socket");
-         exit(1);
-     }
-     
--    addr.pi_family = PI_AF_SLP;
-+    addr.pi_family = PI_PF_SLP;
-     strcpy(addr.pi_device, device);
-     
-     ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
diff --git a/palm/gnomepilot-conduits2/pkg-descr b/palm/gnomepilot-conduits2/pkg-descr
index ea9bb0b0229b..a4dec8905fca 100644
--- a/palm/gnomepilot-conduits2/pkg-descr
+++ b/palm/gnomepilot-conduits2/pkg-descr
@@ -1,3 +1,3 @@
-Additional conduits for gnome-pilot
+Additional conduits for gnome-pilot2.
 
 WWW: http://www.gnome.org/gnome-pilot/
diff --git a/palm/gnomepilot-conduits2/pkg-plist b/palm/gnomepilot-conduits2/pkg-plist
index b5eb0040e93b..f8a8fb2e394c 100644
--- a/palm/gnomepilot-conduits2/pkg-plist
+++ b/palm/gnomepilot-conduits2/pkg-plist
@@ -10,7 +10,9 @@ share/gnome/gnome-pilot/conduits/sendmail.conduit
 share/gnome/gnome-pilot/conduits/time.conduit
 share/gnome/pixmaps/avantgo.png
 share/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/be/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ca/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/cs/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/da/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/de/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/el/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -18,6 +20,7 @@ share/locale/es/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/fi/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/fr/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/gl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/he/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/hu/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -31,5 +34,6 @@ share/locale/sk/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/sv/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/tr/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/vi/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo