Import of pkgsrc-2013Q2

mail/evolution/DESCR

@@ -0,0 +1,9 @@
+  Ximian Evolution(TM) is the premier personal and workgroup information
+management solution for Linux and UNIX. The software seamlessly
+integrates email, calendaring, meeting scheduling, contact management
+and online task lists in one powerful, fast, and easy to use
+application.
+
+  Please note that Evolution uses a huge number of resources.  Make
+sure you increase user and kernel limits for open files and processes
+if you run into trouble!

mail/evolution/Makefile

@@ -0,0 +1,93 @@
+# $NetBSD: Makefile,v 1.197 2013/06/06 12:53:59 wiz Exp $
+
+DISTNAME=		evolution-2.32.3
+PKGREVISION=		22
+CATEGORIES=		mail time gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.32/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		rh@NetBSD.org
+HOMEPAGE=		http://www.gnome.org/projects/evolution/
+COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
+#LICENSE=		modified-bsd AND gnu-lgpl-v2.1 AND gnu-lgpl-v3 AND perhaps more
+
+.include "options.mk"
+
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		bison gmake intltool msgfmt pkg-config
+USE_LIBTOOL=		YES
+USE_PKGLOCALEDIR=	YES
+
+REPLACE_PERL+=		addressbook/tools/csv2vcard
+REPLACE_PERL+=		addressbook/tools/evolution-addressbook-clean
+REPLACE_PERL+=		addressbook/tools/evolution-addressbook-clean.in
+
+CONFIGURE_ARGS+=	--with-openldap
+CONFIGURE_ARGS+=	--without-static-ldap
+CONFIGURE_ARGS+=	--enable-pilot-conduits=no
+.if defined(PKGREVISION)
+CONFIGURE_ARGS+=	--with-sub-version=nb${PKGREVISION}
+.endif
+CONFIGURE_ARGS+=	--disable-nm
+CONFIGURE_ARGS+=	--disable-audio-inline
+CONFIGURE_ARGS+=	--disable-image-inline
+CONFIGURE_ARGS+=	--disable-pst-import
+
+PKGCONFIG_OVERRIDE=	evolution-calendar.pc.in
+PKGCONFIG_OVERRIDE+=	evolution-mail.pc.in
+PKGCONFIG_OVERRIDE+=	evolution-plugin.pc.in
+PKGCONFIG_OVERRIDE+=	evolution-shell.pc.in
+
+GCONF_SCHEMAS+= apps-evolution-attachment-reminder.schemas
+GCONF_SCHEMAS+= apps-evolution-mail-notification.schemas
+GCONF_SCHEMAS+= apps-evolution-mail-prompts-checkdefault.schemas
+GCONF_SCHEMAS+=	apps_evolution_addressbook.schemas
+GCONF_SCHEMAS+=	apps_evolution_calendar.schemas
+GCONF_SCHEMAS+=	apps_evolution_shell.schemas
+GCONF_SCHEMAS+= bogo-junk-plugin.schemas
+GCONF_SCHEMAS+=	evolution-mail.schemas
+
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M4.*)
+BUILDLINK_TRANSFORM+=	rm:-Wl,--no-undefined
+.endif
+
+.if !exists(/usr/include/semaphore.h)
+LDFLAGS+=	-lsemaphore
+.include "../../devel/pthread-sem/buildlink3.mk"
+.endif
+.include "../../databases/openldap-client/buildlink3.mk"
+.include "../../databases/shared-mime-info/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.30.2.1
+.include "../../devel/libgweather/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=2.24.3
+.include "../../mail/evolution-data-server/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.include "../../www/gtkhtml314/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

mail/evolution/buildlink3.mk

@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.57 2013/06/06 12:53:59 wiz Exp $
+
+BUILDLINK_TREE+=	evolution
+
+.if !defined(EVOLUTION_BUILDLINK3_MK)
+EVOLUTION_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.8.0
+BUILDLINK_ABI_DEPENDS.evolution+=	evolution>=2.32.3nb22
+BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
+
+.include "../../devel/nspr/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
+.include "../../www/gtkhtml314/buildlink3.mk"
+.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.endif # EVOLUTION_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evolution

mail/evolution/distinfo

@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.82 2012/09/21 11:49:20 obache Exp $
+
+SHA1 (evolution-2.32.3.tar.bz2) = cc2a2126ef4192193dce50c43c5bb6fc0a57fcde
+RMD160 (evolution-2.32.3.tar.bz2) = 1b64d00a38cf8ad5c273cc4f4aee73124fe818af
+Size (evolution-2.32.3.tar.bz2) = 31966138 bytes
+SHA1 (patch-aa) = 6656278d2a54fdc585b4f0708da657ed0afbeec2
+SHA1 (patch-ab) = 792e5f7fdb0dc84fdbe0ef1ade21ce4a391e9328
+SHA1 (patch-ac) = 853fe9f4a28fa1fe1266607b93e4ef9f63969b42
+SHA1 (patch-ad) = 7efe568191ab181ea2b42ddac33db277b69b7d1e
+SHA1 (patch-plugins_caldav_caldav-browse-server.c) = c35c4acb0c3d28337d7aa811e81a4ce85ecec7b0
+SHA1 (patch-ya) = 73872309c1d69d6d10bf04d867cc04ce17e724d3
+SHA1 (patch-yb) = 6d09dceb5405b29cde657eea6fa0fbd004a8bd1f
+SHA1 (patch-yc) = 1312f89cd935dab9fd3bfae860a055d9d2fef794
+SHA1 (patch-yd) = 09bb3fcd4223add3880253fb43cfd036b8294d1c
+SHA1 (patch-ye) = 57fd2cb481a8b465b94a2155d82633f0f4b3fa06

mail/evolution/options.mk

@@ -0,0 +1,49 @@
+# $NetBSD: options.mk,v 1.4 2010/07/28 07:44:50 dsainty Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution
+PKG_SUPPORTED_OPTIONS=	krb5 ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mssl) && !empty(PKG_OPTIONS:Mkrb5)
+# If Kerberos is enabled, the libcrypto library is linked in, which causes
+# function name conflicts with libsoftokn3 provided by Mozilla NSS.  These
+# cause runtime crashes, so don't allow these options to be specified
+# together.
+PKG_FAIL_REASON+=	"Kerberos support conflicts with SSL"
+.endif
+
+.if !empty(PKG_OPTIONS:Mkrb5)
+CPPFLAGS+=		-I/usr/include/gssapi
+CPPFLAGS+=		-I/usr/include/krb5
+CONFIGURE_ARGS+=	--with-krb5=/usr
+.  include "../../mk/krb5.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-krb5
+.endif
+
+PLIST_VARS+=		smime
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--enable-nss=yes
+PLIST.smime=		yes
+PRINT_PLIST_AWK+=	/smime/ { print "$${HAVE_SMIME}" $$0; next; }
+# XXX Workaround for the following problem: addressbook/util/libeabutil.la
+# is compiled as a static library only which uses the NSS stuff.  When other
+# parts of the program use this .la archive, they get the right -L flags
+# (from the dependency_libs variable) but not the rpaths.  buildlink3 should
+# add rpath flags to the dependency_libs, but there is an strange comment
+# in the wrapper saying that it shouldn't.
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss
+BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb3
+.  include "../../devel/nspr/buildlink3.mk"
+.  include "../../devel/nss/buildlink3.mk"
+
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.nss}/include/nss/nss
+
+post-wrapper:
+	cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nspr.pc mozilla-nspr.pc
+	cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nss.pc mozilla-nss.pc
+.else
+CONFIGURE_ARGS+=	--disable-nss
+.endif

mail/evolution/patches/patch-aa

@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.27 2010/10/12 22:21:08 joerg Exp $
+
+Don't depend on libtool internals.
+
+--- addressbook/gui/contact-editor/Makefile.am.orig	2010-10-12 20:23:17.000000000 +0000
++++ addressbook/gui/contact-editor/Makefile.am
+@@ -33,7 +33,7 @@ libecontacteditor_la_LIBADD =						\
+ 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+ 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
+ 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
+-	$(top_builddir)/widgets/menus/.libs/libmenus.la	\
++	$(top_builddir)/widgets/menus/libmenus.la			\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
+ 	$(GNOME_PLATFORM_LIBS)
+ 

mail/evolution/patches/patch-ab

@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.12 2011/03/05 13:49:57 wiz Exp $
+
+--- mail/e-mail-migrate.c.orig	2010-09-21 07:26:33.000000000 +0000
++++ mail/e-mail-migrate.c
+@@ -292,7 +292,7 @@ cp (const gchar *src, const gchar *dest,
+ 	ut.actime = st.st_atime;
+ 	ut.modtime = st.st_mtime;
+ 	utime (dest, &ut);
+-	chmod (dest, st.st_mode);
++	chmod (dest, st.st_mode | S_IWUSR);
+ 
+ 	return TRUE;
+ 

mail/evolution/patches/patch-ac

@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.22 2010/07/13 12:24:34 drochner Exp $
+
+--- data/Makefile.in.orig	2010-07-13 10:34:48.000000000 +0000
++++ data/Makefile.in
+@@ -425,7 +425,7 @@ SUBDIRS = icons
+ desktopdir = $(datadir)/applications
+ desktop_in_files = evolution.desktop.in evolution-settings.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/gnome/autostart
+ autostart_in_files = evolution-alarm-notify.desktop.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ mimedir = $(datadir)/mime-info

mail/evolution/patches/patch-ad

@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.12 2010/10/12 22:21:08 joerg Exp $
+
+--- addressbook/gui/contact-editor/Makefile.in.orig	2010-10-12 20:23:47.000000000 +0000
++++ addressbook/gui/contact-editor/Makefile.in
+@@ -87,7 +87,7 @@ libecontacteditor_la_DEPENDENCIES =  \
+ 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
+ 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
+ 	$(top_builddir)/addressbook/printing/libecontactprint.la \
+-	$(top_builddir)/widgets/menus/.libs/libmenus.la \
++	$(top_builddir)/widgets/menus/libmenus.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libecontacteditor_la_OBJECTS = libecontacteditor_la-eab-editor.lo \
+ 	libecontacteditor_la-e-contact-editor-fullname.lo \
+@@ -451,7 +451,7 @@ libecontacteditor_la_LIBADD = \
+ 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+ 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
+ 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
+-	$(top_builddir)/widgets/menus/.libs/libmenus.la	\
++	$(top_builddir)/widgets/menus/libmenus.la			\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
+ 	$(GNOME_PLATFORM_LIBS)
+ 

mail/evolution/patches/patch-plugins_caldav_caldav-browse-server.c

@@ -0,0 +1,21 @@
+$NetBSD: patch-plugins_caldav_caldav-browse-server.c,v 1.1 2012/09/21 11:49:20 obache Exp $
+
+* support both old and new-buf libxml2 APIs
+
+--- plugins/caldav/caldav-browse-server.c.orig	2011-03-29 18:38:48.000000000 +0000
++++ plugins/caldav/caldav-browse-server.c
+@@ -979,7 +979,13 @@ send_xml_message (xmlDocPtr doc, gboolea
+ 
+ 	soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
+ 	soup_message_headers_append (message->request_headers, "Depth", depth_1 ? "1" : "0");
+-	soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, (const gchar *) buf->buffer->content, buf->buffer->use);
++	soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY,
++#ifdef LIBXML2_NEW_BUFFER
++			(const gchar *) xmlOutputBufferGetContent(buf),
++			xmlOutputBufferGetSize(buf));
++#else
++			(const gchar *) buf->buffer->content, buf->buffer->use);
++#endif
+ 
+ 	/* Clean up the memory */
+ 	xmlOutputBufferClose (buf);

mail/evolution/patches/patch-ya

@@ -0,0 +1,15 @@
+$NetBSD: patch-ya,v 1.3 2010/07/13 12:24:34 drochner Exp $
+
+--- calendar/gui/e-cal-model.h.orig	2010-04-26 13:13:16.000000000 +0000
++++ calendar/gui/e-cal-model.h
+@@ -152,8 +152,8 @@ struct _ECalModelClass {
+ 
+ 	/* Signals */
+ 	void		(*time_range_changed)	(ECalModel *model,
+-						 time_t start,
+-						 time_t end);
++						 gint64 start,
++						 gint64 end);
+ 	void		(*row_appended)		(ECalModel *model);
+ 	void		(*comps_deleted)	(ECalModel *model,
+ 						 gpointer list);

mail/evolution/patches/patch-yb

@@ -0,0 +1,25 @@
+$NetBSD: patch-yb,v 1.2 2009/10/24 12:57:56 drochner Exp $
+
+--- calendar/gui/e-cal-model.c.orig	2009-10-18 02:54:18.000000000 +0200
++++ calendar/gui/e-cal-model.c
+@@ -163,8 +163,8 @@ e_cal_model_class_init (ECalModelClass *
+ 			      G_SIGNAL_RUN_LAST,
+ 			      G_STRUCT_OFFSET (ECalModelClass, time_range_changed),
+ 			      NULL, NULL,
+-			      e_marshal_VOID__LONG_LONG,
+-			      G_TYPE_NONE, 2, G_TYPE_LONG, G_TYPE_LONG);
++			      e_marshal_VOID__INT64_INT64,
++			      G_TYPE_NONE, 2, G_TYPE_INT64, G_TYPE_INT64);
+ 
+ 	signals[ROW_APPENDED] =
+ 		g_signal_new ("row_appended",
+@@ -2185,7 +2185,8 @@ e_cal_model_set_time_range (ECalModel *m
+ 	priv->start = start;
+ 	priv->end = end;
+ 
+-	g_signal_emit (G_OBJECT (model), signals[TIME_RANGE_CHANGED], 0, start, end);
++	g_signal_emit (G_OBJECT (model), signals[TIME_RANGE_CHANGED], 0,
++		       (gint64)start, (gint64)end);
+ 	redo_queries (model);
+ }
+ 

mail/evolution/patches/patch-yc

@@ -0,0 +1,13 @@
+$NetBSD: patch-yc,v 1.4 2010/11/26 11:29:00 drochner Exp $
+
+--- e-util/e-marshal.list.orig	2010-09-21 07:26:29.000000000 +0000
++++ e-util/e-marshal.list
+@@ -34,7 +34,7 @@ NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,U
+ NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
+ NONE:INT,POINTER,INT,OBJECT,UINT
+ NONE:INT,STRING,INT
+-NONE:LONG,LONG
++NONE:INT64,INT64
+ NONE:OBJECT,BOOLEAN
+ NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+ NONE:OBJECT,OBJECT

mail/evolution/patches/patch-yd

@@ -0,0 +1,18 @@
+$NetBSD: patch-yd,v 1.2 2009/10/24 12:57:56 drochner Exp $
+
+--- calendar/gui/e-day-view.c.orig	2009-10-18 01:08:48.000000000 +0200
++++ calendar/gui/e-day-view.c
+@@ -469,11 +469,11 @@ e_day_view_class_init (EDayViewClass *cl
+ }
+ 
+ static void
+-time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data)
++time_range_changed_cb (ECalModel *model, gint64 st64, gint64 et64, gpointer user_data)
+ {
+ 	EDayView *day_view = E_DAY_VIEW (user_data);
+ 	EDayViewTimeItem *eti;
+-	time_t lower;
++	time_t start_time = st64, end_time = et64, lower;
+ 
+ 	g_return_if_fail (E_IS_DAY_VIEW (day_view));
+ 

mail/evolution/patches/patch-ye

@@ -0,0 +1,21 @@
+$NetBSD: patch-ye,v 1.2 2010/07/13 12:24:34 drochner Exp $
+
+--- calendar/gui/e-week-view.c.orig	2010-04-26 13:13:16.000000000 +0000
++++ calendar/gui/e-week-view.c
+@@ -357,13 +357,14 @@ week_view_model_rows_inserted_cb (EWeekV
+ 
+ static void
+ week_view_time_range_changed_cb (EWeekView *week_view,
+-                                 time_t start_time,
+-                                 time_t end_time,
++                                 gint64 st64,
++                                 gint64 et64,
+                                  ECalModel *model)
+ {
+ 	GDate date, base_date;
+ 	gint day_offset, weekday, week_start_offset;
+ 	gboolean update_adjustment_value = FALSE;
++	time_t start_time = st64, end_time = et64;
+ 
+ 	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
+