6 files changed, 66 insertions, 18 deletions

diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index 513072edc274..f303e6c30144 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.orig	Wed May 10 00:02:39 2000
-+++ configure	Tue Jun 13 16:40:13 2000
-@@ -1839,8 +1839,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Dec 14 10:40:32 2001
++++ configure	Fri Dec 14 10:42:15 2001
+@@ -1851,8 +1851,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -11,7 +14,7 @@
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -1860,8 +1860,8 @@
+@@ -1872,8 +1872,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -22,3 +25,14 @@
  		
  		
  	else
+@@ -5290,8 +5290,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/pkg-plist b/palm/gnome-pilot/pkg-plist
index d50a550121cc..01ae474ffc95 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -2,10 +2,8 @@ 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
 etc/CORBA/servers/gpilot-applet.gnorba
 etc/CORBA/servers/gpilotd.gnorba
 etc/gpilotConf.sh
@@ -25,10 +23,13 @@ lib/gnome-pilot/conduits/libbackup_conduit.so
 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/libgpilotdcm.a
+lib/libgpilotdcm.so
 lib/libgpilotdcm.so.1
 lib/libgpilotdconduit.a
+lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.1
 man/man1/gpilot-install-file.1
 share/gnome/applets/Utility/gpilot-applet.desktop
@@ -76,6 +77,7 @@ 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/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot
diff --git a/palm/gnomepilot/files/patch-aa b/palm/gnomepilot/files/patch-aa
index 513072edc274..f303e6c30144 100644
--- a/palm/gnomepilot/files/patch-aa
+++ b/palm/gnomepilot/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.orig	Wed May 10 00:02:39 2000
-+++ configure	Tue Jun 13 16:40:13 2000
-@@ -1839,8 +1839,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Dec 14 10:40:32 2001
++++ configure	Fri Dec 14 10:42:15 2001
+@@ -1851,8 +1851,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -11,7 +14,7 @@
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -1860,8 +1860,8 @@
+@@ -1872,8 +1872,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -22,3 +25,14 @@
  		
  		
  	else
+@@ -5290,8 +5290,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/gnomepilot/pkg-plist b/palm/gnomepilot/pkg-plist
index d50a550121cc..01ae474ffc95 100644
--- a/palm/gnomepilot/pkg-plist
+++ b/palm/gnomepilot/pkg-plist
@@ -2,10 +2,8 @@ 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
 etc/CORBA/servers/gpilot-applet.gnorba
 etc/CORBA/servers/gpilotd.gnorba
 etc/gpilotConf.sh
@@ -25,10 +23,13 @@ lib/gnome-pilot/conduits/libbackup_conduit.so
 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/libgpilotdcm.a
+lib/libgpilotdcm.so
 lib/libgpilotdcm.so.1
 lib/libgpilotdconduit.a
+lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.1
 man/man1/gpilot-install-file.1
 share/gnome/applets/Utility/gpilot-applet.desktop
@@ -76,6 +77,7 @@ 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/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot
diff --git a/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa
index 513072edc274..f303e6c30144 100644
--- a/palm/gnomepilot2/files/patch-aa
+++ b/palm/gnomepilot2/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.orig	Wed May 10 00:02:39 2000
-+++ configure	Tue Jun 13 16:40:13 2000
-@@ -1839,8 +1839,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Dec 14 10:40:32 2001
++++ configure	Fri Dec 14 10:42:15 2001
+@@ -1851,8 +1851,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -11,7 +14,7 @@
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -1860,8 +1860,8 @@
+@@ -1872,8 +1872,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -22,3 +25,14 @@
  		
  		
  	else
+@@ -5290,8 +5290,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/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index d50a550121cc..01ae474ffc95 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -2,10 +2,8 @@ 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
 etc/CORBA/servers/gpilot-applet.gnorba
 etc/CORBA/servers/gpilotd.gnorba
 etc/gpilotConf.sh
@@ -25,10 +23,13 @@ lib/gnome-pilot/conduits/libbackup_conduit.so
 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/libgpilotdcm.a
+lib/libgpilotdcm.so
 lib/libgpilotdcm.so.1
 lib/libgpilotdconduit.a
+lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.1
 man/man1/gpilot-install-file.1
 share/gnome/applets/Utility/gpilot-applet.desktop
@@ -76,6 +77,7 @@ 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/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot