Update to eet-1.5.0. Includes various performance and memory foot print

improvements.

5 files changed, 50 insertions, 35 deletions

diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index ba0e65673aa..f00baeabb0f 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:26 dsainty Exp $
+# $NetBSD: Makefile,v 1.20 2011/12/05 17:20:14 joerg Exp $
 #
 
-DISTNAME=	eet-1.2.3
-PKGREVISION=	2
+DISTNAME=	eet-1.5.0
 CATEGORIES=	devel archivers
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	yazzy@yazzy.org
+MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.enlightenment.org/
 COMMENT=	Library for speedy storage, retrieval, and compression
 
+LICENSE=	2-clause-bsd
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -20,6 +21,12 @@ USE_LIBTOOL=	YES
 
 PKGCONFIG_OVERRIDE=	eet.pc.in
 
+INSTALLATION_DIRS=	share/doc/eet
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/AUTHORS \
+	    ${DESTDIR}${PREFIX}/share/doc/eet
+
 .include "../../devel/eina/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/devel/eet/PLIST b/devel/eet/PLIST
index 2eff4f943c6..fe676ed3047 100644
--- a/devel/eet/PLIST
+++ b/devel/eet/PLIST
@@ -1,5 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2008/06/22 01:21:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/12/05 17:20:14 joerg Exp $
 bin/eet
-include/Eet.h
+include/eet-1/Eet.h
 lib/libeet.la
 lib/pkgconfig/eet.pc
+share/doc/eet/AUTHORS
+share/doc/eet/COPYING
+share/eet/examples/eet-basic.c
+share/eet/examples/eet-data-cipher_decipher.c
+share/eet/examples/eet-data-file_descriptor_01.c
+share/eet/examples/eet-data-file_descriptor_02.c
+share/eet/examples/eet-data-nested.c
+share/eet/examples/eet-data-simple.c
+share/eet/examples/eet-file.c
diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk
index f9e71123b0c..68e5ec215c1 100644
--- a/devel/eet/buildlink3.mk
+++ b/devel/eet/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:26 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2011/12/05 17:20:14 joerg Exp $
 
 BUILDLINK_TREE+=	eet
 
 .if !defined(EET_BUILDLINK3_MK)
 EET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.eet+=	eet>=1.0.1
-BUILDLINK_ABI_DEPENDS.eet?=	eet>=1.2.3nb2
+BUILDLINK_API_DEPENDS.eet+=	eet>=1.5.0
 BUILDLINK_PKGSRCDIR.eet?=	../../devel/eet
 
 .include "../../devel/eina/buildlink3.mk"
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index 2a8f8e6b65b..5bfab5b3f44 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/12/16 21:28:26 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/12/05 17:20:14 joerg Exp $
 
-SHA1 (eet-1.2.3.tar.bz2) = 10d49e3fc07c17fa5b52bd87d0ab42edc88c6286
-RMD160 (eet-1.2.3.tar.bz2) = b33dd25268748fa1f05f76142839962f5b4fbc73
-Size (eet-1.2.3.tar.bz2) = 3653700 bytes
-SHA1 (patch-aa) = eef0835cab54ce6ca751b6131457cf8365deda39
+SHA1 (eet-1.5.0.tar.bz2) = 7c4156ab5459f58ca1db6b87f3640b7243ca238b
+RMD160 (eet-1.5.0.tar.bz2) = 85febf450bacea32a280abd9937b321fbd223108
+Size (eet-1.5.0.tar.bz2) = 518901 bytes
+SHA1 (patch-aa) = a77c8cbe3ae143d89c654893fe9ff058991a0168
diff --git a/devel/eet/patches/patch-aa b/devel/eet/patches/patch-aa
index 9b13bf69ab4..f626a47cd68 100644
--- a/devel/eet/patches/patch-aa
+++ b/devel/eet/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2009/06/10 06:40:11 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2011/12/05 17:20:14 joerg Exp $
 
---- src/lib/eet_cipher.c.orig	2009-04-18 09:24:20.000000000 -0700
+--- src/lib/eet_cipher.c.orig	2011-11-21 02:09:15.000000000 +0000
 +++ src/lib/eet_cipher.c
-@@ -315,8 +315,18 @@ eet_identity_print(Eet_Key *key, FILE *o
-   dh = EVP_PKEY_get1_DH(key->private_key);
-   if (dh)
-     {
-+      BIO *b;
-       fprintf(out, "Private key (DH):\n");
--      DHparams_print_fp(out, dh);
-+      if ((b=BIO_new(BIO_s_file())) == NULL)
-+	{
-+	  DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-+	}
-+      else
-+	{
-+	  BIO_set_fp(b, out, BIO_NOCLOSE);
-+	  DHparams_print(b, dh);
-+	  BIO_free(b);
-+	}
-     }
+@@ -407,8 +407,19 @@ on_error:
+    dh = EVP_PKEY_get1_DH(key->private_key);
+    if (dh)
+      {
++        BIO *b;
+         fprintf(out, "Private key (DH):\n");
+         DHparams_print_fp(out, dh);
++        if ((b=BIO_new(BIO_s_file())) == NULL)
++          {
++            DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
++          }
++        else
++          {
++            BIO_set_fp(b, out, BIO_NOCLOSE);
++            DHparams_print(b, dh);
++            BIO_free(b);
++          }
+      }
  
-   fprintf(out, "Public certificate:\n");
+    fprintf(out, "Public certificate:\n");