From 604deb5dfc6f3c790a79a99390a382da893b5cf6 Mon Sep 17 00:00:00 2001 From: recht Date: Sun, 7 May 2006 18:22:41 +0000 Subject: Update to gmime 2.1.19 and drop maintainership. Based upon the 2.1.17 update by Fredrik Carlsson in PR 32487 Changes: The usual: fixes, new features. --- mail/gmime/Makefile | 8 ++++---- mail/gmime/PLIST | 5 +---- mail/gmime/buildlink3.mk | 5 ++--- mail/gmime/distinfo | 12 ++++++------ mail/gmime/patches/patch-aa | 14 +++++++------- mail/gmime/patches/patch-ab | 28 +++++++++++----------------- 6 files changed, 31 insertions(+), 41 deletions(-) (limited to 'mail') diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index a8f6654974c..03de5a4114f 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/05/07 18:22:41 recht Exp $ # -DISTNAME= gmime-2.1.9 -PKGREVISION= 1 +DISTNAME= gmime-2.1.19 CATEGORIES= mail MASTER_SITES= http://spruce.sourceforge.net/gmime/sources/v2.1/ -MAINTAINER= recht@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://spruce.sourceforge.net/gmime/ COMMENT= Library for the creation and parsing of MIME messages @@ -15,6 +14,7 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-gtk-doc=no +CONFIGURE_ARGS+= --disable-mono CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE+= gmime-2.0.pc.in diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST index c3ef14b1eea..483a748b396 100644 --- a/mail/gmime/PLIST +++ b/mail/gmime/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2004/11/14 16:48:55 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/05/07 18:22:41 recht Exp $ bin/gmime-config bin/uudecode bin/uuencode @@ -23,7 +23,6 @@ include/gmime-2.0/gmime/gmime-filter-yenc.h include/gmime-2.0/gmime/gmime-filter.h include/gmime-2.0/gmime/gmime-gpg-context.h include/gmime-2.0/gmime/gmime-header.h -include/gmime-2.0/gmime/gmime-host-utils.h include/gmime-2.0/gmime/gmime-iconv-utils.h include/gmime-2.0/gmime/gmime-iconv.h include/gmime-2.0/gmime/gmime-message-part.h @@ -47,7 +46,6 @@ include/gmime-2.0/gmime/gmime-stream-mem.h include/gmime-2.0/gmime/gmime-stream-mmap.h include/gmime-2.0/gmime/gmime-stream-null.h include/gmime-2.0/gmime/gmime-stream.h -include/gmime-2.0/gmime/gmime-type-utils.h include/gmime-2.0/gmime/gmime-utils.h include/gmime-2.0/gmime/gmime.h include/gmime-2.0/gmime/internet-address.h @@ -93,7 +91,6 @@ share/doc/gmime/gmime-gmime-filter-yenc.html share/doc/gmime/gmime-gmime-filter.html share/doc/gmime/gmime-gmime-gpg-context.html share/doc/gmime/gmime-gmime-header.html -share/doc/gmime/gmime-gmime-host-utils.html share/doc/gmime/gmime-gmime-iconv-utils.html share/doc/gmime/gmime-gmime-iconv.html share/doc/gmime/gmime-gmime-message-part.html diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk index cea0a437780..e7ae464b5f7 100644 --- a/mail/gmime/buildlink3.mk +++ b/mail/gmime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:23 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/05/07 18:22:41 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GMIME_BUILDLINK3_MK:= ${GMIME_BUILDLINK3_MK}+ @@ -12,10 +12,9 @@ BUILDLINK_PACKAGES+= gmime .if !empty(GMIME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.7 -BUILDLINK_ABI_DEPENDS.gmime+= gmime>=2.1.9nb1 BUILDLINK_PKGSRCDIR.gmime?= ../../mail/gmime .endif # GMIME_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo index 57b26ae1e8a..4a7db6cd5da 100644 --- a/mail/gmime/distinfo +++ b/mail/gmime/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/03/16 12:34:49 rillig Exp $ +$NetBSD: distinfo,v 1.7 2006/05/07 18:22:41 recht Exp $ -SHA1 (gmime-2.1.9.tar.gz) = a42bdea2a51f87dbc6697de52d946ed3f256b26c -RMD160 (gmime-2.1.9.tar.gz) = 430dae14274b17c4a44fe95c954d8e2f24198a2d -Size (gmime-2.1.9.tar.gz) = 784545 bytes -SHA1 (patch-aa) = e838216d593ff2003d436afb68477dc5701c34f4 -SHA1 (patch-ab) = 00ff7c6045f045db3e08f93827937cbadf717fc7 +SHA1 (gmime-2.1.19.tar.gz) = 7f39dbee03880a7b13fe77d849bdc27f1ca2d1ce +RMD160 (gmime-2.1.19.tar.gz) = d1a7d41661abb82df81b25ae73915a68fdc50bd7 +Size (gmime-2.1.19.tar.gz) = 925637 bytes +SHA1 (patch-aa) = f6c59f1ea0f3ab721fd254b08def3d7b4b0e5b42 +SHA1 (patch-ab) = 8ab57f5d6d9b7655c1554d5b62abd229f09689b4 diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa index 9fdfdb6385d..56e59d48739 100644 --- a/mail/gmime/patches/patch-aa +++ b/mail/gmime/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.2 2004/07/04 23:10:50 recht Exp $ +$NetBSD: patch-aa,v 1.3 2006/05/07 18:22:41 recht Exp $ ---- docs/reference/Makefile.in.orig 2004-06-07 00:35:30.000000000 +0200 -+++ docs/reference/Makefile.in 2004-07-05 00:57:12.000000000 +0200 -@@ -87,7 +87,7 @@ - GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ - GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - +--- docs/reference/Makefile.in.orig 2006-01-20 22:03:20.000000000 +0100 ++++ docs/reference/Makefile.in +@@ -115,7 +115,7 @@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ + GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ + HAVE_REGEX_FALSE = @HAVE_REGEX_FALSE@ + HAVE_REGEX_TRUE = @HAVE_REGEX_TRUE@ -HTML_DIR = $(datadir)/gtk-doc/html +HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/mail/gmime/patches/patch-ab b/mail/gmime/patches/patch-ab index 0d7dc3d40e9..ac146a24ad6 100644 --- a/mail/gmime/patches/patch-ab +++ b/mail/gmime/patches/patch-ab @@ -1,19 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2005/03/16 12:34:49 rillig Exp $ +$NetBSD: patch-ab,v 1.2 2006/05/07 18:22:41 recht Exp $ -Needed for NetBSD-1.6.2 and NetBSD-2.0. ECANCELED is used when the user -cancels the password query, so EAUTH seemed to be the most appropriate -to me. - ---- gmime/gmime-gpg-context.c.orig Tue Jul 6 15:09:18 2004 -+++ gmime/gmime-gpg-context.c Wed Mar 16 01:33:23 2005 -@@ -56,6 +56,10 @@ - - #define _(x) x +--- gmime/gmime-gpg-context.c.orig 2005-05-03 19:34:17.000000000 +0200 ++++ gmime/gmime-gpg-context.c +@@ -25,8 +25,6 @@ + #include + #endif -+#if !defined(ECANCELED) && defined(EAUTH) -+# define ECANCELED EAUTH -+#endif -+ - static void g_mime_gpg_context_class_init (GMimeGpgContextClass *klass); - static void g_mime_gpg_context_init (GMimeGpgContext *ctx, GMimeGpgContextClass *klass); - static void g_mime_gpg_context_finalize (GObject *object); +-#define _POSIX_SOURCE +- + #include + #include + #include -- cgit v1.2.3