10 files changed, 24 insertions, 18 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 7019392b9b1c..d7bfecc9aeba 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
@@ -16,7 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional conduits for gnome-pilot2
 
-LIB_DEPENDS=	gpilotd.2:${PORTSDIR}/palm/gnomepilot2
+LIB_DEPENDS=	gpilotd.3:${PORTSDIR}/palm/gnomepilot2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/palm/gnome-pilot-conduits/distinfo b/palm/gnome-pilot-conduits/distinfo
index 86af254f5964..41cfa7bfcb72 100644
--- a/palm/gnome-pilot-conduits/distinfo
+++ b/palm/gnome-pilot-conduits/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-pilot-conduits-2.0.6.tar.bz2) = 44504248618d94dc12fde8ae73643414
+MD5 (gnome2/gnome-pilot-conduits-2.0.7.tar.bz2) = 5d027385df43499282607c49552add2f
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 1035a076cf40..1592280be6da 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index 75203a641f3a..174cfefc961d 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-2.0.6.tar.bz2) = 6b3cae9655e05a53f1589fa97fccf82f
+MD5 (gnome/gnome-pilot-2.0.7.tar.bz2) = 616a29667238d9edbb4c90ba6ae3f925
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index b9114f1462a1..213a87e15fcb 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -22,7 +22,7 @@ lib/gnome-pilot/conduits/libfile_conduit.so
 lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
 lib/libgpilotd.so
-lib/libgpilotd.so.2
+lib/libgpilotd.so.3
 lib/libgpilotdcm.a
 lib/libgpilotdcm.so
 lib/libgpilotdcm.so.2
@@ -35,16 +35,18 @@ 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/help/gnome-pilot/C/gnome-pilot.xml
 share/gnome/idl/gnome-pilot.idl
 share/gnome/mime-info/palm.keys
 share/gnome/mime-info/palm.mime
+share/gnome/omf/gnome-pilot/gnome-pilot-C.omf
 share/gnome/pixmaps/gnome-palm-conduit.png
 share/gnome/pixmaps/gnome-palm.png
 share/gnome/pixmaps/sync_broken.png
@@ -78,9 +80,10 @@ 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/omf/gnome-pilot
+@dirrm share/gnome/help/gnome-pilot/C
+@dirrm share/gnome/help/gnome-pilot
 @dirrm share/gnome/gnome-pilot/glade
-@dirrm share/gnome/gnome-pilot-2/glade
-@dirrm share/gnome/gnome-pilot-2
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 7019392b9b1c..d7bfecc9aeba 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot-conduits2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
@@ -16,7 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional conduits for gnome-pilot2
 
-LIB_DEPENDS=	gpilotd.2:${PORTSDIR}/palm/gnomepilot2
+LIB_DEPENDS=	gpilotd.3:${PORTSDIR}/palm/gnomepilot2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/palm/gnomepilot-conduits2/distinfo b/palm/gnomepilot-conduits2/distinfo
index 86af254f5964..41cfa7bfcb72 100644
--- a/palm/gnomepilot-conduits2/distinfo
+++ b/palm/gnomepilot-conduits2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-pilot-conduits-2.0.6.tar.bz2) = 44504248618d94dc12fde8ae73643414
+MD5 (gnome2/gnome-pilot-conduits-2.0.7.tar.bz2) = 5d027385df43499282607c49552add2f
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 1035a076cf40..1592280be6da 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
diff --git a/palm/gnomepilot2/distinfo b/palm/gnomepilot2/distinfo
index 75203a641f3a..174cfefc961d 100644
--- a/palm/gnomepilot2/distinfo
+++ b/palm/gnomepilot2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-pilot-2.0.6.tar.bz2) = 6b3cae9655e05a53f1589fa97fccf82f
+MD5 (gnome/gnome-pilot-2.0.7.tar.bz2) = 616a29667238d9edbb4c90ba6ae3f925
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index b9114f1462a1..213a87e15fcb 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -22,7 +22,7 @@ lib/gnome-pilot/conduits/libfile_conduit.so
 lib/gnome-pilot/conduits/libtest_conduit.so
 lib/libgpilotd.a
 lib/libgpilotd.so
-lib/libgpilotd.so.2
+lib/libgpilotd.so.3
 lib/libgpilotdcm.a
 lib/libgpilotdcm.so
 lib/libgpilotdcm.so.2
@@ -35,16 +35,18 @@ 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/help/gnome-pilot/C/gnome-pilot.xml
 share/gnome/idl/gnome-pilot.idl
 share/gnome/mime-info/palm.keys
 share/gnome/mime-info/palm.mime
+share/gnome/omf/gnome-pilot/gnome-pilot-C.omf
 share/gnome/pixmaps/gnome-palm-conduit.png
 share/gnome/pixmaps/gnome-palm.png
 share/gnome/pixmaps/sync_broken.png
@@ -78,9 +80,10 @@ 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/omf/gnome-pilot
+@dirrm share/gnome/help/gnome-pilot/C
+@dirrm share/gnome/help/gnome-pilot
 @dirrm share/gnome/gnome-pilot/glade
-@dirrm share/gnome/gnome-pilot-2/glade
-@dirrm share/gnome/gnome-pilot-2
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs