Tue Nov 29 15:12:08 2011 UTC ()
Fix a warnings about assigned but unused variable, which caused the
build to fail.


(hans)
diff -r1.5 -r1.6 pkgsrc/comms/libopensync/distinfo
diff -r1.1 -r1.2 pkgsrc/comms/libopensync/patches/patch-ad
diff -r0 -r1.1 pkgsrc/comms/libopensync/patches/patch-opensync_opensync_time.c
cvs diff -r1.5 -r1.6 pkgsrc/comms/libopensync/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/libopensync/distinfo 2011/07/21 15:35:55 1.5
+++ pkgsrc/comms/libopensync/distinfo 2011/11/29 15:12:07 1.6
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.5 2011/07/21 15:35:55 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2011/11/29 15:12:07 hans Exp $
2 2
3SHA1 (libopensync-0.22.tar.bz2) = 47860a8c6621aa89fbff2af2517787747af7cc30 3SHA1 (libopensync-0.22.tar.bz2) = 47860a8c6621aa89fbff2af2517787747af7cc30
4RMD160 (libopensync-0.22.tar.bz2) = a1e9715d037a7c474b80d609e6c96a24cbb6692f 4RMD160 (libopensync-0.22.tar.bz2) = a1e9715d037a7c474b80d609e6c96a24cbb6692f
5Size (libopensync-0.22.tar.bz2) = 489978 bytes 5Size (libopensync-0.22.tar.bz2) = 489978 bytes
6SHA1 (patch-aa) = 4bcf03611850719042bafd794fc413cef159a702 6SHA1 (patch-aa) = 4bcf03611850719042bafd794fc413cef159a702
7SHA1 (patch-ab) = 057f995d58c98eba96e22671d9c8ee0ec8270b3e 7SHA1 (patch-ab) = 057f995d58c98eba96e22671d9c8ee0ec8270b3e
8SHA1 (patch-ac) = f6a8c12e9344a7f68439b06f8797bfa30106d0e3 8SHA1 (patch-ac) = f6a8c12e9344a7f68439b06f8797bfa30106d0e3
9SHA1 (patch-ad) = 2020bdc4d4ed38e25c4376aefc4b81ed00a3a786 9SHA1 (patch-ad) = a9ea7b8d4774fac2a237090b4e7768cf5ec5da27
10SHA1 (patch-ae) = 39b5cf27a5b1722f5d8550b97deb1a8763a4ace1 10SHA1 (patch-ae) = 39b5cf27a5b1722f5d8550b97deb1a8763a4ace1
11SHA1 (patch-af) = 07666352a1cd68ae00b10fc5eefeb8001673abe7 11SHA1 (patch-af) = 07666352a1cd68ae00b10fc5eefeb8001673abe7
 12SHA1 (patch-opensync_opensync_time.c) = cb6cf27e1ba3fcd6a0cb139759d4da7306817e10
cvs diff -r1.1 -r1.2 pkgsrc/comms/libopensync/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/comms/libopensync/patches/patch-ad 2007/12/11 13:35:37 1.1
+++ pkgsrc/comms/libopensync/patches/patch-ad 2011/11/29 15:12:08 1.2
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-ad,v 1.1 2007/12/11 13:35:37 yyamano Exp $ 1$NetBSD: patch-ad,v 1.2 2011/11/29 15:12:08 hans Exp $
2 2
3--- tools/osynctest.c.orig 2007-03-27 20:49:19.000000000 +0900 3--- tools/osynctest.c.orig 2007-03-27 20:49:19.000000000 +0900
4+++ tools/osynctest.c 4+++ tools/osynctest.c
5@@ -212,7 +212,7 @@ void modify_data(OSyncMember *member, co 5@@ -81,8 +81,6 @@ double writetime;
 6 double _second() /* note that some compilers like AIX xlf do not require the trailing '_' */
 7 {
 8 struct timeval tp;
 9- int rtn;
 10- rtn=gettimeofday(&tp, NULL);
 11
 12 return ((double)tp.tv_sec+(1.e-6)*tp.tv_usec);
 13 }
 14@@ -212,7 +210,7 @@ void modify_data(OSyncMember *member, co
6  15
7 const char *de = NULL; 16 const char *de = NULL;
8 while ((de = g_dir_read_name(dir))) { 17 while ((de = g_dir_read_name(dir))) {
9- char *filename = g_build_filename(localdir, de, NULL); 18- char *filename = g_build_filename(localdir, de, NULL);
10+ char *filename = g_build_filename(localdir, de, (char *)NULL); 19+ char *filename = g_build_filename(localdir, de, (char *)NULL);
11  20
12 OSyncChange *change = osync_change_new(); 21 OSyncChange *change = osync_change_new();
13 if (!osync_member_make_random_data(member, change, objtype)) { 22 if (!osync_member_make_random_data(member, change, objtype)) {
File Added: pkgsrc/comms/libopensync/patches/patch-opensync_opensync_time.c
$NetBSD: patch-opensync_opensync_time.c,v 1.1 2011/11/29 15:12:08 hans Exp $

--- opensync/opensync_time.c.orig	2007-03-27 13:49:18.000000000 +0200
+++ opensync/opensync_time.c	2011-11-28 20:41:03.626682362 +0100
@@ -889,16 +889,13 @@ osync_bool osync_time_isdst(const char *
 	osync_trace(TRACE_ENTRY, "%s(%s, %p)", __func__, vtime, tzid);
 
 	int year;
-	char *newyear = NULL;
-	time_t newyear_t, timestamp;
+	time_t timestamp;
 	struct tm *std_changetime, *dst_changetime;
 	time_t dstStamp, stdStamp;
 	xmlNode *current = NULL;
 
 	sscanf(vtime, "%4d%*2d%*2dT%*2d%*d%*2d%*c", &year);
 
-	newyear = g_strdup_printf("%4d0101T000000", year);
-	newyear_t = osync_time_vtime2unix(newyear, 0);
 	timestamp = osync_time_vtime2unix(vtime, 0);
 
 	/* Handle XML Timezone field */