From 679ad487659e55ebe8cc7764e8c401048fd13f52 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 18 Nov 2009 13:54:51 +0000 Subject: [PATCH] Upgrade to zarafa-libical-0.44. --- mail/zarafa/libical/Makefile | 12 +-- mail/zarafa/libical/distinfo | 10 +-- mail/zarafa/libical/patches/patch-configure | 12 +-- .../patches/patch-examples_Makefile_in | 10 +-- ...xamples_access_properties_and_parameters_c | 11 --- .../patches/patch-src_libical_Makefile_in | 10 +-- .../patches/patch-src_libical_icaltz-util_c | 77 +++++++++++-------- .../patches/patch-src_libicalss_Makefile_in | 10 +-- .../patches/patch-src_libicalvcal_Makefile_in | 20 ++--- .../patches/patch-src_test_Makefile_in | 12 +-- 10 files changed, 91 insertions(+), 93 deletions(-) delete mode 100644 mail/zarafa/libical/patches/patch-examples_access_properties_and_parameters_c diff --git a/mail/zarafa/libical/Makefile b/mail/zarafa/libical/Makefile index 73656edf27d..1fd62c7a81c 100644 --- a/mail/zarafa/libical/Makefile +++ b/mail/zarafa/libical/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.5 2009/09/05 12:59:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2009/11/18 13:54:51 ajacoutot Exp $ COMMENT= modified libical library for Zarafa -DISTNAME= libical-0.42 -PKGNAME= zarafa-${DISTNAME}p0 +DISTNAME= libical-0.44 +PKGNAME= zarafa-${DISTNAME} # We patched the source to rename the libraries so that this package can # cohabitate with the "official" one (i.e. textproc/libical). -SHARED_LIBS+= ical-zarafa 1.0 # .0.0 -SHARED_LIBS+= icalss-zarafa 1.0 # .0.0 -SHARED_LIBS+= icalvcal-zarafa 1.0 # .0.0 +SHARED_LIBS+= ical-zarafa 2.0 # .44.0 +SHARED_LIBS+= icalss-zarafa 2.0 # .44.0 +SHARED_LIBS+= icalvcal-zarafa 2.0 # .44.0 CATEGORIES= textproc diff --git a/mail/zarafa/libical/distinfo b/mail/zarafa/libical/distinfo index 18cf5088e16..0fb522f85d2 100644 --- a/mail/zarafa/libical/distinfo +++ b/mail/zarafa/libical/distinfo @@ -1,5 +1,5 @@ -MD5 (zarafa/libical-0.42.tar.gz) = NDldzAwPlQ8zf3vxg7WsGg== -RMD160 (zarafa/libical-0.42.tar.gz) = cVRKVipCRL7H9iZpvb8oBZHAslM= -SHA1 (zarafa/libical-0.42.tar.gz) = i2ZUxxSwGT5ElqVUJ4A8lpycteE= -SHA256 (zarafa/libical-0.42.tar.gz) = xfZFhgmFFQFoSzqVu+NtdWXGAOtDXUaeEHWA2NE8lFE= -SIZE (zarafa/libical-0.42.tar.gz) = 1145477 +MD5 (zarafa/libical-0.44.tar.gz) = 4EA8MeHtglaTJWhfjBWVnA== +RMD160 (zarafa/libical-0.44.tar.gz) = VkD/0/8BgH5J2QkAAFEMSVkhjDk= +SHA1 (zarafa/libical-0.44.tar.gz) = 94EVDi2YgG6Rt+C+4Cq9xrr5rH0= +SHA256 (zarafa/libical-0.44.tar.gz) = IKR1Dfj03t1xi1URe4NRmJ4N+krSyWajg1UO1D5qctg= +SIZE (zarafa/libical-0.44.tar.gz) = 1149067 diff --git a/mail/zarafa/libical/patches/patch-configure b/mail/zarafa/libical/patches/patch-configure index 675498ec559..8b0550f66bc 100644 --- a/mail/zarafa/libical/patches/patch-configure +++ b/mail/zarafa/libical/patches/patch-configure @@ -1,16 +1,16 @@ -$OpenBSD: patch-configure,v 1.1 2009/07/31 09:55:01 ajacoutot Exp $ ---- configure.orig Tue Nov 25 17:28:34 2008 -+++ configure Thu Jul 23 15:05:19 2009 -@@ -1908,7 +1908,7 @@ fi +$OpenBSD: patch-configure,v 1.2 2009/11/18 13:54:52 ajacoutot Exp $ +--- configure.orig Wed Nov 18 11:16:40 2009 ++++ configure Wed Nov 18 11:18:00 2009 +@@ -1909,7 +1909,7 @@ fi # Define the identity of the package. - PACKAGE='libical' + PACKAGE='zarafa-libical' - VERSION='0.42' + VERSION='0.44' -@@ -20545,6 +20545,16 @@ case "${host}" in +@@ -19571,6 +19571,16 @@ case "${host}" in *-*-freebsdelf4* ) echo "$as_me:$LINENO: result: checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)" >&5 echo "${ECHO_T}checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)" >&6 diff --git a/mail/zarafa/libical/patches/patch-examples_Makefile_in b/mail/zarafa/libical/patches/patch-examples_Makefile_in index bee6fc694a0..11e78323ebf 100644 --- a/mail/zarafa/libical/patches/patch-examples_Makefile_in +++ b/mail/zarafa/libical/patches/patch-examples_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-examples_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ ---- examples/Makefile.in.orig Tue Nov 25 17:28:08 2008 -+++ examples/Makefile.in Thu Jul 23 14:58:03 2009 -@@ -54,12 +54,12 @@ am_doesnothing_OBJECTS = access_components.$(OBJEXT) \ +$OpenBSD: patch-examples_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $ +--- examples/Makefile.in.orig Wed Nov 18 11:18:18 2009 ++++ examples/Makefile.in Wed Nov 18 11:20:09 2009 +@@ -52,12 +52,12 @@ am_doesnothing_OBJECTS = access_components.$(OBJEXT) \ access_properties_and_parameters.$(OBJEXT) errors.$(OBJEXT) \ main.$(OBJEXT) parse_text.$(OBJEXT) doesnothing_OBJECTS = $(am_doesnothing_OBJECTS) @@ -20,7 +20,7 @@ $OpenBSD: patch-examples_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -215,8 +215,8 @@ target_alias = @target_alias@ +@@ -214,8 +214,8 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ diff --git a/mail/zarafa/libical/patches/patch-examples_access_properties_and_parameters_c b/mail/zarafa/libical/patches/patch-examples_access_properties_and_parameters_c deleted file mode 100644 index 7f1d97aef53..00000000000 --- a/mail/zarafa/libical/patches/patch-examples_access_properties_and_parameters_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-examples_access_properties_and_parameters_c,v 1.1 2009/07/31 09:55:01 ajacoutot Exp $ ---- examples/access_properties_and_parameters.c.orig Tue Jul 28 10:18:24 2009 -+++ examples/access_properties_and_parameters.c Tue Jul 28 10:18:29 2009 -@@ -2,6 +2,7 @@ - - #include - #include -+#include - - /* Get a particular parameter out of a component. This routine will - return a list of strings of all attendees who are required. Note diff --git a/mail/zarafa/libical/patches/patch-src_libical_Makefile_in b/mail/zarafa/libical/patches/patch-src_libical_Makefile_in index e7c438c6acd..bd737492225 100644 --- a/mail/zarafa/libical/patches/patch-src_libical_Makefile_in +++ b/mail/zarafa/libical/patches/patch-src_libical_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_libical_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ ---- src/libical/Makefile.in.orig Tue Nov 25 17:28:14 2008 -+++ src/libical/Makefile.in Thu Jul 23 15:19:22 2009 -@@ -308,10 +308,10 @@ target_vendor = @target_vendor@ +$OpenBSD: patch-src_libical_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $ +--- src/libical/Makefile.in.orig Sun Sep 27 04:40:09 2009 ++++ src/libical/Makefile.in Wed Nov 18 11:20:48 2009 +@@ -307,10 +307,10 @@ target_vendor = @target_vendor@ DESIGNDATA = $(top_srcdir)/design-data ICALSCRIPTS = $(top_srcdir)/scripts @WITH_CXX_BINDINGS_FALSE@cxx_lib = @@ -14,7 +14,7 @@ $OpenBSD: patch-src_libical_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp noinst_LTLIBRARIES = libical-static.la libical_static_la_SOURCES = $(libical_la_SOURCES) libical_static_la_LDFLAGS = --all-static -@@ -588,9 +588,9 @@ clean-noinstLTLIBRARIES: +@@ -587,9 +587,9 @@ clean-noinstLTLIBRARIES: done libical-static.la: $(libical_static_la_OBJECTS) $(libical_static_la_DEPENDENCIES) $(LINK) $(libical_static_la_LDFLAGS) $(libical_static_la_OBJECTS) $(libical_static_la_LIBADD) $(LIBS) diff --git a/mail/zarafa/libical/patches/patch-src_libical_icaltz-util_c b/mail/zarafa/libical/patches/patch-src_libical_icaltz-util_c index 423239dfd6f..a0294da7741 100644 --- a/mail/zarafa/libical/patches/patch-src_libical_icaltz-util_c +++ b/mail/zarafa/libical/patches/patch-src_libical_icaltz-util_c @@ -1,42 +1,51 @@ -$OpenBSD: patch-src_libical_icaltz-util_c,v 1.1 2009/09/05 12:59:26 ajacoutot Exp $ - -Comment some non portable code ; from pkgsrc libical. - ---- src/libical/icaltz-util.c.orig Tue Nov 25 09:26:51 2008 -+++ src/libical/icaltz-util.c Sat Sep 5 06:55:16 2009 -@@ -25,6 +25,7 @@ - #endif - #include +$OpenBSD: patch-src_libical_icaltz-util_c,v 1.2 2009/11/18 13:54:52 ajacoutot Exp $ +--- src/libical/icaltz-util.c.orig Sat Oct 10 18:09:08 2009 ++++ src/libical/icaltz-util.c Sat Oct 10 18:24:28 2009 +@@ -27,6 +27,14 @@ -+#if 0 /* XXX see below */ #if defined(sun) && defined(__SVR4) #include ++#elif defined(__OpenBSD__) ++#include ++#define __BYTE_ORDER _BYTE_ORDER ++#define __LITTLE_ENDIAN _LITTLE_ENDIAN ++#define __BIG_ENDIAN _BIG_ENDIAN ++#define bswap_16 swap16 ++#define bswap_32 swap32 ++#define bswap_64 swap64 #else -@@ -43,6 +44,7 @@ - # include - # endif - #endif -+#endif - - #ifdef WIN32 - #if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H) -@@ -128,6 +130,7 @@ typedef struct - static int - decode (const void *ptr) - { -+#if 0 /* XXX nonportable, possibly alignment problems */ - #if defined(sun) && defined(__SVR4) + # ifdef HAVE_BYTESWAP_H + # include +@@ -132,6 +140,8 @@ decode (const void *ptr) if (sizeof (int) == 4) #ifdef _BIG_ENDIAN -@@ -142,9 +145,10 @@ decode (const void *ptr) - return bswap_32 (*(const int *) ptr); + return *(const int *) ptr; ++#elif __OpenBSD__ ++ return swap32 (*(const uint32_t *) ptr); + #else + return BSWAP_32 (*(const int *) ptr); #endif - else -+#endif - { - const unsigned char *p = ptr; -- int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0; -+ unsigned int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0; +@@ -426,7 +436,10 @@ icaltzutil_fetch_timezone (const char *location) + else + zp_idx = zidx; + /* DTSTART localtime uses TZOFFSETFROM UTC offset */ +- trans = transitions [stdidx] + types [zp_idx].gmtoff; ++ if (num_trans) ++ trans = transitions [stdidx] + types [zidx].gmtoff; ++ else ++ trans = types [zidx].gmtoff; + icaltime = icaltime_from_timet (trans, 0); + dtstart = icaltime; + dtstart.year = 1970; +@@ -465,7 +478,10 @@ icaltzutil_fetch_timezone (const char *location) + icalcomponent_add_property (dst_comp, icalprop); - result = (result << 8) | *p++; - result = (result << 8) | *p++; + /* DTSTART localtime uses TZOFFSETFROM UTC offset */ +- trans = transitions [dstidx] + types [zp_idx].gmtoff; ++ if (num_trans) ++ trans = transitions [dstidx] + types [zidx].gmtoff; ++ else ++ trans = types [zidx].gmtoff; + icaltime = icaltime_from_timet (trans, 0); + dtstart = icaltime; + dtstart.year = 1970; diff --git a/mail/zarafa/libical/patches/patch-src_libicalss_Makefile_in b/mail/zarafa/libical/patches/patch-src_libicalss_Makefile_in index 461030f3a9a..9e86f6f22bc 100644 --- a/mail/zarafa/libical/patches/patch-src_libicalss_Makefile_in +++ b/mail/zarafa/libical/patches/patch-src_libicalss_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_libicalss_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ ---- src/libicalss/Makefile.in.orig Tue Nov 25 17:28:16 2008 -+++ src/libicalss/Makefile.in Thu Jul 23 15:22:57 2009 -@@ -296,10 +296,10 @@ AM_LFLAGS = -Pss +$OpenBSD: patch-src_libicalss_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $ +--- src/libicalss/Makefile.in.orig Sun Sep 27 04:40:09 2009 ++++ src/libicalss/Makefile.in Wed Nov 18 11:20:48 2009 +@@ -295,10 +295,10 @@ AM_LFLAGS = -Pss -L -R @WITH_BDB4_TRUE@libicalssinclude_BDBHEADERS = icalbdbset.h icalbdbsetimpl.h @WITH_BDB4_TRUE@BDB_LIBFILES = @BDB_DIR_LIB@/@BDB_LIB@ @WITH_CXX_BINDINGS_FALSE@cxx_lib = @@ -14,7 +14,7 @@ $OpenBSD: patch-src_libicalss_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Ex INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ -@@ -423,9 +423,9 @@ icalssyacc.h: icalssyacc.c +@@ -422,9 +422,9 @@ icalssyacc.h: icalssyacc.c rm -f icalssyacc.c; \ $(MAKE) icalssyacc.c; \ else :; fi diff --git a/mail/zarafa/libical/patches/patch-src_libicalvcal_Makefile_in b/mail/zarafa/libical/patches/patch-src_libicalvcal_Makefile_in index 4cba29b69b4..8c148291e6d 100644 --- a/mail/zarafa/libical/patches/patch-src_libicalvcal_Makefile_in +++ b/mail/zarafa/libical/patches/patch-src_libicalvcal_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_libicalvcal_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ ---- src/libicalvcal/Makefile.in.orig Tue Nov 25 17:28:18 2008 -+++ src/libicalvcal/Makefile.in Thu Jul 23 14:53:37 2009 -@@ -60,7 +60,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ +$OpenBSD: patch-src_libicalvcal_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $ +--- src/libicalvcal/Makefile.in.orig Sun Sep 27 04:40:10 2009 ++++ src/libicalvcal/Makefile.in Wed Nov 18 11:21:59 2009 +@@ -58,7 +58,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libicalvcalincludedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) @@ -10,25 +10,25 @@ $OpenBSD: patch-src_libicalvcal_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot am__libicalvcal_la_SOURCES_DIST = icalvcal.h icalvcal.c port.h vcc.h \ vobject.h vobject.c vcaltmp.h vcaltmp.c vcc.c vcc.y @DEV_FALSE@am__objects_1 = vcc.lo -@@ -228,7 +228,7 @@ target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ +@@ -229,7 +229,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ + AM_YFLAGS = -l + AM_LFLAGS = -L -R -lib_LTLIBRARIES = libicalvcal.la +lib_LTLIBRARIES = libicalvcal-zarafa.la INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -@@ -238,7 +238,7 @@ INCLUDES = \ +@@ -239,7 +239,7 @@ INCLUDES = \ -I$(top_srcdir)/src/libicalss - libicalvcal_la_LDFLAGS = -version-info 42:0:42 + libicalvcal_la_LDFLAGS = -version-info 44:0:44 -libicalvcal_la_LIBADD = ../libical/.libs/libical.la +libicalvcal_la_LIBADD = ../libical/.libs/libical-zarafa.la @DEV_FALSE@libicalvcal_la_DEVSOURCES = vcc.c @DEV_TRUE@libicalvcal_la_DEVSOURCES = vcc.y libicalvcal_la_SOURCES = \ -@@ -325,7 +325,7 @@ clean-libLTLIBRARIES: +@@ -326,7 +326,7 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done diff --git a/mail/zarafa/libical/patches/patch-src_test_Makefile_in b/mail/zarafa/libical/patches/patch-src_test_Makefile_in index 7a88bc025c7..649260aa470 100644 --- a/mail/zarafa/libical/patches/patch-src_test_Makefile_in +++ b/mail/zarafa/libical/patches/patch-src_test_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_test_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ ---- src/test/Makefile.in.orig Tue Nov 25 17:28:22 2008 -+++ src/test/Makefile.in Thu Jul 23 15:09:31 2009 -@@ -59,29 +59,29 @@ copycluster_SOURCES = copycluster.c +$OpenBSD: patch-src_test_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $ +--- src/test/Makefile.in.orig Sun Sep 27 04:40:10 2009 ++++ src/test/Makefile.in Wed Nov 18 11:20:48 2009 +@@ -57,29 +57,29 @@ copycluster_SOURCES = copycluster.c copycluster_OBJECTS = copycluster.$(OBJEXT) copycluster_LDADD = $(LDADD) @WITH_CXX_BINDINGS_TRUE@am__DEPENDENCIES_1 = \ @@ -44,7 +44,7 @@ $OpenBSD: patch-src_test_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ am__regression_SOURCES_DIST = regression.c regression.h \ regression-component.c regression-classify.c \ regression-utils.c regression-recur.c regression-storage.c \ -@@ -93,33 +93,33 @@ am_regression_OBJECTS = regression.$(OBJEXT) \ +@@ -91,33 +91,33 @@ am_regression_OBJECTS = regression.$(OBJEXT) \ regression-storage.$(OBJEXT) $(am__objects_1) regression_OBJECTS = $(am_regression_OBJECTS) regression_LDADD = $(LDADD) @@ -93,7 +93,7 @@ $OpenBSD: patch-src_test_Makefile_in,v 1.2 2009/07/31 09:55:01 ajacoutot Exp $ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -292,13 +292,13 @@ regression_SOURCES = regression.c regression.h regress +@@ -291,13 +291,13 @@ regression_SOURCES = regression.c regression.h regress @WITH_CXX_BINDINGS_FALSE@cxx_inc = @WITH_CXX_BINDINGS_TRUE@cxx_inc = -DWITH_CXX_BINDINGS @WITH_CXX_BINDINGS_FALSE@cxx_libs =