aboutsummaryrefslogtreecommitdiff
path: root/palm
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-12-03 09:53:51 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-12-03 09:53:51 +0000
commit3809f6605504c7094739f56eef4db1bea5a623ff (patch)
tree74441a868177486237d4984661b8b689ff5511ca /palm
parent20d7bfd951a25610ff18e3e99d51b4d05676c8e1 (diff)
downloadports-3809f6605504c7094739f56eef4db1bea5a623ff.tar.gz
ports-3809f6605504c7094739f56eef4db1bea5a623ff.zip
Notes
Diffstat (limited to 'palm')
-rw-r--r--palm/gnome-pilot-conduits/Makefile8
-rw-r--r--palm/gnome-pilot-conduits/distinfo2
-rw-r--r--palm/gnome-pilot-conduits/files/patch-aa17
-rw-r--r--palm/gnome-pilot-conduits/files/patch-ab11
-rw-r--r--palm/gnome-pilot-conduits/files/patch-icon-path36
-rw-r--r--palm/gnome-pilot-conduits/pkg-plist35
-rw-r--r--palm/gnomepilot-conduits/Makefile8
-rw-r--r--palm/gnomepilot-conduits/distinfo2
-rw-r--r--palm/gnomepilot-conduits/files/patch-aa17
-rw-r--r--palm/gnomepilot-conduits/files/patch-ab11
-rw-r--r--palm/gnomepilot-conduits/files/patch-icon-path36
-rw-r--r--palm/gnomepilot-conduits/pkg-plist35
-rw-r--r--palm/gnomepilot-conduits2/Makefile8
-rw-r--r--palm/gnomepilot-conduits2/distinfo2
-rw-r--r--palm/gnomepilot-conduits2/files/patch-aa17
-rw-r--r--palm/gnomepilot-conduits2/files/patch-ab11
-rw-r--r--palm/gnomepilot-conduits2/files/patch-icon-path36
-rw-r--r--palm/gnomepilot-conduits2/pkg-plist35
18 files changed, 219 insertions, 108 deletions
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 590c6ac0bf45..4d59a2051fd6 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -6,22 +6,22 @@
#
PORTNAME= gnomepilot-conduits
-PORTVERSION= 0.4
+PORTVERSION= 0.7
CATEGORIES= palm comms gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= http://www.eskil.org/gnome-pilot/download/tarballs/ \
+ ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot-conduits
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link \
- gpilotd.0:${PORTSDIR}/palm/gnomepilot
+ gpilotd.1:${PORTSDIR}/palm/gnomepilot
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_LIBTOOL= yes
-LIBTOOLFILES= configure mal-conduit/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
diff --git a/palm/gnome-pilot-conduits/distinfo b/palm/gnome-pilot-conduits/distinfo
index efd1455c9c8f..8451a8c79cf4 100644
--- a/palm/gnome-pilot-conduits/distinfo
+++ b/palm/gnome-pilot-conduits/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-conduits-0.4.tar.gz) = a928481c0f8b0e0eea0d7706193f9334
+MD5 (gnome-pilot-conduits-0.7.tar.gz) = 84d10772ac49d01354e31999b1c59c5e
diff --git a/palm/gnome-pilot-conduits/files/patch-aa b/palm/gnome-pilot-conduits/files/patch-aa
deleted file mode 100644
index a4e3be47b8d6..000000000000
--- a/palm/gnome-pilot-conduits/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig Thu Mar 16 10:47:51 2000
-+++ configure Thu Mar 16 10:51:10 2000
-@@ -1181,10 +1181,10 @@
- *) # Relative path.
- ac_sub_cache_file="$ac_dots$cache_file" ;;
- esac
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-- esac
-+# case "$ac_given_INSTALL" in
-+# [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+# esac
-
- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
- # The eval makes quoting arguments work.
diff --git a/palm/gnome-pilot-conduits/files/patch-ab b/palm/gnome-pilot-conduits/files/patch-ab
deleted file mode 100644
index 485d8e8571fb..000000000000
--- a/palm/gnome-pilot-conduits/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- mal-conduit/src/Makefile.in.orig Wed May 10 01:26:11 2000
-+++ mal-conduit/src/Makefile.in Tue May 16 17:07:16 2000
-@@ -168,7 +168,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libmal_conduit_la_LDFLAGS =
-+libmal_conduit_la_LDFLAGS = -avoid-version
- libmal_conduit_la_DEPENDENCIES = ../mal/common/libmal_common.la \
- ../mal/client/unix/libmal_client_unix.la \
- ../mal/client/common/libmal_client_common.la
diff --git a/palm/gnome-pilot-conduits/files/patch-icon-path b/palm/gnome-pilot-conduits/files/patch-icon-path
new file mode 100644
index 000000000000..61b499002a70
--- /dev/null
+++ b/palm/gnome-pilot-conduits/files/patch-icon-path
@@ -0,0 +1,36 @@
+--- email/sendmail.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ email/sendmail.conduit.in Sun Dec 2 03:19:29 2001
+@@ -4,5 +4,5 @@
+ <conduit-attribute name="description" value="Mails your Palm emails via sendmail"/>
+ <conduit-attribute name="default-synctype" value="custom"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-mailcheck.png"/>
++<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-mailcheck.png"/>
+ </gnome-pilot-conduit>
+--- expense/expense.conduit.in.orig Sun Dec 2 03:17:13 2001
++++ expense/expense.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-money.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-money.png"/>
+ </gnome-pilot-conduit>
+--- memo_file/memofile.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ memo_file/memofile.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-note.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-note.png"/>
+ </gnome-pilot-conduit>
+--- time/time.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ time/time.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-clock.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-clock.png"/>
+ </gnome-pilot-conduit>
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index 3065fd893c12..b5eb0040e93b 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -1,6 +1,35 @@
-bin/mal-conduit-control-applet
+lib/gnome-pilot/conduits/libemail_conduit.so
+lib/gnome-pilot/conduits/libexpense_conduit.so
lib/gnome-pilot/conduits/libmal_conduit.so
-share/gnome/apps/Settings/Peripherals/Conduits/mal-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/mal-conduit-control-applet.desktop
+lib/gnome-pilot/conduits/libmemo_file_conduit.so
+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/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ca/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/el/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/es/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/fi/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/fr/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/gl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/hu/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ja/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/no/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pt/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ru/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/sk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/sv/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/tr/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index 590c6ac0bf45..4d59a2051fd6 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -6,22 +6,22 @@
#
PORTNAME= gnomepilot-conduits
-PORTVERSION= 0.4
+PORTVERSION= 0.7
CATEGORIES= palm comms gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= http://www.eskil.org/gnome-pilot/download/tarballs/ \
+ ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot-conduits
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link \
- gpilotd.0:${PORTSDIR}/palm/gnomepilot
+ gpilotd.1:${PORTSDIR}/palm/gnomepilot
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_LIBTOOL= yes
-LIBTOOLFILES= configure mal-conduit/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
diff --git a/palm/gnomepilot-conduits/distinfo b/palm/gnomepilot-conduits/distinfo
index efd1455c9c8f..8451a8c79cf4 100644
--- a/palm/gnomepilot-conduits/distinfo
+++ b/palm/gnomepilot-conduits/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-conduits-0.4.tar.gz) = a928481c0f8b0e0eea0d7706193f9334
+MD5 (gnome-pilot-conduits-0.7.tar.gz) = 84d10772ac49d01354e31999b1c59c5e
diff --git a/palm/gnomepilot-conduits/files/patch-aa b/palm/gnomepilot-conduits/files/patch-aa
deleted file mode 100644
index a4e3be47b8d6..000000000000
--- a/palm/gnomepilot-conduits/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig Thu Mar 16 10:47:51 2000
-+++ configure Thu Mar 16 10:51:10 2000
-@@ -1181,10 +1181,10 @@
- *) # Relative path.
- ac_sub_cache_file="$ac_dots$cache_file" ;;
- esac
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-- esac
-+# case "$ac_given_INSTALL" in
-+# [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+# esac
-
- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
- # The eval makes quoting arguments work.
diff --git a/palm/gnomepilot-conduits/files/patch-ab b/palm/gnomepilot-conduits/files/patch-ab
deleted file mode 100644
index 485d8e8571fb..000000000000
--- a/palm/gnomepilot-conduits/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- mal-conduit/src/Makefile.in.orig Wed May 10 01:26:11 2000
-+++ mal-conduit/src/Makefile.in Tue May 16 17:07:16 2000
-@@ -168,7 +168,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libmal_conduit_la_LDFLAGS =
-+libmal_conduit_la_LDFLAGS = -avoid-version
- libmal_conduit_la_DEPENDENCIES = ../mal/common/libmal_common.la \
- ../mal/client/unix/libmal_client_unix.la \
- ../mal/client/common/libmal_client_common.la
diff --git a/palm/gnomepilot-conduits/files/patch-icon-path b/palm/gnomepilot-conduits/files/patch-icon-path
new file mode 100644
index 000000000000..61b499002a70
--- /dev/null
+++ b/palm/gnomepilot-conduits/files/patch-icon-path
@@ -0,0 +1,36 @@
+--- email/sendmail.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ email/sendmail.conduit.in Sun Dec 2 03:19:29 2001
+@@ -4,5 +4,5 @@
+ <conduit-attribute name="description" value="Mails your Palm emails via sendmail"/>
+ <conduit-attribute name="default-synctype" value="custom"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-mailcheck.png"/>
++<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-mailcheck.png"/>
+ </gnome-pilot-conduit>
+--- expense/expense.conduit.in.orig Sun Dec 2 03:17:13 2001
++++ expense/expense.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-money.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-money.png"/>
+ </gnome-pilot-conduit>
+--- memo_file/memofile.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ memo_file/memofile.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-note.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-note.png"/>
+ </gnome-pilot-conduit>
+--- time/time.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ time/time.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-clock.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-clock.png"/>
+ </gnome-pilot-conduit>
diff --git a/palm/gnomepilot-conduits/pkg-plist b/palm/gnomepilot-conduits/pkg-plist
index 3065fd893c12..b5eb0040e93b 100644
--- a/palm/gnomepilot-conduits/pkg-plist
+++ b/palm/gnomepilot-conduits/pkg-plist
@@ -1,6 +1,35 @@
-bin/mal-conduit-control-applet
+lib/gnome-pilot/conduits/libemail_conduit.so
+lib/gnome-pilot/conduits/libexpense_conduit.so
lib/gnome-pilot/conduits/libmal_conduit.so
-share/gnome/apps/Settings/Peripherals/Conduits/mal-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/mal-conduit-control-applet.desktop
+lib/gnome-pilot/conduits/libmemo_file_conduit.so
+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/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ca/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/el/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/es/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/fi/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/fr/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/gl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/hu/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ja/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/no/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pt/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ru/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/sk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/sv/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/tr/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 590c6ac0bf45..4d59a2051fd6 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -6,22 +6,22 @@
#
PORTNAME= gnomepilot-conduits
-PORTVERSION= 0.4
+PORTVERSION= 0.7
CATEGORIES= palm comms gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= http://www.eskil.org/gnome-pilot/download/tarballs/ \
+ ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot-conduits
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link \
- gpilotd.0:${PORTSDIR}/palm/gnomepilot
+ gpilotd.1:${PORTSDIR}/palm/gnomepilot
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_LIBTOOL= yes
-LIBTOOLFILES= configure mal-conduit/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
diff --git a/palm/gnomepilot-conduits2/distinfo b/palm/gnomepilot-conduits2/distinfo
index efd1455c9c8f..8451a8c79cf4 100644
--- a/palm/gnomepilot-conduits2/distinfo
+++ b/palm/gnomepilot-conduits2/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-conduits-0.4.tar.gz) = a928481c0f8b0e0eea0d7706193f9334
+MD5 (gnome-pilot-conduits-0.7.tar.gz) = 84d10772ac49d01354e31999b1c59c5e
diff --git a/palm/gnomepilot-conduits2/files/patch-aa b/palm/gnomepilot-conduits2/files/patch-aa
deleted file mode 100644
index a4e3be47b8d6..000000000000
--- a/palm/gnomepilot-conduits2/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig Thu Mar 16 10:47:51 2000
-+++ configure Thu Mar 16 10:51:10 2000
-@@ -1181,10 +1181,10 @@
- *) # Relative path.
- ac_sub_cache_file="$ac_dots$cache_file" ;;
- esac
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-- esac
-+# case "$ac_given_INSTALL" in
-+# [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+# esac
-
- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
- # The eval makes quoting arguments work.
diff --git a/palm/gnomepilot-conduits2/files/patch-ab b/palm/gnomepilot-conduits2/files/patch-ab
deleted file mode 100644
index 485d8e8571fb..000000000000
--- a/palm/gnomepilot-conduits2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- mal-conduit/src/Makefile.in.orig Wed May 10 01:26:11 2000
-+++ mal-conduit/src/Makefile.in Tue May 16 17:07:16 2000
-@@ -168,7 +168,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libmal_conduit_la_LDFLAGS =
-+libmal_conduit_la_LDFLAGS = -avoid-version
- libmal_conduit_la_DEPENDENCIES = ../mal/common/libmal_common.la \
- ../mal/client/unix/libmal_client_unix.la \
- ../mal/client/common/libmal_client_common.la
diff --git a/palm/gnomepilot-conduits2/files/patch-icon-path b/palm/gnomepilot-conduits2/files/patch-icon-path
new file mode 100644
index 000000000000..61b499002a70
--- /dev/null
+++ b/palm/gnomepilot-conduits2/files/patch-icon-path
@@ -0,0 +1,36 @@
+--- email/sendmail.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ email/sendmail.conduit.in Sun Dec 2 03:19:29 2001
+@@ -4,5 +4,5 @@
+ <conduit-attribute name="description" value="Mails your Palm emails via sendmail"/>
+ <conduit-attribute name="default-synctype" value="custom"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-mailcheck.png"/>
++<conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-mailcheck.png"/>
+ </gnome-pilot-conduit>
+--- expense/expense.conduit.in.orig Sun Dec 2 03:17:13 2001
++++ expense/expense.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-money.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-money.png"/>
+ </gnome-pilot-conduit>
+--- memo_file/memofile.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ memo_file/memofile.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-note.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-note.png"/>
+ </gnome-pilot-conduit>
+--- time/time.conduit.in.orig Sun Dec 2 03:17:09 2001
++++ time/time.conduit.in Sun Dec 2 03:19:29 2001
+@@ -5,5 +5,5 @@
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize"/>
+ <conduit-attribute name="settings" value="TRUE"/>
+- <conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-clock.png"/>
++ <conduit-attribute name="icon" value="@prefix@/share/gnome/pixmaps/gnome-clock.png"/>
+ </gnome-pilot-conduit>
diff --git a/palm/gnomepilot-conduits2/pkg-plist b/palm/gnomepilot-conduits2/pkg-plist
index 3065fd893c12..b5eb0040e93b 100644
--- a/palm/gnomepilot-conduits2/pkg-plist
+++ b/palm/gnomepilot-conduits2/pkg-plist
@@ -1,6 +1,35 @@
-bin/mal-conduit-control-applet
+lib/gnome-pilot/conduits/libemail_conduit.so
+lib/gnome-pilot/conduits/libexpense_conduit.so
lib/gnome-pilot/conduits/libmal_conduit.so
-share/gnome/apps/Settings/Peripherals/Conduits/mal-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/Conduits/mal-conduit-control-applet.desktop
+lib/gnome-pilot/conduits/libmemo_file_conduit.so
+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/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ca/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/el/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/es/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/fi/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/fr/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/gl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/hu/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ja/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/no/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pl/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pt/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/ru/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/sk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/sv/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/tr/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo