Update to 2.0.14.

This commit is contained in:
Joe Marcus Clarke 2006-09-06 21:53:32 +00:00
parent 1ad918df13
commit db7223da2f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=172427
10 changed files with 46 additions and 90 deletions

View file

@ -6,16 +6,14 @@
# #
PORTNAME= gnome-pilot-conduits PORTNAME= gnome-pilot-conduits
PORTVERSION= 2.0.13 PORTVERSION= 2.0.14
PORTREVISION= 2
CATEGORIES= palm comms gnome CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-pilot-conduits/2.0 MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome2 DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Additional conduits for gnome-pilot2 COMMENT= Additional conduits for gnome-pilot
LIB_DEPENDS= gpilotd.3:${PORTSDIR}/palm/gnome-pilot LIB_DEPENDS= gpilotd.3:${PORTSDIR}/palm/gnome-pilot

View file

@ -1,3 +1,3 @@
MD5 (gnome2/gnome-pilot-conduits-2.0.13.tar.bz2) = ea86c329908fc6bea7e546f1d540c8c8 MD5 (gnome2/gnome-pilot-conduits-2.0.14.tar.bz2) = 2fcc65c4aa7da5746432bb7443bb80f1
SHA256 (gnome2/gnome-pilot-conduits-2.0.13.tar.bz2) = fe32fe3622696d0773c2292f2d6a755bd2077427a1d253f2231042e26d7400dd SHA256 (gnome2/gnome-pilot-conduits-2.0.14.tar.bz2) = e86ffb1eec7eff57d551baf22e60a2c416c456506ed3ad4f3496f8ae7d56aab5
SIZE (gnome2/gnome-pilot-conduits-2.0.13.tar.bz2) = 478059 SIZE (gnome2/gnome-pilot-conduits-2.0.14.tar.bz2) = 475743

View file

@ -21,6 +21,7 @@ share/gnome/gnome-pilot/conduits/time.conduit
share/gnome/pixmaps/avantgo.png share/gnome/pixmaps/avantgo.png
share/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/az/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/be/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/be/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/bg/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/ca/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/ca/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/cs/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/da/LC_MESSAGES/gnome-pilot-conduits.mo
@ -35,14 +36,15 @@ share/locale/gl/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/he/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/he/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/hr/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/hr/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/hu/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/ja/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/mk/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/ml/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/ms/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/ms/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/nb/LC_MESSAGES/gnome-pilot-conduits.mo 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/nl/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/nn/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/pa/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/pl/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/pt/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/pt/LC_MESSAGES/gnome-pilot-conduits.mo
@ -60,6 +62,9 @@ share/locale/vi/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/xh/LC_MESSAGES/gnome-pilot-conduits.mo share/locale/xh/LC_MESSAGES/gnome-pilot-conduits.mo
share/locale/zh_CN/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 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrm share/gnome/gnome-pilot/conduits @dirrm share/gnome/gnome-pilot/conduits
@dirrm lib/gnome-pilot/conduits @dirrm lib/gnome-pilot/conduits

View file

@ -6,16 +6,14 @@
# #
PORTNAME= gnome-pilot PORTNAME= gnome-pilot
PORTVERSION= 2.0.13 PORTVERSION= 2.0.14
PORTREVISION= 5
CATEGORIES= palm comms gnome CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-pilot/2.0 MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DISTNAME= gnome-pilot-${PORTVERSION} DIST_SUBDIR= gnome2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org 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 BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link

View file

@ -1,3 +1,3 @@
MD5 (gnome/gnome-pilot-2.0.13.tar.bz2) = 662aae1d5915e81e64ee1a6c732c627d MD5 (gnome2/gnome-pilot-2.0.14.tar.bz2) = e0dd8c92db7c6df8840e5dcecaea2f3b
SHA256 (gnome/gnome-pilot-2.0.13.tar.bz2) = bd3c00e17de56d159f747d2b5ce0a2b880d2c14a70e91001204ba6ab88ad9603 SHA256 (gnome2/gnome-pilot-2.0.14.tar.bz2) = 6b7c3fedd442ae6555efad6ae858d234d2188c5faa48d93510890555c3abb180
SIZE (gnome/gnome-pilot-2.0.13.tar.bz2) = 923217 SIZE (gnome2/gnome-pilot-2.0.14.tar.bz2) = 791930

View file

@ -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)

View file

