11 files changed, 60 insertions, 59 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 4eb76bd22b8f..3db629cffbbe 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pilot-conduits
 PORTVERSION=	2.0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index 2853878326cf..164536dc6e5e 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -13,12 +13,12 @@ lib/gnome-pilot/conduits/libmemo_file_conduit.so
 lib/gnome-pilot/conduits/libtime_conduit.a
 lib/gnome-pilot/conduits/libtime_conduit.la
 lib/gnome-pilot/conduits/libtime_conduit.so
-share/gnome/gnome-pilot/conduits/expense.conduit
-share/gnome/gnome-pilot/conduits/mal.conduit
-share/gnome/gnome-pilot/conduits/memofile.conduit
-share/gnome/gnome-pilot/conduits/sendmail.conduit
-share/gnome/gnome-pilot/conduits/time.conduit
-share/gnome/pixmaps/avantgo.png
+share/gnome-pilot/conduits/expense.conduit
+share/gnome-pilot/conduits/mal.conduit
+share/gnome-pilot/conduits/memofile.conduit
+share/gnome-pilot/conduits/sendmail.conduit
+share/gnome-pilot/conduits/time.conduit
+share/pixmaps/avantgo.png
 share/locale/ar/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/be/LC_MESSAGES/gnome-pilot-conduits.mo
@@ -65,7 +65,11 @@ share/locale/xh/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
+@dirrm share/gnome-pilot/conduits
+@dirrm lib/gnome-pilot/conduits
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrm share/gnome/gnome-pilot/conduits
-@dirrm lib/gnome-pilot/conduits
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 09fdc74ca0cb..9dec76fdea86 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pilot
 PORTVERSION=	2.0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
deleted file mode 100644
index fe734c76b010..000000000000
--- a/palm/gnome-pilot/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Apr 14 16:24:54 2003
-+++ configure	Mon Apr 14 21:12:15 2003
-@@ -10653,7 +10654,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
- 
- 
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 650cdb7756c6..bc9a7871ac4a 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -40,26 +40,26 @@ libdata/bonobo/servers/GNOME_Pilot_Daemon.server
 libdata/pkgconfig/gnome-pilot-2.0.pc
 libexec/gpilot-applet
 libexec/gpilotd
-share/gnome/applications/gpilotd-control-applet.desktop
-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/devices.xml
-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/applications/gpilotd-control-applet.desktop
+share/gnome-pilot/conduits/backup.conduit
+share/gnome-pilot/conduits/file.conduit
+share/gnome-pilot/conduits/test.conduit
+share/gnome-pilot/devices.xml
+share/gnome-pilot/glade/gnome-palm.png
+share/gnome-pilot/glade/gnome-pilot-watermark.png
+share/gnome-pilot/glade/gpilotd-capplet.glade
+share/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
-share/gnome/pixmaps/sync_icon.png
-share/gnome/pixmaps/sync_paused.png
-share/gnome/pixmaps/syncing_icon.png
+share/idl/gnome-pilot.idl
+share/mime-info/palm.keys
+share/mime-info/palm.mime
+share/omf/gnome-pilot/gnome-pilot-C.omf
+share/pixmaps/gnome-palm-conduit.png
+share/pixmaps/gnome-palm.png
+share/pixmaps/sync_broken.png
+share/pixmaps/sync_icon.png
+share/pixmaps/sync_paused.png
+share/pixmaps/syncing_icon.png
 share/locale/am/LC_MESSAGES/gnome-pilot.mo
 share/locale/ar/LC_MESSAGES/gnome-pilot.mo
 share/locale/az/LC_MESSAGES/gnome-pilot.mo
@@ -107,15 +107,20 @@ share/locale/xh/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-pilot.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrm share/gnome/omf/gnome-pilot
+@dirrm share/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-pilot/glade
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
-@dirrmtry share/gnome/gnome-pilot/conduits
-@dirrmtry share/gnome/gnome-pilot
+@dirrmtry share/gnome-pilot/conduits
+@dirrmtry share/gnome-pilot
 @dirrmtry lib/gnome-pilot/conduits
 @dirrmtry lib/gnome-pilot
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index 6a9465c14ab8..3edf324f7d7e 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -3,10 +3,11 @@
 # Whom:                        Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	synce-gnomevfs
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-gnomevfs/pkg-plist b/palm/synce-gnomevfs/pkg-plist
index 40e090b7c8fa..7f0dff7e1d18 100644
--- a/palm/synce-gnomevfs/pkg-plist
+++ b/palm/synce-gnomevfs/pkg-plist
@@ -1,9 +1,9 @@
 bin/synce-in-computer-folder
 etc/gnome-vfs-2.0/modules/synce-module.conf
-share/gnome/pixmaps/synce/synce-color.png
-share/gnome/synce/synce-in-computer-folder.sh
+share/pixmaps/synce/synce-color.png
+share/synce/synce-in-computer-folder.sh
 lib/gnome-vfs-2.0/modules/libsyncevfs.a
 lib/gnome-vfs-2.0/modules/libsyncevfs.la
 lib/gnome-vfs-2.0/modules/libsyncevfs.so
-@dirrmtry share/gnome/pixmaps/synce
-@dirrmtry share/gnome/synce
+@dirrmtry share/pixmaps/synce
+@dirrmtry share/synce
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index 6a9465c14ab8..3edf324f7d7e 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -3,10 +3,11 @@
 # Whom:                        Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	synce-gnomevfs
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-gvfs/pkg-plist b/palm/synce-gvfs/pkg-plist
index 40e090b7c8fa..7f0dff7e1d18 100644
--- a/palm/synce-gvfs/pkg-plist
+++ b/palm/synce-gvfs/pkg-plist
@@ -1,9 +1,9 @@
 bin/synce-in-computer-folder
 etc/gnome-vfs-2.0/modules/synce-module.conf
-share/gnome/pixmaps/synce/synce-color.png
-share/gnome/synce/synce-in-computer-folder.sh
+share/pixmaps/synce/synce-color.png
+share/synce/synce-in-computer-folder.sh
 lib/gnome-vfs-2.0/modules/libsyncevfs.a
 lib/gnome-vfs-2.0/modules/libsyncevfs.la
 lib/gnome-vfs-2.0/modules/libsyncevfs.so
-@dirrmtry share/gnome/pixmaps/synce
-@dirrmtry share/gnome/synce
+@dirrmtry share/pixmaps/synce
+@dirrmtry share/synce
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index f836578f1f61..6a7b8de54b77 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -3,10 +3,11 @@
 # Whom:                        Sam Lawrance <boris@brooknet.com.au>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	synce-multisync_plugin
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	palm deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-multisync/pkg-plist b/palm/synce-multisync/pkg-plist
index dcfd1c46ecb7..e4687c2a0c9a 100644
--- a/palm/synce-multisync/pkg-plist
+++ b/palm/synce-multisync/pkg-plist
@@ -2,6 +2,6 @@ lib/multisync/libsynce_plugin.a
 lib/multisync/libsynce_plugin.la
 lib/multisync/libsynce_plugin.so
 lib/multisync/libsynce_plugin.so.0
-share/gnome/synce/synce_multisync_plugin.glade
-@dirrm share/gnome/synce
+share/synce/synce_multisync_plugin.glade
+@dirrm share/synce
 @dirrmtry lib/multisync