18 files changed, 117 insertions, 321 deletions

diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 0afb46981d24..f119e7f19fbc 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.65
-PORTREVISION=	1
+PORTVERSION=	0.1.67
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.eskil.org/gnome-pilot/download/tarballs/
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index d7b86df97a02..7f56d946fe9b 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-0.1.65.tar.bz2) = ac5b833ed0388936f3baceb7f8d5ed46
+MD5 (gnome/gnome-pilot-0.1.67.tar.bz2) = 9b70903ebf6b3fef1ee6a84a64ffa3ec
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index 5378b4d2a188..fe24d8508a77 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -1,6 +1,17 @@
---- configure.orig	Mon Apr 22 16:21:27 2002
-+++ configure	Tue Sep 17 13:44:51 2002
-@@ -5388,6 +5388,7 @@
+--- 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
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,8 +19,8 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -5633,8 +5634,8 @@
-   
+@@ -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`"
@@ -19,63 +30,18 @@
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -5654,8 +5655,8 @@
+@@ -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
-@@ -7531,7 +7532,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -7701,7 +7702,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//'`
-@@ -8268,7 +8269,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:8274: checking "for existance of $withval/lib/libpisock.so"" >&5
- 	    if test -r $withval/lib/libpisock.so; then
-@@ -8381,7 +8382,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 -lpisock -lpisock"
-                                                            fi							  
- else
-   echo "$ac_t""no" 1>&6
-@@ -8432,7 +8433,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; } 
-@@ -9022,8 +9023,8 @@
+ 	    	if test xfail = xfailure; then
+@@ -11322,8 +11319,8 @@
  fi
  
  GPILOT_LIBDIR='-L${libdir}'
@@ -84,5 +50,5 @@
 +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-gpilotd_gpilotd.c b/palm/gnome-pilot/files/patch-gpilotd_gpilotd.c
deleted file mode 100644
index 0c790caba14b..000000000000
--- a/palm/gnome-pilot/files/patch-gpilotd_gpilotd.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gpilotd/gpilotd.c.orig	Tue Sep 17 13:37:40 2002
-+++ gpilotd/gpilotd.c	Tue Sep 17 13:38:32 2002
-@@ -46,6 +46,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <fcntl.h>
- 
- #include <libgnome/libgnome.h>
- 
-@@ -125,13 +126,13 @@
- 		pilot_set_baud_rate (device);
- 	}
- 
--	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))) {
- 		g_warning ("pi_socket: %s",strerror (errno));
- 		if (error) *error = 1;
- 		return -1;
- 	}
- 	
--	addr.pi_family = PI_AF_SLP;
-+	addr.pi_family = PI_PF_SLP;
- 
- /*
- 	Most important for networking
diff --git a/palm/gnome-pilot/files/patch-po::Makefile.in.in b/palm/gnome-pilot/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..68b6a8c98491
--- /dev/null
+++ b/palm/gnome-pilot/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$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/files/patch-utils_make-password.c b/palm/gnome-pilot/files/patch-utils_make-password.c
deleted file mode 100644
index 312dd4f81828..000000000000
--- a/palm/gnome-pilot/files/patch-utils_make-password.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- utils/make-password.c.orig	Tue Sep 17 13:46:08 2002
-+++ utils/make-password.c	Tue Sep 17 13:54:13 2002
-@@ -34,15 +34,15 @@
-   char salt[3];
- 
-   if (argc < 2) {
--    fprintf(stderr,"usage:%s %s\n",argv[0],TTYPrompt);
-+    fprintf(stderr,"usage:%s %s\n",argv[0],"/dev/cua[<0..n>]");
-     exit(2);
-   }
--  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,argv[1]);
-   
-   ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 0afb46981d24..f119e7f19fbc 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.65
-PORTREVISION=	1
+PORTVERSION=	0.1.67
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.eskil.org/gnome-pilot/download/tarballs/
diff --git a/palm/gnomepilot/distinfo b/palm/gnomepilot/distinfo
index d7b86df97a02..7f56d946fe9b 100644
--- a/palm/gnomepilot/distinfo
+++ b/palm/gnomepilot/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-0.1.65.tar.bz2) = ac5b833ed0388936f3baceb7f8d5ed46
+MD5 (gnome/gnome-pilot-0.1.67.tar.bz2) = 9b70903ebf6b3fef1ee6a84a64ffa3ec
diff --git a/palm/gnomepilot/files/patch-aa b/palm/gnomepilot/files/patch-aa
index 5378b4d2a188..fe24d8508a77 100644
--- a/palm/gnomepilot/files/patch-aa
+++ b/palm/gnomepilot/files/patch-aa
@@ -1,6 +1,17 @@
---- configure.orig	Mon Apr 22 16:21:27 2002
-+++ configure	Tue Sep 17 13:44:51 2002
-@@ -5388,6 +5388,7 @@
+--- 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
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,8 +19,8 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -5633,8 +5634,8 @@
-   
+@@ -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`"
@@ -19,63 +30,18 @@
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -5654,8 +5655,8 @@
+@@ -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
-@@ -7531,7 +7532,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -7701,7 +7702,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//'`
-@@ -8268,7 +8269,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:8274: checking "for existance of $withval/lib/libpisock.so"" >&5
- 	    if test -r $withval/lib/libpisock.so; then
-@@ -8381,7 +8382,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 -lpisock -lpisock"
-                                                            fi							  
- else
-   echo "$ac_t""no" 1>&6
-@@ -8432,7 +8433,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; } 
-@@ -9022,8 +9023,8 @@
+ 	    	if test xfail = xfailure; then
+@@ -11322,8 +11319,8 @@
  fi
  
  GPILOT_LIBDIR='-L${libdir}'
@@ -84,5 +50,5 @@
 +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/gnomepilot/files/patch-gpilotd_gpilotd.c b/palm/gnomepilot/files/patch-gpilotd_gpilotd.c
deleted file mode 100644
index 0c790caba14b..000000000000
--- a/palm/gnomepilot/files/patch-gpilotd_gpilotd.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gpilotd/gpilotd.c.orig	Tue Sep 17 13:37:40 2002
-+++ gpilotd/gpilotd.c	Tue Sep 17 13:38:32 2002
-@@ -46,6 +46,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <fcntl.h>
- 
- #include <libgnome/libgnome.h>
- 
-@@ -125,13 +126,13 @@
- 		pilot_set_baud_rate (device);
- 	}
- 
--	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))) {
- 		g_warning ("pi_socket: %s",strerror (errno));
- 		if (error) *error = 1;
- 		return -1;
- 	}
- 	
--	addr.pi_family = PI_AF_SLP;
-+	addr.pi_family = PI_PF_SLP;
- 
- /*
- 	Most important for networking
diff --git a/palm/gnomepilot/files/patch-po::Makefile.in.in b/palm/gnomepilot/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..68b6a8c98491
--- /dev/null
+++ b/palm/gnomepilot/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$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/gnomepilot/files/patch-utils_make-password.c b/palm/gnomepilot/files/patch-utils_make-password.c
deleted file mode 100644
index 312dd4f81828..000000000000
--- a/palm/gnomepilot/files/patch-utils_make-password.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- utils/make-password.c.orig	Tue Sep 17 13:46:08 2002
-+++ utils/make-password.c	Tue Sep 17 13:54:13 2002
-@@ -34,15 +34,15 @@
-   char salt[3];
- 
-   if (argc < 2) {
--    fprintf(stderr,"usage:%s %s\n",argv[0],TTYPrompt);
-+    fprintf(stderr,"usage:%s %s\n",argv[0],"/dev/cua[<0..n>]");
-     exit(2);
-   }
--  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,argv[1]);
-   
-   ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 0afb46981d24..f119e7f19fbc 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.65
-PORTREVISION=	1
+PORTVERSION=	0.1.67
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.eskil.org/gnome-pilot/download/tarballs/
diff --git a/palm/gnomepilot2/distinfo b/palm/gnomepilot2/distinfo
index d7b86df97a02..7f56d946fe9b 100644
--- a/palm/gnomepilot2/distinfo
+++ b/palm/gnomepilot2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-0.1.65.tar.bz2) = ac5b833ed0388936f3baceb7f8d5ed46
+MD5 (gnome/gnome-pilot-0.1.67.tar.bz2) = 9b70903ebf6b3fef1ee6a84a64ffa3ec
diff --git a/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa
index 5378b4d2a188..fe24d8508a77 100644
--- a/palm/gnomepilot2/files/patch-aa
+++ b/palm/gnomepilot2/files/patch-aa
@@ -1,6 +1,17 @@
---- configure.orig	Mon Apr 22 16:21:27 2002
-+++ configure	Tue Sep 17 13:44:51 2002
-@@ -5388,6 +5388,7 @@
+--- 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
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,8 +19,8 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -5633,8 +5634,8 @@
-   
+@@ -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`"
@@ -19,63 +30,18 @@
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -5654,8 +5655,8 @@
+@@ -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
-@@ -7531,7 +7532,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -7701,7 +7702,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//'`
-@@ -8268,7 +8269,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:8274: checking "for existance of $withval/lib/libpisock.so"" >&5
- 	    if test -r $withval/lib/libpisock.so; then
-@@ -8381,7 +8382,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 -lpisock -lpisock"
-                                                            fi							  
- else
-   echo "$ac_t""no" 1>&6
-@@ -8432,7 +8433,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; } 
-@@ -9022,8 +9023,8 @@
+ 	    	if test xfail = xfailure; then
+@@ -11322,8 +11319,8 @@
  fi
  
  GPILOT_LIBDIR='-L${libdir}'
@@ -84,5 +50,5 @@
 +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-gpilotd_gpilotd.c b/palm/gnomepilot2/files/patch-gpilotd_gpilotd.c
deleted file mode 100644
index 0c790caba14b..000000000000
--- a/palm/gnomepilot2/files/patch-gpilotd_gpilotd.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gpilotd/gpilotd.c.orig	Tue Sep 17 13:37:40 2002
-+++ gpilotd/gpilotd.c	Tue Sep 17 13:38:32 2002
-@@ -46,6 +46,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <fcntl.h>
- 
- #include <libgnome/libgnome.h>
- 
-@@ -125,13 +126,13 @@
- 		pilot_set_baud_rate (device);
- 	}
- 
--	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))) {
- 		g_warning ("pi_socket: %s",strerror (errno));
- 		if (error) *error = 1;
- 		return -1;
- 	}
- 	
--	addr.pi_family = PI_AF_SLP;
-+	addr.pi_family = PI_PF_SLP;
- 
- /*
- 	Most important for networking
diff --git a/palm/gnomepilot2/files/patch-po::Makefile.in.in b/palm/gnomepilot2/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..68b6a8c98491
--- /dev/null
+++ b/palm/gnomepilot2/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$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/files/patch-utils_make-password.c b/palm/gnomepilot2/files/patch-utils_make-password.c
deleted file mode 100644
index 312dd4f81828..000000000000
--- a/palm/gnomepilot2/files/patch-utils_make-password.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- utils/make-password.c.orig	Tue Sep 17 13:46:08 2002
-+++ utils/make-password.c	Tue Sep 17 13:54:13 2002
-@@ -34,15 +34,15 @@
-   char salt[3];
- 
-   if (argc < 2) {
--    fprintf(stderr,"usage:%s %s\n",argv[0],TTYPrompt);
-+    fprintf(stderr,"usage:%s %s\n",argv[0],"/dev/cua[<0..n>]");
-     exit(2);
-   }
--  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,argv[1]);
-   
-   ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));