7 files changed, 48 insertions, 36 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 9215fc13ea14..56fe8b74dbbc 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome-pilot-conduits
-PORTVERSION=	2.0.15
-PORTREVISION=	5
+PORTVERSION=	2.0.16
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
@@ -16,7 +15,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional conduits for gnome-pilot
 
-LIB_DEPENDS=	gpilotd.3:${PORTSDIR}/palm/gnome-pilot
+LIB_DEPENDS=	gpilotd.2:${PORTSDIR}/palm/gnome-pilot
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/palm/gnome-pilot-conduits/distinfo b/palm/gnome-pilot-conduits/distinfo
index 467166915162..af48282d2c06 100644
--- a/palm/gnome-pilot-conduits/distinfo
+++ b/palm/gnome-pilot-conduits/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-pilot-conduits-2.0.15.tar.bz2) = 19abe4219da30479018c245ec1160d33
-SHA256 (gnome2/gnome-pilot-conduits-2.0.15.tar.bz2) = 18b57a52e38f1c0604bcfceb13ba21bdc69b02714f8e3d73578b1e01195f1ab4
-SIZE (gnome2/gnome-pilot-conduits-2.0.15.tar.bz2) = 476251
+MD5 (gnome2/gnome-pilot-conduits-2.0.16.tar.bz2) = c66944dcf035e4d334350728bec41ead
+SHA256 (gnome2/gnome-pilot-conduits-2.0.16.tar.bz2) = 15c040c9fa863e8d99b7f8dafc3971ec9feefbd3330f7af9ad81d81ab0447d51
+SIZE (gnome2/gnome-pilot-conduits-2.0.16.tar.bz2) = 480866
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index 164536dc6e5e..7404ddbbe11e 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -27,6 +27,7 @@ share/locale/ca/LC_MESSAGES/gnome-pilot-conduits.mo
 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/dz/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
@@ -39,6 +40,7 @@ share/locale/hr/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/hu/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/it/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/lv/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/mk/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ml/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ms/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -46,6 +48,7 @@ share/locale/nb/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/ne/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/oc/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/pa/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/pl/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/pt/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -73,3 +76,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dv/LC_MESSAGES
+@dirrmtry share/locale/dv
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 988a102cc9ba..b274c9a00307 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome-pilot
-PORTVERSION=	2.0.15
-PORTREVISION=	4
+PORTVERSION=	2.0.16
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
@@ -21,9 +20,10 @@ LIB_DEPENDS=	pisock.9:${PORTSDIR}/palm/pilot-link
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel intlhack
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel intlhack \
+		ltverhack
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index 5c6f6060ce8d..94225c890db4 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-pilot-2.0.15.tar.bz2) = 460a1fdd2206e1bbf820639831ca88f8
-SHA256 (gnome2/gnome-pilot-2.0.15.tar.bz2) = 38e6f5522a4a56824cbf6765e4ea368068f82ecf74cf8b2b260420876c56c6ec
-SIZE (gnome2/gnome-pilot-2.0.15.tar.bz2) = 804209
+MD5 (gnome2/gnome-pilot-2.0.16.tar.bz2) = f14e87d89902f82981f106c8df9277c9
+SHA256 (gnome2/gnome-pilot-2.0.16.tar.bz2) = 3ae8da427269a122e72aca025b01fc5f5c5a402efadd0e98e107d8a9453f6a56
+SIZE (gnome2/gnome-pilot-2.0.16.tar.bz2) = 829677
diff --git a/palm/gnome-pilot/files/patch-gpilotd__gpilotd.c b/palm/gnome-pilot/files/patch-gpilotd__gpilotd.c
index 494a81f5287a..18b254ebe70f 100644
--- a/palm/gnome-pilot/files/patch-gpilotd__gpilotd.c
+++ b/palm/gnome-pilot/files/patch-gpilotd__gpilotd.c
@@ -1,5 +1,5 @@
---- gpilotd/gpilotd.c.orig	Tue Sep  5 03:16:41 2006
-+++ gpilotd/gpilotd.c	Wed Sep  6 17:04:43 2006
+--- gpilotd/gpilotd.c.orig	2008-02-26 19:02:35.000000000 -0500
++++ gpilotd/gpilotd.c	2008-07-04 19:27:40.000000000 -0400
 @@ -27,6 +27,8 @@
  #include "config.h"
  #endif
@@ -9,10 +9,10 @@
  /* for crypt () */
  #ifdef USE_XOPEN_SOURCE
  #ifndef _XOPEN_SOURCE
-@@ -1386,6 +1388,49 @@ visor_devices_timeout (gpointer data) 
- }
+@@ -1279,6 +1281,47 @@ gpilotd_hal_init (void)
+ #endif /* WITH_HAL */
+ #ifdef WITH_USB_VISOR
  
- #endif /* WITH_USB_VISOR */
 +#ifdef freebsd
 +static gboolean
 +visor_devices_timeout (gpointer data)
@@ -40,8 +40,8 @@
 +				if (!visor_net)
 +					device->type = PILOT_DEVICE_SERIAL;
 +
-+				/* just try to synch.  Until I can talk to 
-+				 * the kernel guys this is the best way to 
++				/* just try to synch.  Until I can talk to
++				 * the kernel guys this is the best way to
 +				 * go. */
 +				sync_device (device, context);
 +				if (!visor_net)
@@ -49,30 +49,28 @@
 +			}
 +		}
 +		l = l->next;
-+
 +	}
 +
 +	return TRUE;
 +}
-+
-+#endif /* freebsd */
- #endif /* linux */
++#else
+ static gboolean 
+ visor_devices_timeout (gpointer data) 
+ {
+@@ -1448,6 +1491,7 @@ visor_devices_timeout (gpointer data) 
+ 	return TRUE;
+ }
+ 
++#endif
+ #endif /* WITH_USB_VISOR */
  
  
-@@ -1423,16 +1468,12 @@ monitor_channel (GPilotDevice *dev, GPil
+@@ -1486,7 +1530,7 @@ monitor_channel (GPilotDevice *dev, GPil
  			dev->device_exists = FALSE;
  		} else {
  #ifdef WITH_USB_VISOR
--#ifdef linux
+-#if defined(linux) || (defined(sun) && defined(__SVR4))
++#if defined(linux) || defined(freebsd) || (defined(sun) && defined(__SVR4))
  			/* We want to watch for a new recognised USB device
  			 * once per context. */
  			if (visor_timeout_id == -1) {
- 				visor_timeout_id = g_timeout_add (2000,
- 				    visor_devices_timeout, context);
- 			}
--#else /* linux */
--			g_assert_not_reached ();
--#endif /* linux */
- #endif /* WITH_USB_VISOR */
- 		}
- 	}
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index bc9a7871ac4a..7db8e861dfd3 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -26,7 +26,7 @@ lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
 lib/libgpilotd.la
 lib/libgpilotd.so
-lib/libgpilotd.so.3
+lib/libgpilotd.so.2
 lib/libgpilotdcm.a
 lib/libgpilotdcm.la
 lib/libgpilotdcm.so
@@ -40,6 +40,7 @@ libdata/bonobo/servers/GNOME_Pilot_Daemon.server
 libdata/pkgconfig/gnome-pilot-2.0.pc
 libexec/gpilot-applet
 libexec/gpilotd
+share/applications/gpilot-applet.desktop
 share/applications/gpilotd-control-applet.desktop
 share/gnome-pilot/conduits/backup.conduit
 share/gnome-pilot/conduits/file.conduit
@@ -68,6 +69,7 @@ share/locale/cs/LC_MESSAGES/gnome-pilot.mo
 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/dz/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
@@ -83,6 +85,7 @@ share/locale/it/LC_MESSAGES/gnome-pilot.mo
 share/locale/ja/LC_MESSAGES/gnome-pilot.mo
 share/locale/ko/LC_MESSAGES/gnome-pilot.mo
 share/locale/lt/LC_MESSAGES/gnome-pilot.mo
+share/locale/lv/LC_MESSAGES/gnome-pilot.mo
 share/locale/mk/LC_MESSAGES/gnome-pilot.mo
 share/locale/ml/LC_MESSAGES/gnome-pilot.mo
 share/locale/ms/LC_MESSAGES/gnome-pilot.mo
@@ -90,6 +93,7 @@ share/locale/nb/LC_MESSAGES/gnome-pilot.mo
 share/locale/ne/LC_MESSAGES/gnome-pilot.mo
 share/locale/nl/LC_MESSAGES/gnome-pilot.mo
 share/locale/nn/LC_MESSAGES/gnome-pilot.mo
+share/locale/oc/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
@@ -123,4 +127,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/applications