@ -1,5 +1,5 @@
--- gpilotd/gpilotd.c.orig Thu Sep 2 11:43:47 2004 --- gpilotd/gpilotd.c.orig Tue Sep 5 03:16:41 2006
+++ gpilotd/gpilotd.c Sun Apr 24 15:56:14 2005 +++ gpilotd/gpilotd.c Wed Sep 6 17:04:43 2006
@@ -27,6 +27,8 @@ @@ -27,6 +27,8 @@
#include "config.h" #include "config.h"
#endif #endif
@ -9,19 +9,10 @@
/* for crypt () */ /* for crypt () */
#ifdef USE_XOPEN_SOURCE #ifdef USE_XOPEN_SOURCE
#ifndef _XOPEN_SOURCE #ifndef _XOPEN_SOURCE
@@ -903,7 +905,7 @@ @@ -1386,6 +1388,49 @@ visor_devices_timeout (gpointer data)
} }
fclose (f); #endif /* WITH_USB_VISOR */
-
+
if (visor_exists) {
l = context->devices;
while (l) {
@@ -928,6 +930,49 @@
}
#endif
+#ifdef freebsd +#ifdef freebsd
+static gboolean +static gboolean
+visor_devices_timeout (gpointer data) +visor_devices_timeout (gpointer data)
@ -64,24 +55,24 @@
+ return TRUE; + return TRUE;
+} +}
+ +
+#endif +#endif /* freebsd */
#endif #endif /* linux */
void monitor_channel (GPilotDevice *dev,GPilotContext *context)
@@ -959,16 +1004,12 @@ @@ -1423,16 +1468,12 @@ monitor_channel (GPilotDevice *dev, GPil
#endif /* WITH_NETWORK */ dev->device_exists = FALSE;
} if (dev->type == PILOT_DEVICE_USB_VISOR) { } else {
#ifdef WITH_USB_VISOR #ifdef WITH_USB_VISOR
-#ifdef linux -#ifdef linux
/* We want to watch the /proc/bus/usb/devices file once /* We want to watch for a new recognised USB device
* per context, and then check all devices each time it is * once per context. */
* woken up. */
if (visor_timeout_id == -1) { if (visor_timeout_id == -1) {
visor_timeout_id = g_timeout_add (2000, visor_devices_timeout, context); visor_timeout_id = g_timeout_add (2000,
visor_devices_timeout, context);
} }
-#else /* linux*/ -#else /* linux */
- g_assert_not_reached (); - g_assert_not_reached ();
-#endif /* linux */ -#endif /* linux */
#endif /* WITH_USB_VISOR */ #endif /* WITH_USB_VISOR */
dev->device_exists = FALSE; }
} }

View file

@ -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);

View file

@ -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)

View file

@ -40,7 +40,7 @@ libdata/bonobo/servers/GNOME_Pilot_Daemon.server
libdata/pkgconfig/gnome-pilot-2.0.pc libdata/pkgconfig/gnome-pilot-2.0.pc
libexec/gpilot-applet libexec/gpilot-applet
libexec/gpilotd 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/backup.conduit
share/gnome/gnome-pilot/conduits/file.conduit share/gnome/gnome-pilot/conduits/file.conduit
share/gnome/gnome-pilot/conduits/test.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_CA/LC_MESSAGES/gnome-pilot.mo
share/locale/en_GB/LC_MESSAGES/gnome-pilot.mo share/locale/en_GB/LC_MESSAGES/gnome-pilot.mo
share/locale/es/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/fi/LC_MESSAGES/gnome-pilot.mo
share/locale/fr/LC_MESSAGES/gnome-pilot.mo share/locale/fr/LC_MESSAGES/gnome-pilot.mo
share/locale/gl/LC_MESSAGES/gnome-pilot.mo share/locale/gl/LC_MESSAGES/gnome-pilot.mo
share/locale/he/LC_MESSAGES/gnome-pilot.mo share/locale/he/LC_MESSAGES/gnome-pilot.mo
share/locale/hr/LC_MESSAGES/gnome-pilot.mo share/locale/hr/LC_MESSAGES/gnome-pilot.mo
share/locale/hu/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/ja/LC_MESSAGES/gnome-pilot.mo
share/locale/ko/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/mk/LC_MESSAGES/gnome-pilot.mo
share/locale/ml/LC_MESSAGES/gnome-pilot.mo share/locale/ml/LC_MESSAGES/gnome-pilot.mo
share/locale/ms/LC_MESSAGES/gnome-pilot.mo share/locale/ms/LC_MESSAGES/gnome-pilot.mo
share/locale/nb/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/nl/LC_MESSAGES/gnome-pilot.mo
share/locale/nn/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/pa/LC_MESSAGES/gnome-pilot.mo
share/locale/pl/LC_MESSAGES/gnome-pilot.mo share/locale/pl/LC_MESSAGES/gnome-pilot.mo
share/locale/pt/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/vi/LC_MESSAGES/gnome-pilot.mo
share/locale/xh/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_CN/LC_MESSAGES/gnome-pilot.mo
share/locale/zh_HK/LC_MESSAGES/gnome-pilot.mo
share/locale/zh_TW/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/omf/gnome-pilot
@dirrm share/gnome/help/gnome-pilot/C @dirrm share/gnome/help/gnome-pilot/C
@dirrm share/gnome/help/gnome-pilot @dirrm share/gnome/help/gnome-pilot