summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/gmime/Makefile6
-rw-r--r--mail/gmime/PLIST4
-rw-r--r--mail/gmime/distinfo3
-rw-r--r--mail/gmime/patches/patch-ab22
4 files changed, 27 insertions, 8 deletions
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index ec7c4c37218..33409131f92 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/09/08 11:53:04 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2010/09/08 12:07:18 drochner Exp $
#
DISTNAME= gmime-2.2.25
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gmime/2.2/}
@@ -13,8 +13,6 @@ LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
-CONFLICTS= gmime24-[0-9]*
-
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 99997c6c2e6..4dc91dd64cb 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 2010/09/08 11:53:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/09/08 12:07:18 drochner Exp $
bin/gmime-config
-bin/uudecode
-bin/uuencode
include/gmime-2.0/gmime/gmime-charset.h
include/gmime-2.0/gmime/gmime-cipher-context.h
include/gmime-2.0/gmime/gmime-content-type.h
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 2b44cc9479d..1a66e4319f6 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2010/09/08 11:53:04 drochner Exp $
+$NetBSD: distinfo,v 1.23 2010/09/08 12:07:18 drochner Exp $
SHA1 (gmime-2.2.25.tar.gz) = 4087d72ca61af2fd8823cb47de7d6fdfbd3c7168
RMD160 (gmime-2.2.25.tar.gz) = 29f111fc428d55263d53e795e2bcc7cdfd62ca2e
Size (gmime-2.2.25.tar.gz) = 1038414 bytes
SHA1 (patch-aa) = ac810bb85a8cfebf2588862a2f8f220bbaa26277
+SHA1 (patch-ab) = 2da0ca82f2edae35db5d40fdf7705768df7530d3
diff --git a/mail/gmime/patches/patch-ab b/mail/gmime/patches/patch-ab
new file mode 100644
index 00000000000..5155b8ab1b6
--- /dev/null
+++ b/mail/gmime/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.6 2010/09/08 12:07:18 drochner Exp $
+
+--- Makefile.in.orig 2010-01-30 17:58:38.000000000 +0000
++++ Makefile.in
+@@ -257,7 +257,7 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-localedir = @localedir@
++localedir = /usr/pkg/share/locale
+ localstatedir = @localstatedir@
+ lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+@@ -275,7 +275,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = util gmime src $(am__append_1) tests docs $(am__append_2) .
++SUBDIRS = util gmime $(am__append_1) tests docs $(am__append_2) .
+ bin_SCRIPTS = gmime-config
+ CLEANFILES = gmimeConf.sh
+ DISTCLEANFILES = iconv-detect.h