26 files changed, 52 insertions, 162 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 86c055dad29f..c413199bf9ac 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits2
-PORTVERSION=	2.0.10
-PORTREVISION=	3
+PORTVERSION=	2.0.11
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
@@ -24,7 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	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 ac537e0726ef..41110547b540 100644
--- a/palm/gnome-pilot-conduits/distinfo
+++ b/palm/gnome-pilot-conduits/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-pilot-conduits-2.0.10.tar.bz2) = f6c0c608b04fabe6c83431ed2bda1ec3
-SIZE (gnome2/gnome-pilot-conduits-2.0.10.tar.bz2) = 390631
+MD5 (gnome2/gnome-pilot-conduits-2.0.11.tar.bz2) = 005f97828e91d552b4d20e22ced1ec58
+SIZE (gnome2/gnome-pilot-conduits-2.0.11.tar.bz2) = 459942
diff --git a/palm/gnome-pilot-conduits/files/patch-configure b/palm/gnome-pilot-conduits/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/palm/gnome-pilot-conduits/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index 3794c796d941..bb56fffd6c8a 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -16,13 +16,17 @@ 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
+share/locale/en_CA/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/en_GB/LC_MESSAGES/gnome-pilot-conduits.mo
 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/hr/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/ms/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/nn/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/no/LC_MESSAGES/gnome-pilot-conduits.mo
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 824ed8bbfa37..c29d39d914bd 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot2
-PORTVERSION=	2.0.10
-PORTREVISION=	3
+PORTVERSION=	2.0.11
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
@@ -24,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index 48aae94e8037..02a09120fc72 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/gnome-pilot-2.0.10.tar.bz2) = 840ed31beddf1398ea4bb3c01b6caa70
-SIZE (gnome/gnome-pilot-2.0.10.tar.bz2) = 710069
+MD5 (gnome/gnome-pilot-2.0.11.tar.bz2) = 74ddcee24decb9524f993a4d3ced17b2
+SIZE (gnome/gnome-pilot-2.0.11.tar.bz2) = 871530
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index 27a95c91d287..fe734c76b010 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -1,13 +1,5 @@
 --- configure.orig	Mon Apr 14 16:24:54 2003
 +++ configure	Mon Apr 14 21:12:15 2003
-@@ -7162,6 +7162,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -10653,7 +10654,7 @@
  
  
diff --git a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-capplet.c b/palm/gnome-pilot/files/patch-capplet_gnome-pilot-capplet.c
deleted file mode 100644
index 3ee575f454e7..000000000000
--- a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-capplet.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-capplet.c.orig	Mon Aug  2 20:10:43 2004
-+++ capplet/gnome-pilot-capplet.c	Mon Aug  2 20:11:25 2004
-@@ -183,6 +183,7 @@
- 	init_widgets (gpcap);
- 
-  error:
-+	return;
- }
- 
- GnomePilotCapplet *
diff --git a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-cdialog.c b/palm/gnome-pilot/files/patch-capplet_gnome-pilot-cdialog.c
deleted file mode 100644
index a255a95466f1..000000000000
--- a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-cdialog.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-cdialog.c.orig	Mon Aug  2 20:12:19 2004
-+++ capplet/gnome-pilot-cdialog.c	Mon Aug  2 20:12:25 2004
-@@ -123,6 +123,7 @@
- 	gnome_dialog_close_hides (GNOME_DIALOG (priv->dialog), TRUE);
- 	
-  error:
-+	return;
- }
- 
- 
diff --git a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-ddialog.c b/palm/gnome-pilot/files/patch-capplet_gnome-pilot-ddialog.c
deleted file mode 100644
index 70b567e3ff4b..000000000000
--- a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-ddialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplet/gnome-pilot-ddialog.c.orig	Tue Apr 22 23:12:36 2003
-+++ capplet/gnome-pilot-ddialog.c	Thu Aug  5 14:38:01 2004
-@@ -123,6 +123,7 @@
- 	}
- 
-  error:
-+	return;
- }
- 
- 
-
diff --git a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-druid.c b/palm/gnome-pilot/files/patch-capplet_gnome-pilot-druid.c
deleted file mode 100644
index c92f5c48bde9..000000000000
--- a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-druid.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-druid.c.orig	Mon Aug  2 20:12:33 2004
-+++ capplet/gnome-pilot-druid.c	Mon Aug  2 20:12:44 2004
-@@ -181,6 +181,7 @@
- 	init_widgets (gpd);
- 
-  error:
-+	return;
- }
- 
- 
diff --git a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-pdialog.c b/palm/gnome-pilot/files/patch-capplet_gnome-pilot-pdialog.c
deleted file mode 100644
index 353760a266f4..000000000000
--- a/palm/gnome-pilot/files/patch-capplet_gnome-pilot-pdialog.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-pdialog.c.orig	Mon Aug  2 20:11:37 2004
-+++ capplet/gnome-pilot-pdialog.c	Mon Aug  2 20:11:43 2004
-@@ -144,6 +144,7 @@
- 	}
- 
-  error:
-+	return;
- }
- 
- 
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index febaf67ebb6e..70d66e4763fb 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -38,6 +38,7 @@ share/gnome/control-center-2.0/capplets/gpilotd-control-applet.desktop
 share/gnome/gnome-pilot/conduits/backup.conduit
 share/gnome/gnome-pilot/conduits/file.conduit
 share/gnome/gnome-pilot/conduits/test.conduit
+share/gnome/gnome-pilot/devices.xml
 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
@@ -62,32 +63,43 @@ share/locale/cy/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/en_CA/LC_MESSAGES/gnome-pilot.mo
+share/locale/en_GB/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/he/LC_MESSAGES/gnome-pilot.mo
+share/locale/hr/LC_MESSAGES/gnome-pilot.mo
 share/locale/hu/LC_MESSAGES/gnome-pilot.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot.mo
+share/locale/ko/LC_MESSAGES/gnome-pilot.mo
+share/locale/ms/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/pa/LC_MESSAGES/gnome-pilot.mo
 share/locale/pl/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/sr/LC_MESSAGES/gnome-pilot.mo
+share/locale/sr@Latn/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
 share/locale/vi/LC_MESSAGES/gnome-pilot.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/omf/gnome-pilot
 @dirrm share/gnome/help/gnome-pilot/C
 @dirrm share/gnome/help/gnome-pilot
 @dirrm share/gnome/gnome-pilot/glade
-@dirrm share/gnome/gnome-pilot
-@dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
+@unexec rmdir %D/share/gnome/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/gnome/gnome-pilot 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/lib/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/lib/gnome-pilot 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-pilot/gnome-pilot-C.omf 2>/dev/null || /usr/bin/true
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 86c055dad29f..c413199bf9ac 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits2
-PORTVERSION=	2.0.10
-PORTREVISION=	3
+PORTVERSION=	2.0.11
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
@@ -24,7 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	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 ac537e0726ef..41110547b540 100644
--- a/palm/gnomepilot-conduits2/distinfo
+++ b/palm/gnomepilot-conduits2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-pilot-conduits-2.0.10.tar.bz2) = f6c0c608b04fabe6c83431ed2bda1ec3
-SIZE (gnome2/gnome-pilot-conduits-2.0.10.tar.bz2) = 390631
+MD5 (gnome2/gnome-pilot-conduits-2.0.11.tar.bz2) = 005f97828e91d552b4d20e22ced1ec58
+SIZE (gnome2/gnome-pilot-conduits-2.0.11.tar.bz2) = 459942
diff --git a/palm/gnomepilot-conduits2/files/patch-configure b/palm/gnomepilot-conduits2/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/palm/gnomepilot-conduits2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/palm/gnomepilot-conduits2/pkg-plist b/palm/gnomepilot-conduits2/pkg-plist
index 3794c796d941..bb56fffd6c8a 100644
--- a/palm/gnomepilot-conduits2/pkg-plist
+++ b/palm/gnomepilot-conduits2/pkg-plist
@@ -16,13 +16,17 @@ 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
+share/locale/en_CA/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/en_GB/LC_MESSAGES/gnome-pilot-conduits.mo
 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/hr/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/ms/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/nn/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/no/LC_MESSAGES/gnome-pilot-conduits.mo
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 824ed8bbfa37..c29d39d914bd 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot2
-PORTVERSION=	2.0.10
-PORTREVISION=	3
+PORTVERSION=	2.0.11
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
@@ -24,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/palm/gnomepilot2/distinfo b/palm/gnomepilot2/distinfo
index 48aae94e8037..02a09120fc72 100644
--- a/palm/gnomepilot2/distinfo
+++ b/palm/gnomepilot2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/gnome-pilot-2.0.10.tar.bz2) = 840ed31beddf1398ea4bb3c01b6caa70
-SIZE (gnome/gnome-pilot-2.0.10.tar.bz2) = 710069
+MD5 (gnome/gnome-pilot-2.0.11.tar.bz2) = 74ddcee24decb9524f993a4d3ced17b2
+SIZE (gnome/gnome-pilot-2.0.11.tar.bz2) = 871530
diff --git a/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa
index 27a95c91d287..fe734c76b010 100644
--- a/palm/gnomepilot2/files/patch-aa
+++ b/palm/gnomepilot2/files/patch-aa
@@ -1,13 +1,5 @@
 --- configure.orig	Mon Apr 14 16:24:54 2003
 +++ configure	Mon Apr 14 21:12:15 2003
-@@ -7162,6 +7162,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -10653,7 +10654,7 @@
  
  
diff --git a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-capplet.c b/palm/gnomepilot2/files/patch-capplet_gnome-pilot-capplet.c
deleted file mode 100644
index 3ee575f454e7..000000000000
--- a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-capplet.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-capplet.c.orig	Mon Aug  2 20:10:43 2004
-+++ capplet/gnome-pilot-capplet.c	Mon Aug  2 20:11:25 2004
-@@ -183,6 +183,7 @@
- 	init_widgets (gpcap);
- 
-  error:
-+	return;
- }
- 
- GnomePilotCapplet *
diff --git a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-cdialog.c b/palm/gnomepilot2/files/patch-capplet_gnome-pilot-cdialog.c
deleted file mode 100644
index a255a95466f1..000000000000
--- a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-cdialog.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-cdialog.c.orig	Mon Aug  2 20:12:19 2004
-+++ capplet/gnome-pilot-cdialog.c	Mon Aug  2 20:12:25 2004
-@@ -123,6 +123,7 @@
- 	gnome_dialog_close_hides (GNOME_DIALOG (priv->dialog), TRUE);
- 	
-  error:
-+	return;
- }
- 
- 
diff --git a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-ddialog.c b/palm/gnomepilot2/files/patch-capplet_gnome-pilot-ddialog.c
deleted file mode 100644
index 70b567e3ff4b..000000000000
--- a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-ddialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplet/gnome-pilot-ddialog.c.orig	Tue Apr 22 23:12:36 2003
-+++ capplet/gnome-pilot-ddialog.c	Thu Aug  5 14:38:01 2004
-@@ -123,6 +123,7 @@
- 	}
- 
-  error:
-+	return;
- }
- 
- 
-
diff --git a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-druid.c b/palm/gnomepilot2/files/patch-capplet_gnome-pilot-druid.c
deleted file mode 100644
index c92f5c48bde9..000000000000
--- a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-druid.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-druid.c.orig	Mon Aug  2 20:12:33 2004
-+++ capplet/gnome-pilot-druid.c	Mon Aug  2 20:12:44 2004
-@@ -181,6 +181,7 @@
- 	init_widgets (gpd);
- 
-  error:
-+	return;
- }
- 
- 
diff --git a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-pdialog.c b/palm/gnomepilot2/files/patch-capplet_gnome-pilot-pdialog.c
deleted file mode 100644
index 353760a266f4..000000000000
--- a/palm/gnomepilot2/files/patch-capplet_gnome-pilot-pdialog.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- capplet/gnome-pilot-pdialog.c.orig	Mon Aug  2 20:11:37 2004
-+++ capplet/gnome-pilot-pdialog.c	Mon Aug  2 20:11:43 2004
-@@ -144,6 +144,7 @@
- 	}
- 
-  error:
-+	return;
- }
- 
- 
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index febaf67ebb6e..70d66e4763fb 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -38,6 +38,7 @@ share/gnome/control-center-2.0/capplets/gpilotd-control-applet.desktop
 share/gnome/gnome-pilot/conduits/backup.conduit
 share/gnome/gnome-pilot/conduits/file.conduit
 share/gnome/gnome-pilot/conduits/test.conduit
+share/gnome/gnome-pilot/devices.xml
 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
@@ -62,32 +63,43 @@ share/locale/cy/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/en_CA/LC_MESSAGES/gnome-pilot.mo
+share/locale/en_GB/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/he/LC_MESSAGES/gnome-pilot.mo
+share/locale/hr/LC_MESSAGES/gnome-pilot.mo
 share/locale/hu/LC_MESSAGES/gnome-pilot.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot.mo
+share/locale/ko/LC_MESSAGES/gnome-pilot.mo
+share/locale/ms/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/pa/LC_MESSAGES/gnome-pilot.mo
 share/locale/pl/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/sr/LC_MESSAGES/gnome-pilot.mo
+share/locale/sr@Latn/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
 share/locale/vi/LC_MESSAGES/gnome-pilot.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/omf/gnome-pilot
 @dirrm share/gnome/help/gnome-pilot/C
 @dirrm share/gnome/help/gnome-pilot
 @dirrm share/gnome/gnome-pilot/glade
-@dirrm share/gnome/gnome-pilot
-@dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
+@unexec rmdir %D/share/gnome/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/gnome/gnome-pilot 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/lib/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/lib/gnome-pilot 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-pilot/gnome-pilot-C.omf 2>/dev/null || /usr/bin/true