aboutsummaryrefslogtreecommitdiff
path: root/palm/gnome-pilot
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-09-06 21:53:32 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-09-06 21:53:32 +0000
commitdb7223da2f5aaf98f77bd4fe00a848b92a556b99 (patch)
tree10b56e3e80dc0faaad075db688a2afe19583f38f /palm/gnome-pilot
parent1ad918df13c8e14eadbf79bdb0dd3011e5c83f34 (diff)
downloadports-db7223da2f5aaf98f77bd4fe00a848b92a556b99.tar.gz
ports-db7223da2f5aaf98f77bd4fe00a848b92a556b99.zip
Notes
Diffstat (limited to 'palm/gnome-pilot')
-rw-r--r--palm/gnome-pilot/Makefile10
-rw-r--r--palm/gnome-pilot/distinfo6
-rw-r--r--palm/gnome-pilot/files/patch-gpilotd_Makefile.in20
-rw-r--r--palm/gnome-pilot/files/patch-gpilotd__gpilotd.c47
-rw-r--r--palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c11
-rw-r--r--palm/gnome-pilot/files/patch-libgpilotdCM_Makefile.in11
-rw-r--r--palm/gnome-pilot/pkg-plist10
7 files changed, 34 insertions, 81 deletions
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 04d5ee55e83d..123bdf5d030b 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,16 +6,14 @@
#
PORTNAME= gnome-pilot
-PORTVERSION= 2.0.13
-PORTREVISION= 5
+PORTVERSION= 2.0.14
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-pilot/2.0
-DISTNAME= gnome-pilot-${PORTVERSION}
-DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= 3Com PalmPilot conduit system for GNOME 2
+COMMENT= PalmPilot conduit system for GNOME 2
BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index b6226ebaa708..0d60ba877eaa 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/gnome-pilot-2.0.13.tar.bz2) = 662aae1d5915e81e64ee1a6c732c627d
-SHA256 (gnome/gnome-pilot-2.0.13.tar.bz2) = bd3c00e17de56d159f747d2b5ce0a2b880d2c14a70e91001204ba6ab88ad9603
-SIZE (gnome/gnome-pilot-2.0.13.tar.bz2) = 923217
+MD5 (gnome2/gnome-pilot-2.0.14.tar.bz2) = e0dd8c92db7c6df8840e5dcecaea2f3b
+SHA256 (gnome2/gnome-pilot-2.0.14.tar.bz2) = 6b7c3fedd442ae6555efad6ae858d234d2188c5faa48d93510890555c3abb180
+SIZE (gnome2/gnome-pilot-2.0.14.tar.bz2) = 791930
diff --git a/palm/gnome-pilot/files/patch-gpilotd_Makefile.in b/palm/gnome-pilot/files/patch-gpilotd_Makefile.in
deleted file mode 100644
index dd048e721643..000000000000
--- a/palm/gnome-pilot/files/patch-gpilotd_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpilotd/Makefile.in.orig Thu Apr 21 20:56:17 2005
-+++ gpilotd/Makefile.in Thu Apr 21 21:00:38 2005
-@@ -70,7 +70,7 @@
- "$(DESTDIR)$(libgpilotdincludedir)"
- gpilotdlibsLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(gpilotdlibs_LTLIBRARIES)
--libgpilotd_la_LIBADD =
-+libgpilotd_la_LIBADD = $(GNOME_PILOT_LIBS)
- am__objects_1 =
- am__objects_2 = gnome-pilot-common.lo gnome-pilot-skels.lo \
- gnome-pilot-stubs.lo $(am__objects_1)
-@@ -78,7 +78,7 @@
- am_libgpilotd_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
- $(am__objects_1)
- libgpilotd_la_OBJECTS = $(am_libgpilotd_la_OBJECTS)
--libgpilotdconduit_la_LIBADD =
-+libgpilotdconduit_la_LIBADD = $(GNOME_PILOT_LIBS)
- am__objects_4 = gnome-pilot-conduit.lo gnome-pilot-conduit-file.lo \
- gnome-pilot-conduit-backup.lo gnome-pilot-conduit-standard.lo \
- $(am__objects_1)
diff --git a/palm/gnome-pilot/files/patch-gpilotd__gpilotd.c b/palm/gnome-pilot/files/patch-gpilotd__gpilotd.c
index 5af6804f7117..494a81f5287a 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 Thu Sep 2 11:43:47 2004
-+++ gpilotd/gpilotd.c Sun Apr 24 15:56:14 2005
+--- gpilotd/gpilotd.c.orig Tue Sep 5 03:16:41 2006
++++ gpilotd/gpilotd.c Wed Sep 6 17:04:43 2006
@@ -27,6 +27,8 @@
#include "config.h"
#endif
@@ -9,19 +9,10 @@
/* for crypt () */
#ifdef USE_XOPEN_SOURCE
#ifndef _XOPEN_SOURCE
-@@ -903,7 +905,7 @@
- }
-
- fclose (f);
--
-+
- if (visor_exists) {
- l = context->devices;
- while (l) {
-@@ -928,6 +930,49 @@
+@@ -1386,6 +1388,49 @@ visor_devices_timeout (gpointer data)
}
- #endif
+ #endif /* WITH_USB_VISOR */
+#ifdef freebsd
+static gboolean
+visor_devices_timeout (gpointer data)
@@ -64,24 +55,24 @@
+ return TRUE;
+}
+
-+#endif
- #endif
++#endif /* freebsd */
+ #endif /* linux */
+
- void monitor_channel (GPilotDevice *dev,GPilotContext *context)
-@@ -959,16 +1004,12 @@
- #endif /* WITH_NETWORK */
- } if (dev->type == PILOT_DEVICE_USB_VISOR) {
+@@ -1423,16 +1468,12 @@ monitor_channel (GPilotDevice *dev, GPil
+ dev->device_exists = FALSE;
+ } else {
#ifdef WITH_USB_VISOR
-#ifdef linux
- /* We want to watch the /proc/bus/usb/devices file once
- * per context, and then check all devices each time it is
- * woken up. */
- if (visor_timeout_id == -1) {
- visor_timeout_id = g_timeout_add (2000, visor_devices_timeout, context);
- }
--#else /* linux*/
-- g_assert_not_reached ();
+ /* 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 */
- dev->device_exists = FALSE;
+ }
}
diff --git a/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c b/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
deleted file mode 100644
index 82bf09dd7847..000000000000
--- a/palm/gnome-pilot/files/patch-libgpilotdCM::gnome-pilot-conduit-management.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgpilotdCM/gnome-pilot-conduit-management.c.orig Thu Feb 6 03:35:48 2003
-+++ libgpilotdCM/gnome-pilot-conduit-management.c Wed Mar 12 23:12:10 2003
-@@ -235,7 +235,7 @@
- GList *iterator;
-
- /* Do read of all .conduit files here */
-- conduit_files = self_get_conduit_file_names ("share/gnome-pilot/conduits", ".conduit");
-+ conduit_files = self_get_conduit_file_names ("share/gnome/gnome-pilot/conduits", ".conduit");
-
- LOCK_MY_HASHES;
- conduitname_to_datastruct = g_hash_table_new (g_str_hash,g_str_equal);
diff --git a/palm/gnome-pilot/files/patch-libgpilotdCM_Makefile.in b/palm/gnome-pilot/files/patch-libgpilotdCM_Makefile.in
deleted file mode 100644
index b53e0ee3cbe9..000000000000
--- a/palm/gnome-pilot/files/patch-libgpilotdCM_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgpilotdCM/Makefile.in.orig Thu Apr 21 23:51:24 2005
-+++ libgpilotdCM/Makefile.in Thu Apr 21 23:51:39 2005
-@@ -60,7 +60,7 @@
- "$(DESTDIR)$(libgpilotdcmincludedir)"
- gpilotdcmlibsLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(gpilotdcmlibs_LTLIBRARIES)
--libgpilotdcm_la_LIBADD =
-+libgpilotdcm_la_LIBADD = $(GNOME_PILOT_LIBS)
- am__objects_1 = gnome-pilot-conduit-management.lo \
- gnome-pilot-conduit-config.lo
- am_libgpilotdcm_la_OBJECTS = $(am__objects_1)
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index c5badbcd3812..88d318c1195e 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -40,7 +40,7 @@ libdata/bonobo/servers/GNOME_Pilot_Daemon.server
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/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
@@ -71,21 +71,24 @@ 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
share/locale/es/LC_MESSAGES/gnome-pilot.mo
+share/locale/eu/LC_MESSAGES/gnome-pilot.mo
share/locale/fi/LC_MESSAGES/gnome-pilot.mo
share/locale/fr/LC_MESSAGES/gnome-pilot.mo
share/locale/gl/LC_MESSAGES/gnome-pilot.mo
share/locale/he/LC_MESSAGES/gnome-pilot.mo
share/locale/hr/LC_MESSAGES/gnome-pilot.mo
share/locale/hu/LC_MESSAGES/gnome-pilot.mo
+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/mk/LC_MESSAGES/gnome-pilot.mo
share/locale/ml/LC_MESSAGES/gnome-pilot.mo
share/locale/ms/LC_MESSAGES/gnome-pilot.mo
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/no/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
@@ -101,7 +104,10 @@ share/locale/uk/LC_MESSAGES/gnome-pilot.mo
share/locale/vi/LC_MESSAGES/gnome-pilot.mo
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/gnome/help/gnome-pilot/C
@dirrm share/gnome/help/gnome-pilot