7 files changed, 44 insertions, 124 deletions

diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index bfd1ae50c811..325602079c28 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.52
-PORTREVISION=	1
+PORTVERSION=	0.1.63
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	http://www.eskil.org/gnome-pilot/download/tarballs/ \
+		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-pilot
 DISTNAME=	gnome-pilot-${PORTVERSION}
 
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index e5d3246148d5..429b616d3a48 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.52.tar.gz) = f31268b4c50bf8a6ba2ae352c36d802a
+MD5 (gnome-pilot-0.1.63.tar.gz) = e74c5245b8f057cd8373353fc19019ec
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index 4f02722e0dea..513072edc274 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -22,14 +22,3 @@
  		
  		
  	else
-@@ -5915,8 +5915,8 @@
- fi
- 
- GPILOT_LIBDIR='-L${libdir}'
--GPILOT_LIBS="-lgpilotd -lgpilotdcm -lgpilotdconduit `gnome-config --libs gnome` `glib-config --libs glib gmodule`"
--GPILOT_INCLUDEDIR="-I${includedir} `gnome-config --cflags gnome` `glib-config --cflags glib gmodule`"
-+GPILOT_LIBS="-lgpilotd -lgpilotdcm -lgpilotdconduit `gnome-config --libs gnome` `$GLIB_CONFIG --libs glib gmodule`"
-+GPILOT_INCLUDEDIR="-I${includedir} `gnome-config --cflags gnome` `$GLIB_CONFIG --cflags glib gmodule`"
- 
- 
- 
diff --git a/palm/gnome-pilot/files/patch-ag b/palm/gnome-pilot/files/patch-ag
deleted file mode 100644
index 47c20628cf94..000000000000
--- a/palm/gnome-pilot/files/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
---- gpilotd/gpilotd.c.orig	Tue Mar 28 17:44:17 2000
-+++ gpilotd/gpilotd.c	Wed Apr  5 17:08:46 2000
-@@ -6,6 +6,7 @@
- 
- #include <pthread.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <pwd.h>
- #include <errno.h>
- #include <sys/time.h>
diff --git a/palm/gnome-pilot/files/patch-ai b/palm/gnome-pilot/files/patch-ai
deleted file mode 100644
index 541117e39c51..000000000000
--- a/palm/gnome-pilot/files/patch-ai
+++ /dev/null
@@ -1,55 +0,0 @@
---- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
-+++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
-@@ -192,7 +192,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libbackup_conduit_la_LDFLAGS = 
-+libbackup_conduit_la_LDFLAGS = -avoid-version
- libbackup_conduit_la_DEPENDENCIES = 
- libbackup_conduit_la_OBJECTS =  backup_conduit.lo
- PROGRAMS =  $(bin_PROGRAMS)
---- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
-+++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
-@@ -192,7 +192,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libemail_conduit_la_LDFLAGS = 
-+libemail_conduit_la_LDFLAGS = -avoid-version
- libemail_conduit_la_DEPENDENCIES = 
- libemail_conduit_la_OBJECTS =  email_conduit.lo parsedate.lo
- PROGRAMS =  $(bin_PROGRAMS)
---- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
-+++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
-@@ -192,7 +192,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libexpense_conduit_la_LDFLAGS = 
-+libexpense_conduit_la_LDFLAGS = -avoid-version
- libexpense_conduit_la_DEPENDENCIES = 
- libexpense_conduit_la_OBJECTS =  expense_conduit.lo
- PROGRAMS =  $(bin_PROGRAMS)
---- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
-+++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
-@@ -202,7 +202,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libfile_conduit_la_LDFLAGS = 
-+libfile_conduit_la_LDFLAGS = -avoid-version
- libfile_conduit_la_DEPENDENCIES = 
- libfile_conduit_la_OBJECTS =  file_conduit.lo
- PROGRAMS =  $(bin_PROGRAMS)
---- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
-+++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
-@@ -192,7 +192,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libmemo_file_conduit_la_LDFLAGS = 
-+libmemo_file_conduit_la_LDFLAGS = -avoid-version
- libmemo_file_conduit_la_DEPENDENCIES = 
- libmemo_file_conduit_la_OBJECTS =  memo_file_conduit.lo
- PROGRAMS =  $(bin_PROGRAMS)
diff --git a/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c b/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
new file mode 100644
index 000000000000..d4533162b8a2
--- /dev/null
+++ b/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
@@ -0,0 +1,11 @@
+--- libgpilotdCM/gnome-pilot-conduit-management.c.orig	Tue Jun 19 09:47:42 2001
++++ libgpilotdCM/gnome-pilot-conduit-management.c	Sun Dec  2 02:55:26 2001
+@@ -238,7 +238,7 @@
+ 			GList *iterator;
+ 
+ 			/* Do read of all .conduit files here */
+-			conduit_files = get_conduit_file_names ("share/gnome-pilot/conduits", ".conduit");
++			conduit_files = get_conduit_file_names ("share/gnome/gnome-pilot/conduits", ".conduit");
+  
+ 			LOCK_MY_HASHES;
+ 			conduitname_to_datastruct  = g_hash_table_new (g_str_hash,g_str_equal);
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index ee272e1cc354..d50a550121cc 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -1,99 +1,84 @@
-bin/backup-conduit-control-applet
-bin/email-conduit-control-applet
-bin/expense-conduit-control-applet
-bin/file-conduit-control-applet
 bin/gnome-pilot-make-password
+bin/gpilot-applet
 bin/gpilot-install-file
 bin/gpilotd
 bin/gpilotd-client
 bin/gpilotd-control-applet
 bin/gpilotd-session-wrapper
 bin/gpilotdcm-client
-bin/memo_file_capplet
-bin/pilot_applet
+etc/CORBA/servers/gpilot-applet.gnorba
 etc/CORBA/servers/gpilotd.gnorba
-etc/CORBA/servers/pilot_applet.gnorba
 etc/gpilotConf.sh
 include/gpilotd/gnome-pilot-client.h
 include/gpilotd/gnome-pilot-conduit-backup.h
 include/gpilotd/gnome-pilot-conduit-file.h
 include/gpilotd/gnome-pilot-conduit-standard-abs.h
 include/gpilotd/gnome-pilot-conduit-standard.h
+include/gpilotd/gnome-pilot-conduit-sync-abs.h
 include/gpilotd/gnome-pilot-conduit.h
 include/gpilotd/gnome-pilot-dbinfo.h
+include/gpilotd/gnome-pilot-structures.h
 include/gpilotd/gnome-pilot.h
-include/gpilotd/gpilot-structures.h
-include/gpilotd/gpilot-userinfo.h
-include/gpilotd/gpilotd-app-dummy-callbacks.h
-include/gpilotd/gpilotd-app.h
-include/gpilotd/gpilotd-conduit-mgmt.h
 include/libgpilotdCM/gnome-pilot-conduit-config.h
 include/libgpilotdCM/gnome-pilot-conduit-management.h
 lib/gnome-pilot/conduits/libbackup_conduit.so
-lib/gnome-pilot/conduits/libemail_conduit.so
-lib/gnome-pilot/conduits/libexpense_conduit.so
 lib/gnome-pilot/conduits/libfile_conduit.so
-lib/gnome-pilot/conduits/libmemo_file_conduit.so
+lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
-lib/libgpilotd.so
-lib/libgpilotd.so.0
+lib/libgpilotd.so.1
 lib/libgpilotdcm.a
-lib/libgpilotdcm.so
-lib/libgpilotdcm.so.0
+lib/libgpilotdcm.so.1
 lib/libgpilotdconduit.a
-lib/libgpilotdconduit.so
-lib/libgpilotdconduit.so.0
-share/gnome/apps/Settings/Peripherals/Conduits/.directory
-share/gnome/apps/Settings/Peripherals/Conduits/backup-conduit-control-applet.desktop
-share/gnome/apps/Settings/Peripherals/Conduits/email-conduit-control-applet.desktop
-share/gnome/apps/Settings/Peripherals/Conduits/expense-conduit-control-applet.desktop
-share/gnome/apps/Settings/Peripherals/Conduits/file-conduit-control-applet.desktop
-share/gnome/apps/Settings/Peripherals/Conduits/memo_file_capplet.desktop
+lib/libgpilotdconduit.so.1
+man/man1/gpilot-install-file.1
+share/gnome/applets/Utility/gpilot-applet.desktop
+share/gnome/apps/Settings/Peripherals/gpilotd-conduits-capplet.desktop
 share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
-share/gnome/applets/Utility/pilot_applet.desktop
-share/gnome/control-center/Peripherals/Conduits/.directory
-share/gnome/control-center/Peripherals/Conduits/backup-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/email-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/expense-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/file-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/control-center/Peripherals/gpilotd-conduits-capplet.desktop
 share/gnome/control-center/Peripherals/gpilotd-control-applet.desktop
 share/gnome/gnome-pilot/conduits/backup.conduit
-share/gnome/gnome-pilot/conduits/expense.conduit
 share/gnome/gnome-pilot/conduits/file.conduit
-share/gnome/gnome-pilot/conduits/memofile.conduit
-share/gnome/gnome-pilot/conduits/sendmail.conduit
+share/gnome/gnome-pilot/conduits/test.conduit
 share/gnome/gnome-pilot/glade/gnome-palm.png
 share/gnome/gnome-pilot/glade/gnome-pilot-watermark.png
 share/gnome/gnome-pilot/glade/gpilotd-capplet.glade
 share/gnome/gnome-pilot/glade/pilot-applet.glade
-share/gnome/gob/gnome-pilot-client.gob
-share/gnome/gob/gnome-pilot-conduit-config.gob
-share/gnome/gob/gnome-pilot-conduit-management.gob
 share/gnome/idl/gnome-pilot.idl
 share/gnome/mime-info/palm.keys
 share/gnome/mime-info/palm.mime
+share/gnome/oaf/gpilot-applet.oafinfo
+share/gnome/oaf/gpilotd.oafinfo
+share/gnome/pixmaps/gnome-palm-conduit.png
 share/gnome/pixmaps/gnome-palm.png
 share/gnome/pixmaps/sync_broken.png
 share/gnome/pixmaps/sync_icon.png
+share/gnome/pixmaps/sync_paused.png
 share/gnome/pixmaps/syncing_icon.png
+share/locale/az/LC_MESSAGES/gnome-pilot.mo
+share/locale/ca/LC_MESSAGES/gnome-pilot.mo
 share/locale/da/LC_MESSAGES/gnome-pilot.mo
+share/locale/de/LC_MESSAGES/gnome-pilot.mo
 share/locale/el/LC_MESSAGES/gnome-pilot.mo
 share/locale/es/LC_MESSAGES/gnome-pilot.mo
+share/locale/fi/LC_MESSAGES/gnome-pilot.mo
 share/locale/fr/LC_MESSAGES/gnome-pilot.mo
+share/locale/gl/LC_MESSAGES/gnome-pilot.mo
+share/locale/hu/LC_MESSAGES/gnome-pilot.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot.mo
+share/locale/nl/LC_MESSAGES/gnome-pilot.mo
+share/locale/nn/LC_MESSAGES/gnome-pilot.mo
 share/locale/no/LC_MESSAGES/gnome-pilot.mo
 share/locale/pl/LC_MESSAGES/gnome-pilot.mo
-share/locale/pt_PT/LC_MESSAGES/gnome-pilot.mo
+share/locale/pt/LC_MESSAGES/gnome-pilot.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-pilot.mo
 share/locale/ru/LC_MESSAGES/gnome-pilot.mo
+share/locale/sk/LC_MESSAGES/gnome-pilot.mo
 share/locale/sv/LC_MESSAGES/gnome-pilot.mo
+share/locale/tr/LC_MESSAGES/gnome-pilot.mo
 share/locale/uk/LC_MESSAGES/gnome-pilot.mo
-@dirrm share/gnome/gob
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot
-@dirrm share/gnome/control-center/Peripherals/Conduits
-@dirrm share/gnome/apps/Settings/Peripherals/Conduits
 @dirrm lib/gnome-pilot/conduits
 @dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM