Add gnomepilot2 after a repo copy from gnomepilot. gnomepilot2 is the

PalmOS conduit system for GNOME 2.

18 files changed, 84 insertions, 258 deletions

diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index dccff7e837ea..181f6e1bc881 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -1,32 +1,29 @@
-# New ports collection makefile for:	gnomepilot
-# Date created:		28th October 1999
-# Whom:			Ade Lovett <ade@lovett.com>
+# New ports collection makefile for:	gnomepilot2
+# Date created:		12 March 2003
+# Whom:			Joe Marcus Clarke <marcus@marcuscom.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomepilot
-PORTVERSION=	0.1.71
+PORTNAME=	gnomepilot2
+PORTVERSION=	2.0.3
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://www.eskil.org/gnome-pilot/download/tarballs/
-MASTER_SITE_SUBDIR=	sources/gnome-pilot/0.1
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
 DISTNAME=	gnome-pilot-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	3Com PalmPilot conduit system for GNOME
+COMMENT=	3Com PalmPilot conduit system for GNOME 2
 
-BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
-LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2
+LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnomepanel
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs libglade gnomevfs libpanel \
-		libcapplet
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index 6bf203c2b979..d8a36af541b6 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-0.1.71.tar.bz2) = 9d0018831605418aa6f74f129b5a506f
+MD5 (gnome/gnome-pilot-2.0.3.tar.bz2) = 51492edf2415ae62ac9b2738b869c35a
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index fe24d8508a77..943a37e42eb6 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -1,16 +1,5 @@
 --- configure.orig	Thu Oct 24 10:43:46 2002
 +++ configure	Thu Oct 24 22:06:58 2002
-@@ -1265,10 +1265,6 @@
- 
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
--  test "$program_prefix$program_suffix$program_transform_name" = \
--    NONENONEs,x,x, &&
--  program_prefix=${target_alias}-
- 
- GNOME_PILOT_MAJOR=0
- GNOME_PILOT_REVISION=1
 @@ -6474,6 +6470,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -19,36 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -6707,8 +6704,8 @@
- 
- 		gnome_cv_gnorba_found=no
- 		if test x$gnome_cv_orbit_found = xyes; then
--			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 			if test -n "$GNORBA_LIBS"; then
- 				gnome_cv_gnorba_found=yes
- 			fi
-@@ -6727,8 +6724,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 
--		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 
- 	else
- 	    	if test xfail = xfailure; then
-@@ -11322,8 +11319,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`"
- 
- # Check whether --with-oaf or --without-oaf was given.
- if test "${with_oaf+set}" = set; then
diff --git a/palm/gnome-pilot/files/patch-ah b/palm/gnome-pilot/files/patch-ah
deleted file mode 100644
index c8bcc5dc63df..000000000000
--- a/palm/gnome-pilot/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Mar 31 11:05:19 2000
-+++ Makefile.in	Wed Apr  5 17:16:05 2000
-@@ -156,7 +156,7 @@
- 
- bin_SCRIPTS = gnome-pilot-config
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = gpilotConf.sh
- 
- EXTRA_DIST =  	gnome-pilot.spec 		gpilotConf.sh.in
diff --git a/palm/gnome-pilot/files/patch-capplet::Makefile.in b/palm/gnome-pilot/files/patch-capplet::Makefile.in
deleted file mode 100644
index 3f33fb1efccc..000000000000
--- a/palm/gnome-pilot/files/patch-capplet::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- capplet/Makefile.in	2002/04/25 16:25:08	1.1
-+++ capplet/Makefile.in	2002/04/25 16:25:15
-@@ -174,7 +174,7 @@
- 	$(NULL)
- 
- 
--CFLAGS = @CFLAGS@ -g
-+CFLAGS = @CFLAGS@
- 
- gpilotd_control_applet_SOURCES = \
- 	gpilotd-control-applet.c 	\
diff --git a/palm/gnome-pilot/files/patch-gpilotd::Makefile.in b/palm/gnome-pilot/files/patch-gpilotd::Makefile.in
deleted file mode 100644
index c454b7787ade..000000000000
--- a/palm/gnome-pilot/files/patch-gpilotd::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gpilotd/Makefile.in	2002/04/25 16:24:16	1.1
-+++ gpilotd/Makefile.in	2002/04/25 16:24:35
-@@ -305,7 +305,7 @@
- CFLAGS = \
- 	-Wall -Wmissing-prototypes			\
- 	 -Wmissing-declarations				\
--	 -Wpointer-arith -g 				\
-+	 -Wpointer-arith 				\
- 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
- 	$(NULL)
- 
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
index d4533162b8a2..82bf09dd7847 100644
--- a/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
+++ b/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
@@ -1,11 +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 @@
+--- libgpilotdCM/gnome-pilot-conduit-management.c.orig	Thu Feb  6 03:35:48 2003
++++ libgpilotdCM/gnome-pilot-conduit-management.c	Wed Mar 12 23:12:10 2003
+@@ -235,7 +235,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");
+-			conduit_files = self_get_conduit_file_names ("share/gnome-pilot/conduits", ".conduit");
++			conduit_files = self_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/files/patch-po::Makefile.in.in b/palm/gnome-pilot/files/patch-po::Makefile.in.in
deleted file mode 100644
index 68b6a8c98491..000000000000
--- a/palm/gnome-pilot/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/01/14 11:02:35	1.1
-+++ po/Makefile.in.in	2002/01/14 11:02:49
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index ee209e5d80b8..64723e61c74e 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -1,12 +1,10 @@
 bin/gnome-pilot-make-password
-bin/gpilot-applet
 bin/gpilot-install-file
-bin/gpilotd
 bin/gpilotd-control-applet
 bin/gpilotd-session-wrapper
-etc/CORBA/servers/gpilot-applet.gnorba
-etc/CORBA/servers/gpilotd.gnorba
-etc/gpilotConf.sh
+etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs/%gconf.xml
+etc/gconf/schemas/pilot.schemas
 include/gpilotd/gnome-pilot-client.h
 include/gpilotd/gnome-pilot-conduit-backup.h
 include/gpilotd/gnome-pilot-conduit-file.h
@@ -24,23 +22,26 @@ lib/gnome-pilot/conduits/libfile_conduit.so
 lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
 lib/libgpilotd.so
-lib/libgpilotd.so.1
+lib/libgpilotd.so.2
 lib/libgpilotdcm.a
 lib/libgpilotdcm.so
-lib/libgpilotdcm.so.1
+lib/libgpilotdcm.so.2
 lib/libgpilotdconduit.a
 lib/libgpilotdconduit.so
-lib/libgpilotdconduit.so.1
-share/gnome/applets/Utility/gpilot-applet.desktop
-share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
-share/gnome/control-center/Peripherals/gpilotd-control-applet.desktop
+lib/libgpilotdconduit.so.2
+libdata/bonobo/servers/GNOME_PilotApplet.server
+libdata/bonobo/servers/GNOME_Pilot_Daemon.server
+libdata/pkgconfig/gnome-pilot-2.0.pc
+libexec/gpilot-applet
+libexec/gpilotd
+share/gnome/control-center-2.0/capplets/gpilotd-control-applet.desktop
+share/gnome/gnome-pilot-2/glade/pilot-applet.glade
 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/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/idl/gnome-pilot.idl
 share/gnome/mime-info/palm.keys
 share/gnome/mime-info/palm.mime
@@ -50,8 +51,10 @@ 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/am/LC_MESSAGES/gnome-pilot.mo
 share/locale/az/LC_MESSAGES/gnome-pilot.mo
 share/locale/ca/LC_MESSAGES/gnome-pilot.mo
+share/locale/cs/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
@@ -59,6 +62,7 @@ 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/hu/LC_MESSAGES/gnome-pilot.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot.mo
@@ -72,7 +76,16 @@ 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
+share/locale/vi/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
+@dirrm share/gnome/gnome-pilot/conduits
+@dirrm share/gnome/gnome-pilot
+@dirrm share/gnome/gnome-pilot-2/glade
+@dirrm share/gnome/gnome-pilot-2
+@dirrm lib/gnome-pilot/conduits
+@dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index dccff7e837ea..181f6e1bc881 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -1,32 +1,29 @@
-# New ports collection makefile for:	gnomepilot
-# Date created:		28th October 1999
-# Whom:			Ade Lovett <ade@lovett.com>
+# New ports collection makefile for:	gnomepilot2
+# Date created:		12 March 2003
+# Whom:			Joe Marcus Clarke <marcus@marcuscom.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomepilot
-PORTVERSION=	0.1.71
+PORTNAME=	gnomepilot2
+PORTVERSION=	2.0.3
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://www.eskil.org/gnome-pilot/download/tarballs/
-MASTER_SITE_SUBDIR=	sources/gnome-pilot/0.1
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
 DISTNAME=	gnome-pilot-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	3Com PalmPilot conduit system for GNOME
+COMMENT=	3Com PalmPilot conduit system for GNOME 2
 
-BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
-LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2
+LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnomepanel
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs libglade gnomevfs libpanel \
-		libcapplet
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/gnomepilot2/distinfo b/palm/gnomepilot2/distinfo
index 6bf203c2b979..d8a36af541b6 100644
--- a/palm/gnomepilot2/distinfo
+++ b/palm/gnomepilot2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-0.1.71.tar.bz2) = 9d0018831605418aa6f74f129b5a506f
+MD5 (gnome/gnome-pilot-2.0.3.tar.bz2) = 51492edf2415ae62ac9b2738b869c35a
diff --git a/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa
index fe24d8508a77..943a37e42eb6 100644
--- a/palm/gnomepilot2/files/patch-aa
+++ b/palm/gnomepilot2/files/patch-aa
@@ -1,16 +1,5 @@
 --- configure.orig	Thu Oct 24 10:43:46 2002
 +++ configure	Thu Oct 24 22:06:58 2002
-@@ -1265,10 +1265,6 @@
- 
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
--  test "$program_prefix$program_suffix$program_transform_name" = \
--    NONENONEs,x,x, &&
--  program_prefix=${target_alias}-
- 
- GNOME_PILOT_MAJOR=0
- GNOME_PILOT_REVISION=1
 @@ -6474,6 +6470,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -19,36 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -6707,8 +6704,8 @@
- 
- 		gnome_cv_gnorba_found=no
- 		if test x$gnome_cv_orbit_found = xyes; then
--			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 			if test -n "$GNORBA_LIBS"; then
- 				gnome_cv_gnorba_found=yes
- 			fi
-@@ -6727,8 +6724,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 
--		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 
- 	else
- 	    	if test xfail = xfailure; then
-@@ -11322,8 +11319,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`"
- 
- # Check whether --with-oaf or --without-oaf was given.
- if test "${with_oaf+set}" = set; then
diff --git a/palm/gnomepilot2/files/patch-ah b/palm/gnomepilot2/files/patch-ah
deleted file mode 100644
index c8bcc5dc63df..000000000000
--- a/palm/gnomepilot2/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Mar 31 11:05:19 2000
-+++ Makefile.in	Wed Apr  5 17:16:05 2000
-@@ -156,7 +156,7 @@
- 
- bin_SCRIPTS = gnome-pilot-config
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = gpilotConf.sh
- 
- EXTRA_DIST =  	gnome-pilot.spec 		gpilotConf.sh.in
diff --git a/palm/gnomepilot2/files/patch-capplet::Makefile.in b/palm/gnomepilot2/files/patch-capplet::Makefile.in
deleted file mode 100644
index 3f33fb1efccc..000000000000
--- a/palm/gnomepilot2/files/patch-capplet::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- capplet/Makefile.in	2002/04/25 16:25:08	1.1
-+++ capplet/Makefile.in	2002/04/25 16:25:15
-@@ -174,7 +174,7 @@
- 	$(NULL)
- 
- 
--CFLAGS = @CFLAGS@ -g
-+CFLAGS = @CFLAGS@
- 
- gpilotd_control_applet_SOURCES = \
- 	gpilotd-control-applet.c 	\
diff --git a/palm/gnomepilot2/files/patch-gpilotd::Makefile.in b/palm/gnomepilot2/files/patch-gpilotd::Makefile.in
deleted file mode 100644
index c454b7787ade..000000000000
--- a/palm/gnomepilot2/files/patch-gpilotd::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gpilotd/Makefile.in	2002/04/25 16:24:16	1.1
-+++ gpilotd/Makefile.in	2002/04/25 16:24:35
-@@ -305,7 +305,7 @@
- CFLAGS = \
- 	-Wall -Wmissing-prototypes			\
- 	 -Wmissing-declarations				\
--	 -Wpointer-arith -g 				\
-+	 -Wpointer-arith 				\
- 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
- 	$(NULL)
- 
diff --git a/palm/gnomepilot2/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c b/palm/gnomepilot2/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
index d4533162b8a2..82bf09dd7847 100644
--- a/palm/gnomepilot2/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
+++ b/palm/gnomepilot2/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
@@ -1,11 +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 @@
+--- libgpilotdCM/gnome-pilot-conduit-management.c.orig	Thu Feb  6 03:35:48 2003
++++ libgpilotdCM/gnome-pilot-conduit-management.c	Wed Mar 12 23:12:10 2003
+@@ -235,7 +235,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");
+-			conduit_files = self_get_conduit_file_names ("share/gnome-pilot/conduits", ".conduit");
++			conduit_files = self_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/gnomepilot2/files/patch-po::Makefile.in.in b/palm/gnomepilot2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 68b6a8c98491..000000000000
--- a/palm/gnomepilot2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/01/14 11:02:35	1.1
-+++ po/Makefile.in.in	2002/01/14 11:02:49
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index ee209e5d80b8..64723e61c74e 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -1,12 +1,10 @@
 bin/gnome-pilot-make-password
-bin/gpilot-applet
 bin/gpilot-install-file
-bin/gpilotd
 bin/gpilotd-control-applet
 bin/gpilotd-session-wrapper
-etc/CORBA/servers/gpilot-applet.gnorba
-etc/CORBA/servers/gpilotd.gnorba
-etc/gpilotConf.sh
+etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs/%gconf.xml
+etc/gconf/schemas/pilot.schemas
 include/gpilotd/gnome-pilot-client.h
 include/gpilotd/gnome-pilot-conduit-backup.h
 include/gpilotd/gnome-pilot-conduit-file.h
@@ -24,23 +22,26 @@ lib/gnome-pilot/conduits/libfile_conduit.so
 lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
 lib/libgpilotd.so
-lib/libgpilotd.so.1
+lib/libgpilotd.so.2
 lib/libgpilotdcm.a
 lib/libgpilotdcm.so
-lib/libgpilotdcm.so.1
+lib/libgpilotdcm.so.2
 lib/libgpilotdconduit.a
 lib/libgpilotdconduit.so
-lib/libgpilotdconduit.so.1
-share/gnome/applets/Utility/gpilot-applet.desktop
-share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
-share/gnome/control-center/Peripherals/gpilotd-control-applet.desktop
+lib/libgpilotdconduit.so.2
+libdata/bonobo/servers/GNOME_PilotApplet.server
+libdata/bonobo/servers/GNOME_Pilot_Daemon.server
+libdata/pkgconfig/gnome-pilot-2.0.pc
+libexec/gpilot-applet
+libexec/gpilotd
+share/gnome/control-center-2.0/capplets/gpilotd-control-applet.desktop
+share/gnome/gnome-pilot-2/glade/pilot-applet.glade
 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/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/idl/gnome-pilot.idl
 share/gnome/mime-info/palm.keys
 share/gnome/mime-info/palm.mime
@@ -50,8 +51,10 @@ 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/am/LC_MESSAGES/gnome-pilot.mo
 share/locale/az/LC_MESSAGES/gnome-pilot.mo
 share/locale/ca/LC_MESSAGES/gnome-pilot.mo
+share/locale/cs/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
@@ -59,6 +62,7 @@ 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/hu/LC_MESSAGES/gnome-pilot.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot.mo
@@ -72,7 +76,16 @@ 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
+share/locale/vi/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
+@dirrm share/gnome/gnome-pilot/conduits
+@dirrm share/gnome/gnome-pilot
+@dirrm share/gnome/gnome-pilot-2/glade
+@dirrm share/gnome/gnome-pilot-2
+@dirrm lib/gnome-pilot/conduits
+@dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet