21 files changed, 147 insertions, 210 deletions

diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 21337fa30ab7..f571d0ac1661 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.64
+PORTVERSION=	0.1.65
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	http://www.eskil.org/gnome-pilot/download/tarballs/ \
-		${MASTER_SITE_GNOME}
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://www.eskil.org/gnome-pilot/download/tarballs/
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-pilot
 DISTNAME=	gnome-pilot-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	pisock.4:${PORTSDIR}/palm/pilot-link
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -27,6 +29,8 @@ CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN1=		gpilot-install-file.1
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index b2d2d9b101e1..d7b86df97a02 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.64.tar.gz) = 90ad419c2be0c76231c978b09adc2447
+MD5 (gnome/gnome-pilot-0.1.65.tar.bz2) = ac5b833ed0388936f3baceb7f8d5ed46
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index f303e6c30144..188e7465648a 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Dec 14 10:40:32 2001
-+++ configure	Fri Dec 14 10:42:15 2001
-@@ -1851,8 +1851,8 @@
+--- configure.orig	Thu Apr 25 19:15:48 2002
++++ configure	Thu Apr 25 19:17:00 2002
+@@ -5388,6 +5388,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'
+@@ -5633,8 +5634,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -14,7 +22,7 @@ $FreeBSD$
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -1872,8 +1872,8 @@
+@@ -5654,8 +5655,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -25,7 +33,7 @@ $FreeBSD$
  		
  		
  	else
-@@ -5290,8 +5290,8 @@
+@@ -9022,8 +9023,8 @@
  fi
  
  GPILOT_LIBDIR='-L${libdir}'
diff --git a/palm/gnome-pilot/files/patch-capplet::Makefile.in b/palm/gnome-pilot/files/patch-capplet::Makefile.in
new file mode 100644
index 000000000000..3f33fb1efccc
--- /dev/null
+++ b/palm/gnome-pilot/files/patch-capplet::Makefile.in
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..c454b7787ade
--- /dev/null
+++ b/palm/gnome-pilot/files/patch-gpilotd::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-po::ja.po b/palm/gnome-pilot/files/patch-po::ja.po
deleted file mode 100644
index cebccf79316a..000000000000
--- a/palm/gnome-pilot/files/patch-po::ja.po
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- po/ja.po.orig	Mon Dec  3 12:10:26 2001
-+++ po/ja.po	Thu Mar 21 16:55:22 2002
-@@ -640,8 +640,8 @@
- "pilots that you use."
- msgstr ""
- "¤³¤Î ID "
--"¤Ïµ®Êý¤Î¥Ñ¥¤¥í¥Ã¥È¤ò¼±Ê̤¹¤ë¤â¤Î¤Ç¡¢Â¾¤Î¥Ñ¥¤¥í¥Ã¥È¤È¶èÊ̤¹¤ë¤¿¤á¤Ë½ÅÊ£¤·¤Ê¤¤¿"
--"ôÃͤˤ·¤Æ²¼¤µ¤¤¡£"
-+"¤Ïµ®Êý¤Î¥Ñ¥¤¥í¥Ã¥È¤ò¼±Ê̤¹¤ë¤â¤Î¤Ç¡¢Â¾¤Î¥Ñ¥¤¥í¥Ã¥È¤È¶èÊ̤¹¤ë¤¿¤á¤Ë½ÅÊ£¤·¤Ê¤¤"
-+"¿ôÃͤˤ·¤Æ²¼¤µ¤¤¡£"
- 
- #: capplet/gpilotd-capplet-strings.c:101
- msgid "Initial Sync"
-@@ -661,8 +661,8 @@
- "Default conduit action for Synchronization. In most cases you don't want to "
- "change this setting, but individual conduits instead."
- msgstr ""
--"Ʊ´ü¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥¸¥Ã¥ÈÁàºî¤Ç¤¹¡£Ä̾ï¤ÏÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤"
--"¬¡¢¸Ä¿Í¾ðÊó¤ÏÀßÄꤷ¤Æ²¼¤µ¤¤¡£"
-+"Ʊ´ü¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥¸¥Ã¥ÈÁàºî¤Ç¤¹¡£Ä̾ï¤ÏÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó"
-+"¤¬¡¢¸Ä¿Í¾ðÊó¤ÏÀßÄꤷ¤Æ²¼¤µ¤¤¡£"
- 
- #: capplet/gpilotd-capplet-strings.c:111
- msgid "Success"
-@@ -749,8 +749,8 @@
- #: capplet/gpilotd-control-applet.c:137
- msgid "Cannot run druid if pilots or cradles already configured"
- msgstr ""
--"¥Ñ¥¤¥í¥Ã¥È¤Þ¤¿¤Ï¥¯¥ì¡¼¥É¥ë¤¬´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¥¦¥£¥¶¡¼¥É¤¬µ¯Æ°½ÐÍè¤Þ¤»¤"
--"ó"
-+"¥Ñ¥¤¥í¥Ã¥È¤Þ¤¿¤Ï¥¯¥ì¡¼¥É¥ë¤¬´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¥¦¥£¥¶¡¼¥É¤¬µ¯Æ°½ÐÍè¤Þ¤»"
-+"¤ó"
- 
- #: capplet/util.c:34 capplet/util.c:413
- msgid "Use conduit settings"
-@@ -1470,15 +1470,15 @@
- 
- #~ msgid "arhive and change conflict, pilot and local record swapped\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤È¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤¬¤¹¤êÂؤï¤"
--#~ "ê¤Þ¤¹\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤È¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤¬¤¹¤êÂؤï"
-+#~ "¤ê¤Þ¤¹\n"
- 
- #~ msgid "arhive and change conflict, local record sent to pilot\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤ò¥Ñ¥¤¥í¥Ã¥È¤ËÁ÷¤ê¤Þ¤·¤"
--#~ "¿\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤ò¥Ñ¥¤¥í¥Ã¥È¤ËÁ÷¤ê¤Þ¤·"
-+#~ "¤¿\n"
- 
- #~ msgid "arhive and change conflict, pilot record saved locally\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤Î¥Ç¡¼¥¿¤ò¥í¡¼¥«¥ë¤ËÊݸ¤·¤Þ¤"
--#~ "·¤¿\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤Î¥Ç¡¼¥¿¤ò¥í¡¼¥«¥ë¤ËÊݸ¤·¤Þ"
-+#~ "¤·¤¿\n"
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 01ae474ffc95..bfcec3dcf4d4 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -31,7 +31,6 @@ 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
 share/gnome/apps/Settings/Peripherals/gpilotd-conduits-capplet.desktop
 share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 21337fa30ab7..f571d0ac1661 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.64
+PORTVERSION=	0.1.65
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	http://www.eskil.org/gnome-pilot/download/tarballs/ \
-		${MASTER_SITE_GNOME}
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://www.eskil.org/gnome-pilot/download/tarballs/
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-pilot
 DISTNAME=	gnome-pilot-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	pisock.4:${PORTSDIR}/palm/pilot-link
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -27,6 +29,8 @@ CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN1=		gpilot-install-file.1
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/palm/gnomepilot/distinfo b/palm/gnomepilot/distinfo
index b2d2d9b101e1..d7b86df97a02 100644
--- a/palm/gnomepilot/distinfo
+++ b/palm/gnomepilot/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.64.tar.gz) = 90ad419c2be0c76231c978b09adc2447
+MD5 (gnome/gnome-pilot-0.1.65.tar.bz2) = ac5b833ed0388936f3baceb7f8d5ed46
diff --git a/palm/gnomepilot/files/patch-aa b/palm/gnomepilot/files/patch-aa
index f303e6c30144..188e7465648a 100644
--- a/palm/gnomepilot/files/patch-aa
+++ b/palm/gnomepilot/files/patch-aa
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Dec 14 10:40:32 2001
-+++ configure	Fri Dec 14 10:42:15 2001
-@@ -1851,8 +1851,8 @@
+--- configure.orig	Thu Apr 25 19:15:48 2002
++++ configure	Thu Apr 25 19:17:00 2002
+@@ -5388,6 +5388,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'
+@@ -5633,8 +5634,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -14,7 +22,7 @@ $FreeBSD$
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -1872,8 +1872,8 @@
+@@ -5654,8 +5655,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -25,7 +33,7 @@ $FreeBSD$
  		
  		
  	else
-@@ -5290,8 +5290,8 @@
+@@ -9022,8 +9023,8 @@
  fi
  
  GPILOT_LIBDIR='-L${libdir}'
diff --git a/palm/gnomepilot/files/patch-capplet::Makefile.in b/palm/gnomepilot/files/patch-capplet::Makefile.in
new file mode 100644
index 000000000000..3f33fb1efccc
--- /dev/null
+++ b/palm/gnomepilot/files/patch-capplet::Makefile.in
@@ -0,0 +1,14 @@
+
+$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/gnomepilot/files/patch-gpilotd::Makefile.in b/palm/gnomepilot/files/patch-gpilotd::Makefile.in
new file mode 100644
index 000000000000..c454b7787ade
--- /dev/null
+++ b/palm/gnomepilot/files/patch-gpilotd::Makefile.in
@@ -0,0 +1,14 @@
+
+$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/gnomepilot/files/patch-po::ja.po b/palm/gnomepilot/files/patch-po::ja.po
deleted file mode 100644
index cebccf79316a..000000000000
--- a/palm/gnomepilot/files/patch-po::ja.po
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- po/ja.po.orig	Mon Dec  3 12:10:26 2001
-+++ po/ja.po	Thu Mar 21 16:55:22 2002
-@@ -640,8 +640,8 @@
- "pilots that you use."
- msgstr ""
- "¤³¤Î ID "
--"¤Ïµ®Êý¤Î¥Ñ¥¤¥í¥Ã¥È¤ò¼±Ê̤¹¤ë¤â¤Î¤Ç¡¢Â¾¤Î¥Ñ¥¤¥í¥Ã¥È¤È¶èÊ̤¹¤ë¤¿¤á¤Ë½ÅÊ£¤·¤Ê¤¤¿"
--"ôÃͤˤ·¤Æ²¼¤µ¤¤¡£"
-+"¤Ïµ®Êý¤Î¥Ñ¥¤¥í¥Ã¥È¤ò¼±Ê̤¹¤ë¤â¤Î¤Ç¡¢Â¾¤Î¥Ñ¥¤¥í¥Ã¥È¤È¶èÊ̤¹¤ë¤¿¤á¤Ë½ÅÊ£¤·¤Ê¤¤"
-+"¿ôÃͤˤ·¤Æ²¼¤µ¤¤¡£"
- 
- #: capplet/gpilotd-capplet-strings.c:101
- msgid "Initial Sync"
-@@ -661,8 +661,8 @@
- "Default conduit action for Synchronization. In most cases you don't want to "
- "change this setting, but individual conduits instead."
- msgstr ""
--"Ʊ´ü¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥¸¥Ã¥ÈÁàºî¤Ç¤¹¡£Ä̾ï¤ÏÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤"
--"¬¡¢¸Ä¿Í¾ðÊó¤ÏÀßÄꤷ¤Æ²¼¤µ¤¤¡£"
-+"Ʊ´ü¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥¸¥Ã¥ÈÁàºî¤Ç¤¹¡£Ä̾ï¤ÏÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó"
-+"¤¬¡¢¸Ä¿Í¾ðÊó¤ÏÀßÄꤷ¤Æ²¼¤µ¤¤¡£"
- 
- #: capplet/gpilotd-capplet-strings.c:111
- msgid "Success"
-@@ -749,8 +749,8 @@
- #: capplet/gpilotd-control-applet.c:137
- msgid "Cannot run druid if pilots or cradles already configured"
- msgstr ""
--"¥Ñ¥¤¥í¥Ã¥È¤Þ¤¿¤Ï¥¯¥ì¡¼¥É¥ë¤¬´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¥¦¥£¥¶¡¼¥É¤¬µ¯Æ°½ÐÍè¤Þ¤»¤"
--"ó"
-+"¥Ñ¥¤¥í¥Ã¥È¤Þ¤¿¤Ï¥¯¥ì¡¼¥É¥ë¤¬´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¥¦¥£¥¶¡¼¥É¤¬µ¯Æ°½ÐÍè¤Þ¤»"
-+"¤ó"
- 
- #: capplet/util.c:34 capplet/util.c:413
- msgid "Use conduit settings"
-@@ -1470,15 +1470,15 @@
- 
- #~ msgid "arhive and change conflict, pilot and local record swapped\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤È¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤¬¤¹¤êÂؤï¤"
--#~ "ê¤Þ¤¹\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤È¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤¬¤¹¤êÂؤï"
-+#~ "¤ê¤Þ¤¹\n"
- 
- #~ msgid "arhive and change conflict, local record sent to pilot\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤ò¥Ñ¥¤¥í¥Ã¥È¤ËÁ÷¤ê¤Þ¤·¤"
--#~ "¿\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤ò¥Ñ¥¤¥í¥Ã¥È¤ËÁ÷¤ê¤Þ¤·"
-+#~ "¤¿\n"
- 
- #~ msgid "arhive and change conflict, pilot record saved locally\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤Î¥Ç¡¼¥¿¤ò¥í¡¼¥«¥ë¤ËÊݸ¤·¤Þ¤"
--#~ "·¤¿\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤Î¥Ç¡¼¥¿¤ò¥í¡¼¥«¥ë¤ËÊݸ¤·¤Þ"
-+#~ "¤·¤¿\n"
diff --git a/palm/gnomepilot/pkg-plist b/palm/gnomepilot/pkg-plist
index 01ae474ffc95..bfcec3dcf4d4 100644
--- a/palm/gnomepilot/pkg-plist
+++ b/palm/gnomepilot/pkg-plist
@@ -31,7 +31,6 @@ 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
 share/gnome/apps/Settings/Peripherals/gpilotd-conduits-capplet.desktop
 share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 21337fa30ab7..f571d0ac1661 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.64
+PORTVERSION=	0.1.65
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	http://www.eskil.org/gnome-pilot/download/tarballs/ \
-		${MASTER_SITE_GNOME}
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://www.eskil.org/gnome-pilot/download/tarballs/
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-pilot
 DISTNAME=	gnome-pilot-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	pisock.4:${PORTSDIR}/palm/pilot-link
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -27,6 +29,8 @@ CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN1=		gpilot-install-file.1
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/palm/gnomepilot2/distinfo b/palm/gnomepilot2/distinfo
index b2d2d9b101e1..d7b86df97a02 100644
--- a/palm/gnomepilot2/distinfo
+++ b/palm/gnomepilot2/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.64.tar.gz) = 90ad419c2be0c76231c978b09adc2447
+MD5 (gnome/gnome-pilot-0.1.65.tar.bz2) = ac5b833ed0388936f3baceb7f8d5ed46
diff --git a/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa
index f303e6c30144..188e7465648a 100644
--- a/palm/gnomepilot2/files/patch-aa
+++ b/palm/gnomepilot2/files/patch-aa
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Dec 14 10:40:32 2001
-+++ configure	Fri Dec 14 10:42:15 2001
-@@ -1851,8 +1851,8 @@
+--- configure.orig	Thu Apr 25 19:15:48 2002
++++ configure	Thu Apr 25 19:17:00 2002
+@@ -5388,6 +5388,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'
+@@ -5633,8 +5634,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -14,7 +22,7 @@ $FreeBSD$
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -1872,8 +1872,8 @@
+@@ -5654,8 +5655,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -25,7 +33,7 @@ $FreeBSD$
  		
  		
  	else
-@@ -5290,8 +5290,8 @@
+@@ -9022,8 +9023,8 @@
  fi
  
  GPILOT_LIBDIR='-L${libdir}'
diff --git a/palm/gnomepilot2/files/patch-capplet::Makefile.in b/palm/gnomepilot2/files/patch-capplet::Makefile.in
new file mode 100644
index 000000000000..3f33fb1efccc
--- /dev/null
+++ b/palm/gnomepilot2/files/patch-capplet::Makefile.in
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..c454b7787ade
--- /dev/null
+++ b/palm/gnomepilot2/files/patch-gpilotd::Makefile.in
@@ -0,0 +1,14 @@
+
+$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-po::ja.po b/palm/gnomepilot2/files/patch-po::ja.po
deleted file mode 100644
index cebccf79316a..000000000000
--- a/palm/gnomepilot2/files/patch-po::ja.po
+++ /dev/null
@@ -1,60 +0,0 @@
-
-$FreeBSD$
-
---- po/ja.po.orig	Mon Dec  3 12:10:26 2001
-+++ po/ja.po	Thu Mar 21 16:55:22 2002
-@@ -640,8 +640,8 @@
- "pilots that you use."
- msgstr ""
- "¤³¤Î ID "
--"¤Ïµ®Êý¤Î¥Ñ¥¤¥í¥Ã¥È¤ò¼±Ê̤¹¤ë¤â¤Î¤Ç¡¢Â¾¤Î¥Ñ¥¤¥í¥Ã¥È¤È¶èÊ̤¹¤ë¤¿¤á¤Ë½ÅÊ£¤·¤Ê¤¤¿"
--"ôÃͤˤ·¤Æ²¼¤µ¤¤¡£"
-+"¤Ïµ®Êý¤Î¥Ñ¥¤¥í¥Ã¥È¤ò¼±Ê̤¹¤ë¤â¤Î¤Ç¡¢Â¾¤Î¥Ñ¥¤¥í¥Ã¥È¤È¶èÊ̤¹¤ë¤¿¤á¤Ë½ÅÊ£¤·¤Ê¤¤"
-+"¿ôÃͤˤ·¤Æ²¼¤µ¤¤¡£"
- 
- #: capplet/gpilotd-capplet-strings.c:101
- msgid "Initial Sync"
-@@ -661,8 +661,8 @@
- "Default conduit action for Synchronization. In most cases you don't want to "
- "change this setting, but individual conduits instead."
- msgstr ""
--"Ʊ´ü¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥¸¥Ã¥ÈÁàºî¤Ç¤¹¡£Ä̾ï¤ÏÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤"
--"¬¡¢¸Ä¿Í¾ðÊó¤ÏÀßÄꤷ¤Æ²¼¤µ¤¤¡£"
-+"Ʊ´ü¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥¸¥Ã¥ÈÁàºî¤Ç¤¹¡£Ä̾ï¤ÏÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó"
-+"¤¬¡¢¸Ä¿Í¾ðÊó¤ÏÀßÄꤷ¤Æ²¼¤µ¤¤¡£"
- 
- #: capplet/gpilotd-capplet-strings.c:111
- msgid "Success"
-@@ -749,8 +749,8 @@
- #: capplet/gpilotd-control-applet.c:137
- msgid "Cannot run druid if pilots or cradles already configured"
- msgstr ""
--"¥Ñ¥¤¥í¥Ã¥È¤Þ¤¿¤Ï¥¯¥ì¡¼¥É¥ë¤¬´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¥¦¥£¥¶¡¼¥É¤¬µ¯Æ°½ÐÍè¤Þ¤»¤"
--"ó"
-+"¥Ñ¥¤¥í¥Ã¥È¤Þ¤¿¤Ï¥¯¥ì¡¼¥É¥ë¤¬´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¥¦¥£¥¶¡¼¥É¤¬µ¯Æ°½ÐÍè¤Þ¤»"
-+"¤ó"
- 
- #: capplet/util.c:34 capplet/util.c:413
- msgid "Use conduit settings"
-@@ -1470,15 +1470,15 @@
- 
- #~ msgid "arhive and change conflict, pilot and local record swapped\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤È¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤¬¤¹¤êÂؤï¤"
--#~ "ê¤Þ¤¹\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤È¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤¬¤¹¤êÂؤï"
-+#~ "¤ê¤Þ¤¹\n"
- 
- #~ msgid "arhive and change conflict, local record sent to pilot\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤ò¥Ñ¥¤¥í¥Ã¥È¤ËÁ÷¤ê¤Þ¤·¤"
--#~ "¿\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¤ò¥Ñ¥¤¥í¥Ã¥È¤ËÁ÷¤ê¤Þ¤·"
-+#~ "¤¿\n"
- 
- #~ msgid "arhive and change conflict, pilot record saved locally\n"
- #~ msgstr ""
--#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤Î¥Ç¡¼¥¿¤ò¥í¡¼¥«¥ë¤ËÊݸ¤·¤Þ¤"
--#~ "·¤¿\n"
-+#~ "¥¢¡¼¥«¥¤¥Ö¤ÈÊѹ¹¤Ë½ÅÊ£¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥Ñ¥¤¥í¥Ã¥È¤Î¥Ç¡¼¥¿¤ò¥í¡¼¥«¥ë¤ËÊݸ¤·¤Þ"
-+#~ "¤·¤¿\n"
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index 01ae474ffc95..bfcec3dcf4d4 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -31,7 +31,6 @@ 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
 share/gnome/apps/Settings/Peripherals/gpilotd-conduits-capplet.desktop
 share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop