Updating enlightenment libraries to 1.7.7, add missing enlightenment 0.17.3

libraries and enlightenment 0.17.3 itself. Upstream changes of Eina (to get an impression): Eina 1.7.7 Changes since Eina 1.7.6: ------------------------- No changes, just updating to keep in sync with last release. Changes since Eina 1.7.5: ------------------------- Improvements: * Honor tile size in Eina_Tiler. Fixes: * Prevent denial of service on Eina_Hash function. * Fix map leak in Eina_File infrastructure. * Fix portability issue on 64bits system for Eina_CList. * Fix magic failure in eina_value_array_count when array has not been allocated Changes since Eina 1.7.4: ------------------------- No changes, just updating to keep in sync with last release. Changes since Eina 1.7.3: ------------------------- Fixes: * Fix EINA_INLIST_FOREACH_SAFE macro * Add XML output to doc * Add installation rule for doc * Fix build for Windows platforms. Changes since Eina 1.7.2: ------------------------- * Fix Solaris build. * Don't leak fd after exec. Changes since Eina 1.7.1: ------------------------- No changes, just updating to keep in sync with last release.
author: sno <sno@pkgsrc.org> 2013-06-16 18:56:04 +0000
committer: sno <sno@pkgsrc.org> 2013-06-16 18:56:04 +0000
commit: 1af104312c9949d43ad5c9ee3ab29359b6c675b3 (patch)
tree: 623927a32c2936544542f5724e9ca67d4888379f
parent: 8652ff692b6b942d70127d395a33c13a16867f2f (diff)
download: pkgsrc-1af104312c9949d43ad5c9ee3ab29359b6c675b3.tar.gz
92 files changed, 8695 insertions, 178 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 9fed6a52411..b48267a5b50 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1751 2013/06/12 14:49:09 wiz Exp $
+# $NetBSD: Makefile,v 1.1752 2013/06/16 18:56:04 sno Exp $
 #
 
 COMMENT=	Development utilities
@@ -183,6 +183,7 @@ SUBDIR+=	ecore
 SUBDIR+=	edcommon
 SUBDIR+=	eet
 SUBDIR+=	eina
+SUBDIR+=	eio
 SUBDIR+=	electric-fence
 SUBDIR+=	elf
 SUBDIR+=	elfsh
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index b894ea00f20..4ec5d37ef11 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/06/04 22:15:51 tron Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/16 18:56:04 sno Exp $
 #
 
-DISTNAME=	ecore-1.1.0
-PKGREVISION=	6
+DISTNAME=	ecore-1.7.7
 CATEGORIES=	devel
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/ecore/PLIST b/devel/ecore/PLIST
index ff81a9db6fa..a7d13247a3d 100644
--- a/devel/ecore/PLIST
+++ b/devel/ecore/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/05 17:22:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/16 18:56:04 sno Exp $
 include/ecore-1/Ecore.h
 include/ecore-1/Ecore_Con.h
 include/ecore-1/Ecore_Evas.h
@@ -38,9 +38,10 @@ share/doc/ecore/COPYING
 share/locale/cs/LC_MESSAGES/ecore.mo
 share/locale/de/LC_MESSAGES/ecore.mo
 share/locale/el/LC_MESSAGES/ecore.mo
+share/locale/eo/LC_MESSAGES/ecore.mo
 share/locale/fr/LC_MESSAGES/ecore.mo
 share/locale/it/LC_MESSAGES/ecore.mo
 share/locale/nl/LC_MESSAGES/ecore.mo
 share/locale/pt/LC_MESSAGES/ecore.mo
 share/locale/sl/LC_MESSAGES/ecore.mo
-@pkgdir share/ecore/examples
+share/locale/zh_CN/LC_MESSAGES/ecore.mo
diff --git a/devel/ecore/buildlink3.mk b/devel/ecore/buildlink3.mk
index b9eaaaa5e96..a8e495b4ab4 100644
--- a/devel/ecore/buildlink3.mk
+++ b/devel/ecore/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:15:51 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2013/06/16 18:56:04 sno Exp $
 
 BUILDLINK_TREE+=	ecore
 
 .if !defined(ECORE_BUILDLINK3_MK)
 ECORE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ecore+=	ecore>=1.1.0
-BUILDLINK_ABI_DEPENDS.ecore?=	ecore>=1.1.0nb6
+BUILDLINK_API_DEPENDS.ecore+=	ecore>=1.7.7
+BUILDLINK_ABI_DEPENDS.ecore?=	ecore>=1.7.7
 BUILDLINK_PKGSRCDIR.ecore?=	../../devel/ecore
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/ecore/distinfo b/devel/ecore/distinfo
index 55b6fb1990a..1b8bb967965 100644
--- a/devel/ecore/distinfo
+++ b/devel/ecore/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/05/21 06:21:40 marino Exp $
+$NetBSD: distinfo,v 1.3 2013/06/16 18:56:04 sno Exp $
 
-SHA1 (ecore-1.1.0.tar.bz2) = 94c9c871d07cbd633fa431605c8053551b103007
-RMD160 (ecore-1.1.0.tar.bz2) = 901c470198149edfa87519eaaeaf4a602c8f0ce7
-Size (ecore-1.1.0.tar.bz2) = 3217298 bytes
-SHA1 (patch-src_lib_ecore_Ecore.h) = 7e984cd209d05447b9d2017883ae6f68b36cd5f3
-SHA1 (patch-src_lib_ecore_ecore_exe.c) = 746029cc35ef6a5180a9723d6b0ca48c40b98a34
+SHA1 (ecore-1.7.7.tar.bz2) = a5baeedf9dcec78b4bf0023d2d6da3fe61ab859b
+RMD160 (ecore-1.7.7.tar.bz2) = 287c09b9a8bf680edfe1f8f71057ae42d4d6bb5a
+Size (ecore-1.7.7.tar.bz2) = 3460946 bytes
+SHA1 (patch-src_lib_ecore_Ecore.h) = 26b030d863d601db8287c02d1ec2dd193f73929c
diff --git a/devel/ecore/patches/patch-src_lib_ecore_Ecore.h b/devel/ecore/patches/patch-src_lib_ecore_Ecore.h
index b3560bd8f20..f4c8bfc8853 100644
--- a/devel/ecore/patches/patch-src_lib_ecore_Ecore.h
+++ b/devel/ecore/patches/patch-src_lib_ecore_Ecore.h
@@ -1,14 +1,15 @@
-$NetBSD: patch-src_lib_ecore_Ecore.h,v 1.1 2012/05/21 06:21:41 marino Exp $
+$NetBSD: patch-src_lib_ecore_Ecore.h,v 1.2 2013/06/16 18:56:04 sno Exp $
 
---- src/lib/ecore/Ecore.h.orig	2012-05-21 05:28:16.000000000 +0000
+DragonflyBSD needs that, too
+
+--- src/lib/ecore/Ecore.h.orig	2013-01-09 13:46:27.000000000 +0000
 +++ src/lib/ecore/Ecore.h
-@@ -295,7 +295,8 @@
+@@ -356,7 +356,7 @@ sudo make install
  
  #ifdef _WIN32
  # include <winsock2.h>
--#elif (defined (__FreeBSD__) && (__FreeBSD_version >= 420001)) || defined (__OpenBSD__)
-+#elif (defined (__FreeBSD__) && (__FreeBSD_version >= 420001)) \
-+    || defined (__OpenBSD__) || defined(__DragonFly__)
+-#elif defined (__FreeBSD__) || defined (__OpenBSD__)
++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
  # include <sys/select.h>
  # include <signal.h>
- #else
+ #elif defined (__ANDROID__)
diff --git a/devel/ecore/patches/patch-src_lib_ecore_ecore_exe.c b/devel/ecore/patches/patch-src_lib_ecore_ecore_exe.c
deleted file mode 100644
index 1709f726cd3..00000000000
--- a/devel/ecore/patches/patch-src_lib_ecore_ecore_exe.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_lib_ecore_ecore_exe.c,v 1.1 2012/05/21 06:21:41 marino Exp $
-
---- src/lib/ecore/ecore_exe.c.orig	2011-10-21 05:37:11.000000000 +0000
-+++ src/lib/ecore/ecore_exe.c
-@@ -2,7 +2,8 @@
- # include <config.h>
- #endif
- 
--#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
-+#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) \
-+ || defined (__DragonFly__)
- # include <sys/time.h>
- # include <sys/resource.h>
- #endif
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 43b53e2f29a..984b890b70f 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2013/02/06 23:20:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2013/06/16 18:56:04 sno Exp $
 #
 
-DISTNAME=	eet-1.5.0
-PKGREVISION=	3
+DISTNAME=	eet-1.7.7
 CATEGORIES=	devel archivers
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 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
diff --git a/devel/eet/PLIST b/devel/eet/PLIST
index fe676ed3047..7a352a970f5 100644
--- a/devel/eet/PLIST
+++ b/devel/eet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/12/05 17:20:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/16 18:56:04 sno Exp $
 bin/eet
 include/eet-1/Eet.h
 lib/libeet.la
diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk
index 5c7369fe53a..54e1f97b3fa 100644
--- a/devel/eet/buildlink3.mk
+++ b/devel/eet/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2013/02/06 23:20:51 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2013/06/16 18:56:04 sno Exp $
 
 BUILDLINK_TREE+=	eet
 
 .if !defined(EET_BUILDLINK3_MK)
 EET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.eet+=	eet>=1.5.0
-BUILDLINK_ABI_DEPENDS.eet?=	eet>=1.5.0nb3
+BUILDLINK_API_DEPENDS.eet+=	eet>=1.7.7
+BUILDLINK_ABI_DEPENDS.eet?=	eet>=1.7.7
 BUILDLINK_PKGSRCDIR.eet?=	../../devel/eet
 
 .include "../../devel/eina/buildlink3.mk"
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index 0bc3f923126..4439ab6e77e 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/12/07 15:15:53 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/06/16 18:56:04 sno Exp $
 
-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 (eet-1.7.7.tar.bz2) = 3f9001a118048e438f013f66a301dd92808c9784
+RMD160 (eet-1.7.7.tar.bz2) = 97397939b2a1706cc378354f1bd597abdc933f32
+Size (eet-1.7.7.tar.bz2) = 578874 bytes
 SHA1 (patch-aa) = 3915ca93e3310900850ff499d141460295d3046b
diff --git a/devel/eina/Makefile b/devel/eina/Makefile
index efc0aba4d79..a36f1f8e372 100644
--- a/devel/eina/Makefile
+++ b/devel/eina/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2012/12/18 13:54:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/16 18:56:04 sno Exp $
 #
 
-DISTNAME=	eina-1.7.1
+DISTNAME=	eina-1.7.7
 CATEGORIES=	devel
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Data types library
-
 LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
diff --git a/devel/eina/PLIST b/devel/eina/PLIST
index 54bceb40a7b..2d283901d6d 100644
--- a/devel/eina/PLIST
+++ b/devel/eina/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/12/12 11:39:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/06/16 18:56:04 sno Exp $
 include/eina-1/Eina.h
 include/eina-1/eina/eina_accessor.h
 include/eina-1/eina/eina_array.h
diff --git a/devel/eina/buildlink3.mk b/devel/eina/buildlink3.mk
index ede2766ebca..1f1e611ba88 100644
--- a/devel/eina/buildlink3.mk
+++ b/devel/eina/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2011/12/05 17:14:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2013/06/16 18:56:04 sno Exp $
 
 BUILDLINK_TREE+=	eina
 
 .if !defined(EINA_BUILDLINK3_MK)
 EINA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.eina+=	eina>=1.1.0
+BUILDLINK_API_DEPENDS.eina+=	eina>=1.7.7
 BUILDLINK_PKGSRCDIR.eina?=	../../devel/eina
 .endif	# EINA_BUILDLINK3_MK
 
diff --git a/devel/eina/distinfo b/devel/eina/distinfo
index 578d7feac68..e1547936ef2 100644
--- a/devel/eina/distinfo
+++ b/devel/eina/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2012/12/12 11:39:02 wiz Exp $
+$NetBSD: distinfo,v 1.10 2013/06/16 18:56:04 sno Exp $
 
-SHA1 (eina-1.7.1.tar.bz2) = 972b94a0abdbaa1e61ebbfd5ea530ebdceacee02
-RMD160 (eina-1.7.1.tar.bz2) = 9ceb645b20a67dedf2a23f58d664323d5f1ea35f
-Size (eina-1.7.1.tar.bz2) = 9749033 bytes
+SHA1 (eina-1.7.7.tar.bz2) = 57aca1d86aed53be39e30596f3dc1625e2c5f0f0
+RMD160 (eina-1.7.7.tar.bz2) = 080aa59620f91d5e6eaf9a430a893a35d8f89659
+Size (eina-1.7.7.tar.bz2) = 9792205 bytes
diff --git a/devel/eio/DESCR b/devel/eio/DESCR
new file mode 100644
index 00000000000..68aaa732ef8
--- /dev/null
+++ b/devel/eio/DESCR
@@ -0,0 +1,5 @@
+Ecore is the core event abstraction layer and X abstraction layer
+that makes doing selections, Xdnd, general X stuff, and event loops,
+timeouts and idle handlers fast, optimized, and convenient.
+It's a separate library so anyone can make use of the work put into Ecore
+to make this job easy for applications.
diff --git a/devel/eio/Makefile b/devel/eio/Makefile
new file mode 100644
index 00000000000..38fbc60c1cb
--- /dev/null
+++ b/devel/eio/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2013/06/16 18:56:06 sno Exp $
+#
+
+DISTNAME=	eio-1.7.7
+CATEGORIES=	devel
+MASTER_SITES=	http://download.enlightenment.org/releases/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://enlightenment.org/
+COMMENT=	Enlightenned Asynchronous Input Output library
+LICENSE=	gnu-lgpl-v2.1
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+INSTALLATION_DIRS=	share/doc/eio
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \
+	    ${DESTDIR}${PREFIX}/share/doc/eio
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/eina/buildlink3.mk"
+.include "../../devel/eet/buildlink3.mk"
+.include "../../devel/ecore/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/eio/PLIST b/devel/eio/PLIST
new file mode 100644
index 00000000000..14fb2cb8786
--- /dev/null
+++ b/devel/eio/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1 2013/06/16 18:56:06 sno Exp $
+include/eio-1/Eio.h
+include/eio-1/eio_inline_helper.x
+lib/libeio.la
+lib/pkgconfig/eio.pc
+share/doc/eio/AUTHORS
+share/doc/eio/COPYING
+@pkgdir share/eio/examples
diff --git a/devel/eio/PLIST.Linux b/devel/eio/PLIST.Linux
new file mode 100644
index 00000000000..d621b6ae371
--- /dev/null
+++ b/devel/eio/PLIST.Linux
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2013/06/16 18:56:06 sno Exp $
+include/ecore-1/Ecore_Fb.h
+lib/libecore_fb.la
+lib/pkgconfig/ecore-fb.pc
diff --git a/devel/eio/buildlink3.mk b/devel/eio/buildlink3.mk
new file mode 100644
index 00000000000..57cdb7cea8a
--- /dev/null
+++ b/devel/eio/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+BUILDLINK_TREE+=	eio
+
+.if !defined(EIO_BUILDLINK3_MK)
+EIO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.eio+=	eio>=1.7.7
+BUILDLINK_PKGSRCDIR.eio?=	../../devel/eio
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/eet/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.endif # EIO_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-eio
diff --git a/devel/eio/distinfo b/devel/eio/distinfo
new file mode 100644
index 00000000000..17727b6f452
--- /dev/null
+++ b/devel/eio/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+SHA1 (eio-1.7.7.tar.bz2) = 1acc84999731a430350ac48f31a5f00d1bbf6e92
+RMD160 (eio-1.7.7.tar.bz2) = e2f3e3972b5dada36ab1e00d84ec4e4b405490b9
+Size (eio-1.7.7.tar.bz2) = 359415 bytes
+SHA1 (patch-aa) = c372345e5ea0c1930b13ed6884ceeac619cdd63d
diff --git a/devel/eio/patches/patch-aa b/devel/eio/patches/patch-aa
new file mode 100644
index 00000000000..a80fd1f393d
--- /dev/null
+++ b/devel/eio/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+Shut up, pkglint
+
+--- src/lib/eio_file.c.orig	2012-04-03 14:49:00.000000000 +0000
++++ src/lib/eio_file.c
+@@ -606,6 +606,8 @@ eio_file_copy_do(Ecore_Thread *thread, E
+    Eina_File *f;
+ #ifdef HAVE_SPLICE
+    struct stat buf;
++#endif
++#if defined(HAVE_SPLICE) || defined(HAVE_XATTR)
+    int in = -1;
+ #endif
+    mode_t md;
diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013
index e920f7deafd..43322ac2360 100644
--- a/doc/CHANGES-2013
+++ b/doc/CHANGES-2013
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2013,v 1.2165 2013/06/16 18:28:27 tsutsui Exp $
+$NetBSD: CHANGES-2013,v 1.2166 2013/06/16 18:56:04 sno Exp $
 
 Changes to the packages collection and infrastructure in 2013:
 
@@ -3328,6 +3328,31 @@ Changes to the packages collection and infrastructure in 2013:
 	Updated misc/py-carddav to 0.5.0 [wiz 2013-06-16]
 	Updated devel/py-requests to 1.2.1nb1 [wiz 2013-06-16]
 	Updated multimedia/gst123 to 0.3.3 [ryoon 2013-06-16]
+	Added x11/elementary-icon-theme version 3.0 [sno 2013-06-16]
+	Added x11/elementary version 1.7.7 [sno 2013-06-16]
+	Added x11/enlightenment version 0.17.3 [sno 2013-06-16]
+	Added devel/eio version 1.7.7 [sno 2013-06-16]
+	Updated devel/ecore to 1.7.7 [sno 2013-06-16]
+	Updated devel/eet to 1.7.7 [sno 2013-06-16]
+	Updated devel/eina to 1.7.7 [sno 2013-06-16]
+	Updated graphics/edje to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-buffer to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-edb to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-eet to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-gif to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-jpeg to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-pmaps to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-png to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-sdl-16 to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-sdl to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-software-x11 to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-svg to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-tiff to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas-xpm to 1.7.7 [sno 2013-06-16]
+	Updated graphics/evas to 1.7.7 [sno 2013-06-16]
+	Updated lang/embryo to 1.7.7 [sno 2013-06-16]
+	Updated sysutils/edbus to 1.7.7 [sno 2013-06-16]
+	Updated sysutils/efreet to 1.7.7 [sno 2013-06-16]
 	Updated misc/iselect to 1.4.0 [ryoon 2013-06-16]
 	Updated audio/moc to 2.4.4 [ryoon 2013-06-16]
 	Updated databases/ruby-data_objects to 0.10.13 [taca 2013-06-16]
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 3c7b3f72156..3afed314c4c 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/16 18:56:04 sno Exp $
 #
 
-DISTNAME=	edje-1.1.0
-PKGREVISION=	5
+DISTNAME=	edje-1.7.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -42,6 +41,8 @@ post-install:
 .include "../../devel/ecore/buildlink3.mk"
 .include "../../devel/eet/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/evas-png/buildlink3.mk"
+.include "../../graphics/evas-buffer/buildlink3.mk"
 .include "../../lang/embryo/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 
diff --git a/graphics/edje/PLIST b/graphics/edje/PLIST
index 236d8f43a11..b90b404e80b 100644
--- a/graphics/edje/PLIST
+++ b/graphics/edje/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/05 17:35:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/16 18:56:04 sno Exp $
 bin/edje_cc
 bin/edje_decc
 bin/edje_external_inspector
@@ -14,13 +14,18 @@ share/doc/edje/AUTHORS
 share/doc/edje/COPYING
 share/edje/examples/Vera.ttf
 share/edje/examples/animations.edc
+share/edje/examples/animations2.c
+share/edje/examples/animations2.edc
 share/edje/examples/basic.edc
+share/edje/examples/basic2.edc
 share/edje/examples/box.edc
 share/edje/examples/bubble.png
 share/edje/examples/color-class.edc
 share/edje/examples/drag.edc
+share/edje/examples/duck.wav
 share/edje/examples/edje-animations.c
 share/edje/examples/edje-basic.c
+share/edje/examples/edje-basic2.c
 share/edje/examples/edje-box.c
 share/edje/examples/edje-box2.c
 share/edje/examples/edje-color-class.c
@@ -28,17 +33,34 @@ share/edje/examples/edje-drag.c
 share/edje/examples/edje-perspective.c
 share/edje/examples/edje-signals-messages.c
 share/edje/examples/edje-swallow.c
+share/edje/examples/edje-swallow2.c
 share/edje/examples/edje-table.c
 share/edje/examples/edje-text.c
+share/edje/examples/edje_example.c
+share/edje/examples/edje_example.edc
+share/edje/examples/embryo_custom_state.edc
+share/edje/examples/embryo_pong.edc
+share/edje/examples/embryo_run_program.edc
+share/edje/examples/embryo_set_state.edc
+share/edje/examples/embryo_set_text.edc
+share/edje/examples/embryo_timer.edc
+share/edje/examples/external_elm_anchorblock.edc
+share/edje/examples/external_elm_button.edc
+share/edje/examples/external_elm_check.edc
+share/edje/examples/external_elm_panes.edc
+share/edje/examples/external_emotion_elm.edc
 share/edje/examples/lua_script.edc
 share/edje/examples/perspective.edc
 share/edje/examples/red.png
 share/edje/examples/signals-messages.edc
+share/edje/examples/signals2.c
+share/edje/examples/signalsBubble.edc
 share/edje/examples/sigtest.c
 share/edje/examples/sigtest.edc
 share/edje/examples/swallow.edc
 share/edje/examples/table.edc
 share/edje/examples/test.png
 share/edje/examples/text.edc
+share/edje/examples/toggle_using_filter.edc
 share/edje/include/edje.inc
 share/mime/packages/edje.xml
diff --git a/graphics/edje/buildlink3.mk b/graphics/edje/buildlink3.mk
index 3f34b59b538..2676f8f4a21 100644
--- a/graphics/edje/buildlink3.mk
+++ b/graphics/edje/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2013/06/16 18:56:04 sno Exp $
 
 BUILDLINK_TREE+=	edje
 
 .if !defined(EDJE_BUILDLINK3_MK)
 EDJE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.edje+=	edje>=1.1.0
-BUILDLINK_ABI_DEPENDS.edje?=	edje>=1.1.0nb5
+BUILDLINK_API_DEPENDS.edje+=	edje>=1.7.7
+BUILDLINK_ABI_DEPENDS.edje?=	edje>=1.7.7
 BUILDLINK_PKGSRCDIR.edje?=	../../graphics/edje
 
 .include	"../../devel/ecore/buildlink3.mk"
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index 8b716539a29..a72fef7c914 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/12/05 17:35:03 joerg Exp $
+$NetBSD: distinfo,v 1.2 2013/06/16 18:56:04 sno Exp $
 
-SHA1 (edje-1.1.0.tar.bz2) = ca3c32d8f049a4e8dd250ad491901798c33b4ada
-RMD160 (edje-1.1.0.tar.bz2) = 7394bddc30fb2f4a7bc1e604a51916c63bd18427
-Size (edje-1.1.0.tar.bz2) = 933474 bytes
+SHA1 (edje-1.7.7.tar.bz2) = 18e5790c9904d3f279aabe43c1fae339dc93529f
+RMD160 (edje-1.7.7.tar.bz2) = 99d3334796d6e142bff26b45af1d9fe9ee07acea
+Size (edje-1.7.7.tar.bz2) = 1101698 bytes
diff --git a/graphics/evas-buffer/Makefile b/graphics/evas-buffer/Makefile
index 1c66699d8bf..588a39d2f6c 100644
--- a/graphics/evas-buffer/Makefile
+++ b/graphics/evas-buffer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/16 18:56:04 sno Exp $
 
 PKGNAME=	evas-buffer-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas buffer engine
 
 EVAS_ENGINES=	buffer
diff --git a/graphics/evas-buffer/buildlink3.mk b/graphics/evas-buffer/buildlink3.mk
index aecec873cca..23e06032d5c 100644
--- a/graphics/evas-buffer/buildlink3.mk
+++ b/graphics/evas-buffer/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.5 2011/12/05 17:33:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2013/06/16 18:56:04 sno Exp $
 
 BUILDLINK_TREE+=	evas-buffer
 
 .if !defined(EVAS_BUFFER_BUILDLINK3_MK)
 EVAS_BUFFER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.evas-buffer+=	evas-buffer>=1.1.0beta
+BUILDLINK_API_DEPENDS.evas-buffer+=	evas-buffer>=1.7.7
 BUILDLINK_PKGSRCDIR.evas-buffer?=	../../graphics/evas-buffer
 .endif # EVAS_BUFFER_BUILDLINK3_MK
 
diff --git a/graphics/evas-edb/Makefile b/graphics/evas-edb/Makefile
index e394a535a99..30c7bcbdbfa 100644
--- a/graphics/evas-edb/Makefile
+++ b/graphics/evas-edb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/16 18:56:04 sno Exp $
 
 PKGNAME=	evas-edb-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas Edb image loader
 
 EVAS_IMAGE_LOADERS=	edb
diff --git a/graphics/evas-edb/buildlink3.mk b/graphics/evas-edb/buildlink3.mk
new file mode 100644
index 00000000000..67bed8bfed7
--- /dev/null
+++ b/graphics/evas-edb/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:04 sno Exp $
+
+BUILDLINK_TREE+=	evas-edb
+
+.if !defined(EVAS_EDB_BUILDLINK3_MK)
+EVAS_EDB_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-edb+=	evas-edb>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-edb?=	../../graphics/evas-edb
+
+.include "../../databases/edb/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # EVAS_EDB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-edb
diff --git a/graphics/evas-eet/Makefile b/graphics/evas-eet/Makefile
index 7b3b8d9b7bc..2f8b70c91a9 100644
--- a/graphics/evas-eet/Makefile
+++ b/graphics/evas-eet/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/16 18:56:04 sno Exp $
 
 PKGNAME=	evas-eet-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas EET image loader
 
 EVAS_IMAGE_LOADERS=	eet
diff --git a/graphics/evas-eet/buildlink3.mk b/graphics/evas-eet/buildlink3.mk
new file mode 100644
index 00000000000..9f626882c9a
--- /dev/null
+++ b/graphics/evas-eet/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:04 sno Exp $
+
+BUILDLINK_TREE+=	evas-eet
+
+.if !defined(EVAS_EET_BUILDLINK3_MK)
+EVAS_EET_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-eet+=	evas-eet>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-eet?=	../../graphics/evas-eet
+
+.include "../../devel/eet/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # EVAS_EET_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-eet
diff --git a/graphics/evas-gif/Makefile b/graphics/evas-gif/Makefile
index 5df9004d846..a68e3f67cbf 100644
--- a/graphics/evas-gif/Makefile
+++ b/graphics/evas-gif/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/16 18:56:04 sno Exp $
 
 PKGNAME=	evas-gif-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas GIF image loader
 
 EVAS_IMAGE_LOADERS=	gif
diff --git a/graphics/evas-gif/buildlink3.mk b/graphics/evas-gif/buildlink3.mk
new file mode 100644
index 00000000000..785b47146ce
--- /dev/null
+++ b/graphics/evas-gif/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:04 sno Exp $
+
+BUILDLINK_TREE+=	evas-gif
+
+.if !defined(EVAS_GIF_BUILDLINK3_MK)
+EVAS_GIF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-gif+=	evas-gif>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-gif?=	../../graphics/evas-gif
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/giflib.buildlink3.mk"
+
+.endif # EVAS_GIF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-gif
diff --git a/graphics/evas-jpeg/Makefile b/graphics/evas-jpeg/Makefile
index d8fc0359947..e0400f63ecb 100644
--- a/graphics/evas-jpeg/Makefile
+++ b/graphics/evas-jpeg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/16 18:56:04 sno Exp $
 
 PKGNAME=	evas-jpeg-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas JPEG image loader
 
 EVAS_IMAGE_LOADERS=	jpeg
diff --git a/graphics/evas-jpeg/buildlink3.mk b/graphics/evas-jpeg/buildlink3.mk
new file mode 100644
index 00000000000..777b0705ea7
--- /dev/null
+++ b/graphics/evas-jpeg/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:04 sno Exp $
+
+BUILDLINK_TREE+=	evas-jpeg
+
+.if !defined(EVAS_JPEG_BUILDLINK3_MK)
+EVAS_JPEG_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-jpeg+=	evas-jpeg>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-jpeg?=	../../graphics/evas-jpeg
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+
+.endif # EVAS_JPEG_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-jpeg
diff --git a/graphics/evas-pmaps/Makefile b/graphics/evas-pmaps/Makefile
index feb0c49bcad..7baece8bcad 100644
--- a/graphics/evas-pmaps/Makefile
+++ b/graphics/evas-pmaps/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-pmaps-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas PMAPS image loader
 
 EVAS_IMAGE_LOADERS=	pmaps
diff --git a/graphics/evas-pmaps/buildlink3.mk b/graphics/evas-pmaps/buildlink3.mk
new file mode 100644
index 00000000000..7f4e0421ca7
--- /dev/null
+++ b/graphics/evas-pmaps/buildlink3.mk
@@ -0,0 +1,17 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-pmaps
+
+.if !defined(EVAS_PMAPS_BUILDLINK3_MK)
+EVAS_PMAPS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-pmaps+=	evas-pmaps>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-pmaps?=	../../graphics/evas-pmaps
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # EVAS_PMAPS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-pmaps
diff --git a/graphics/evas-png/Makefile b/graphics/evas-png/Makefile
index 3fd09d498c2..9c77ae94b0f 100644
--- a/graphics/evas-png/Makefile
+++ b/graphics/evas-png/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.15 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-png-${EVAS_VERSION}
-PKGREVISION=	4
 COMMENT=	Evas PNG image loader
 
 EVAS_IMAGE_LOADERS=	png
diff --git a/graphics/evas-png/buildlink3.mk b/graphics/evas-png/buildlink3.mk
new file mode 100644
index 00000000000..69f49fabe92
--- /dev/null
+++ b/graphics/evas-png/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-png
+
+.if !defined(EVAS_PNG_BUILDLINK3_MK)
+EVAS_PNG_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-png+=	evas-png>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-png?=	../../graphics/evas-png
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+
+.endif # EVAS_PNG_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-png
diff --git a/graphics/evas-sdl-16/Makefile b/graphics/evas-sdl-16/Makefile
index e5a4a31271c..a0a0f166c1d 100644
--- a/graphics/evas-sdl-16/Makefile
+++ b/graphics/evas-sdl-16/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 22:16:17 tron Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-sdl-16-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas 16-bit SDL engine
 
 EVAS_ENGINES=	sdl
diff --git a/graphics/evas-sdl-16/buildlink3.mk b/graphics/evas-sdl-16/buildlink3.mk
new file mode 100644
index 00000000000..186d85cce9b
--- /dev/null
+++ b/graphics/evas-sdl-16/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-sdl-16
+
+.if !defined(EVAS_SDL_16_BUILDLINK3_MK)
+EVAS_SDL_16_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-sdl-16+=	evas-sdl-16>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-sdl-16?=	../../graphics/evas-sdl-16
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # EVAS_SDL_16_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-sdl-16
diff --git a/graphics/evas-sdl/Makefile b/graphics/evas-sdl/Makefile
index 32fbaf9d594..b9dfde5933c 100644
--- a/graphics/evas-sdl/Makefile
+++ b/graphics/evas-sdl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-sdl-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas SDL engine
 
 EVAS_ENGINES=	sdl
diff --git a/graphics/evas-sdl/buildlink3.mk b/graphics/evas-sdl/buildlink3.mk
new file mode 100644
index 00000000000..58ae31d0dd4
--- /dev/null
+++ b/graphics/evas-sdl/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-sdl
+
+.if !defined(EVAS_SDL_BUILDLINK3_MK)
+EVAS_SDL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-sdl+=	evas-sdl>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-sdl?=	../../graphics/evas-sdl
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # EVAS_SDL_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-sdl
diff --git a/graphics/evas-software-x11/Makefile b/graphics/evas-software-x11/Makefile
index 25e252bfe85..56df7a14ed8 100644
--- a/graphics/evas-software-x11/Makefile
+++ b/graphics/evas-software-x11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2013/06/04 22:16:17 tron Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-software-x11-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas software X11 engine
 
 EVAS_ENGINES=	software-xlib
diff --git a/graphics/evas-software-x11/buildlink3.mk b/graphics/evas-software-x11/buildlink3.mk
index 39b8896bfbf..24c7e7c19b3 100644
--- a/graphics/evas-software-x11/buildlink3.mk
+++ b/graphics/evas-software-x11/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.5 2011/12/05 17:33:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2013/06/16 18:56:05 sno Exp $
 
 BUILDLINK_TREE+=	evas-software-x11
 
 .if !defined(EVAS_SOFTWARE_X11_BUILDLINK3_MK)
 EVAS_SOFTWARE_X11_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.evas-software-x11+=	evas-software-x11>=1.1.0beta
+BUILDLINK_API_DEPENDS.evas-software-x11+=	evas-software-x11>=1.7.0alpha
 BUILDLINK_PKGSRCDIR.evas-software-x11?=	../../graphics/evas-software-x11
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/graphics/evas-svg/Makefile b/graphics/evas-svg/Makefile
index 4e8faf45389..41142c4b151 100644
--- a/graphics/evas-svg/Makefile
+++ b/graphics/evas-svg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/06/06 12:54:29 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-svg-${EVAS_VERSION}
 
@@ -8,8 +8,6 @@ EVAS_IMAGE_LOADERS=	svg
 
 .include "../../graphics/evas/Makefile.common"
 
-PKGREVISION=	14
-
 BUILD_DIRS=	src/modules/loaders/svg
 MAKE_FLAGS+=	module_la_LIBADD="\$${EINA_LIBS} \$${evas_image_loader_svg_libs} ${BUILDLINK_PREFIX.evas}/lib/libevas.la" \
 		module_la_DEPENDENCIES=
diff --git a/graphics/evas-svg/buildlink3.mk b/graphics/evas-svg/buildlink3.mk
new file mode 100644
index 00000000000..e286a226fa3
--- /dev/null
+++ b/graphics/evas-svg/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-svg
+
+.if !defined(EVAS_SVG_BUILDLINK3_MK)
+EVAS_SVG_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-svg+=	evas-svg>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-svg?=	../../graphics/evas-svg
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+
+.endif # EVAS_SVG_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-svg
diff --git a/graphics/evas-tiff/Makefile b/graphics/evas-tiff/Makefile
index cd426775e61..ac14c4cbfca 100644
--- a/graphics/evas-tiff/Makefile
+++ b/graphics/evas-tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/06/04 22:16:17 tron Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-tiff-${EVAS_VERSION}
 
@@ -8,8 +8,6 @@ EVAS_IMAGE_LOADERS=	tiff
 
 .include "../../graphics/evas/Makefile.common"
 
-PKGREVISION=	5
-
 BUILD_DIRS=	src/modules/loaders/tiff src/modules/savers/tiff
 MAKE_FLAGS+=	module_la_LIBADD="\$${EINA_LIBS} \$${EVIL_LIBS} \$${evas_image_loader_tiff_libs} ${BUILDLINK_PREFIX.evas}/lib/libevas.la" \
 		module_la_DEPENDENCIES=
diff --git a/graphics/evas-tiff/buildlink3.mk b/graphics/evas-tiff/buildlink3.mk
new file mode 100644
index 00000000000..7599e7b4867
--- /dev/null
+++ b/graphics/evas-tiff/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-tiff
+
+.if !defined(EVAS_TIFF_BUILDLINK3_MK)
+EVAS_TIFF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-tiff+=	evas-tiff>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-tiff?=	../../graphics/evas-tiff
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.endif # EVAS_TIFF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-tiff
diff --git a/graphics/evas-xpm/Makefile b/graphics/evas-xpm/Makefile
index d1e12de2c3c..5ab15d35d47 100644
--- a/graphics/evas-xpm/Makefile
+++ b/graphics/evas-xpm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/06/04 22:16:17 tron Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/16 18:56:05 sno Exp $
 
 PKGNAME=	evas-xpm-${EVAS_VERSION}
-PKGREVISION=	3
 COMMENT=	Evas XPM image loader
 
 EVAS_IMAGE_LOADERS=	xpm
diff --git a/graphics/evas-xpm/buildlink3.mk b/graphics/evas-xpm/buildlink3.mk
new file mode 100644
index 00000000000..ea799bf8c17
--- /dev/null
+++ b/graphics/evas-xpm/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+BUILDLINK_TREE+=	evas-xpm
+
+.if !defined(EVAS_XPM_BUILDLINK3_MK)
+EVAS_XPM_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.evas-xpm+=	evas-xpm>=1.7.7
+BUILDLINK_PKGSRCDIR.evas-xpm?=	../../graphics/evas-xpm
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+
+.endif # EVAS_XPM_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-evas-xpm
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index d4c199b8b58..f2ed5d9f66b 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.13 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/16 18:56:05 sno Exp $
 
-PKGNAME=	evas-${EVAS_VERSION}
-PKGREVISION=	2
 COMMENT=	Enlightened Canvas Library
 
 .include "Makefile.common"
diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common
index b70f6d0fa23..cae1f69f282 100644
--- a/graphics/evas/Makefile.common
+++ b/graphics/evas/Makefile.common
@@ -1,7 +1,20 @@
-# $NetBSD: Makefile.common,v 1.12 2012/10/06 14:10:47 asau Exp $
+# $NetBSD: Makefile.common,v 1.13 2013/06/16 18:56:05 sno Exp $
+
+# used by graphics/evas-buffer/Makefile
+# used by graphics/evas-edb/Makefile
+# used by graphics/evas-eet/Makefile
+# used by graphics/evas-gif/Makefile
+# used by graphics/evas-jpeg/Makefile
+# used by graphics/evas-pmaps/Makefile
 # used by graphics/evas-png/Makefile
+# used by graphics/evas-sdl/Makefile
+# used by graphics/evas-sdl-16/Makefile
+# used by graphics/evas-software-x11/Makefile
+# used by graphics/evas-svg/Makefile
+# used by graphics/evas-tiff/Makefile
+# used by graphics/evas-xpm/Makefile
 
-EVAS_VERSION=	1.1.0
+EVAS_VERSION=	1.7.7
 DISTNAME=	evas-${EVAS_VERSION}
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.enlightenment.org/releases/
@@ -9,6 +22,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://enlightenment.org/
+LICENSE=	2-clause-bsd
 
 DISTINFO_FILE=	${.CURDIR}/../../graphics/evas/distinfo
 PATCHDIR=	${.CURDIR}/../../graphics/evas/patches
@@ -20,7 +34,7 @@ USE_TOOLS+=	gmake pkg-config
 .for mod in software-ddraw software-16-ddraw direct3d software-16-wince \
 	software-xlib software-16-x11 software-xcb directfb sdl \
 	sdl-primitive fb buffer software-qtopia gl-xlib quartz gl-glew \
-	xrender-x11 xrender-xcb glitz-x11
+	xrender-x11 xrender-xcb glitz-x11 wayland-shm wayland-egl
 .  if defined(EVAS_ENGINES) && !empty(EVAS_ENGINES:M${mod})
 CONFIGURE_ARGS+=	--enable-${mod}
 .  else
@@ -36,13 +50,16 @@ CONFIGURE_ARGS+=	--disable-image-loader-${mod}
 .  endif
 .endfor
 
+CONFIGURE_ENV+=	ACLOCAL=: AUTOCONF=: AUTOMAKE=:
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:M*-powerpc)
 CONFIGURE_ARGS+=	--enable-cpu-altivec
 .endif
 
-MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}-1.1.0
+# currently it is like it is
+MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}-${EVAS_VERSION}
 PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
 PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
 
diff --git a/graphics/evas/PLIST b/graphics/evas/PLIST
index a3ae3d8627b..c9be75f2717 100644
--- a/graphics/evas/PLIST
+++ b/graphics/evas/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2011/12/05 17:33:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/06/16 18:56:05 sno Exp $
 include/evas-1/Evas.h
+include/evas-1/Evas_GL.h
 lib/evas/modules/engines/software_generic/${MODULE_ARCH}/module.la
 lib/evas/modules/loaders/bmp/${MODULE_ARCH}/module.la
 lib/evas/modules/loaders/generic/${MODULE_ARCH}/module.la
@@ -11,6 +12,7 @@ lib/libevas.la
 lib/pkgconfig/evas.pc
 share/doc/evas/AUTHORS
 share/doc/evas/COPYING
+share/evas/checkme
 share/evas/examples/aspect.edc
 share/evas/examples/cube1.png
 share/evas/examples/enlightenment.png
@@ -21,9 +23,11 @@ share/evas/examples/evas-events.c
 share/evas/examples/evas-hints.c
 share/evas/examples/evas-images.c
 share/evas/examples/evas-images2.c
+share/evas/examples/evas-images3.c
 share/evas/examples/evas-init-shutdown.c
 share/evas/examples/evas-map-utils.c
 share/evas/examples/evas-object-manipulation.c
+share/evas/examples/evas-smart-interface.c
 share/evas/examples/evas-smart-object.c
 share/evas/examples/evas-stacking.c
 share/evas/examples/evas-text.c
diff --git a/graphics/evas/buildlink3.mk b/graphics/evas/buildlink3.mk
index e323a430955..3417e2925cd 100644
--- a/graphics/evas/buildlink3.mk
+++ b/graphics/evas/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/06/04 22:16:16 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/06/16 18:56:05 sno Exp $
 
 BUILDLINK_TREE+=	evas
 
 .if !defined(EVAS_BUILDLINK3_MK)
 EVAS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.evas+=	evas>=1.1.0beta
-BUILDLINK_ABI_DEPENDS.evas?=	evas>=1.1.0nb2
+BUILDLINK_API_DEPENDS.evas+=	evas>=1.7.7
+BUILDLINK_ABI_DEPENDS.evas?=	evas>=1.7.7
 BUILDLINK_PKGSRCDIR.evas?=	../../graphics/evas
 
 .include "../../devel/eet/buildlink3.mk"
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 591d4a3bca1..cd2d408b5e2 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2012/09/27 13:20:42 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2013/06/16 18:56:05 sno Exp $
 
-SHA1 (evas-1.1.0.tar.bz2) = e09daebd5aa14ecdff94bca0ff30a4cf70b3b84b
-RMD160 (evas-1.1.0.tar.bz2) = ebad0e5b4f3987ee9a29b39f329afb650eafeb20
-Size (evas-1.1.0.tar.bz2) = 9235732 bytes
-SHA1 (patch-configure) = 134e4585671677a7e06b36f8915ca7e1fe78e52b
-SHA1 (patch-configure.ac) = 890c2e38922ed2c3d85de1660cad6634e6b2e742
-SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = e65edd1214a926986a1a8206c955f5351308c306
+SHA1 (evas-1.7.7.tar.bz2) = 680e85a60363df84b81298138cc19629f9f139bc
+RMD160 (evas-1.7.7.tar.bz2) = 306b36018c5ab07712553a554e4a2deac13854ed
+Size (evas-1.7.7.tar.bz2) = 9408256 bytes
+SHA1 (patch-configure) = b7bda6085449a0fdcc51d58371101bb2f8bbc232
+SHA1 (patch-configure.ac) = d9330c131859794beb29414c9afe66a08b6fe55d
+SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 386f375a68eb4d49b05cc69c041641d11c306082
diff --git a/graphics/evas/patches/patch-configure b/graphics/evas/patches/patch-configure
index 473794eec13..ab1cb8a5ea8 100644
--- a/graphics/evas/patches/patch-configure
+++ b/graphics/evas/patches/patch-configure
@@ -1,25 +1,2677 @@
-$NetBSD: patch-configure,v 1.5 2012/09/27 13:20:42 jperkin Exp $
+$NetBSD: patch-configure,v 1.6 2013/06/16 18:56:05 sno Exp $
 
---- configure.orig	Fri Dec  2 07:42:00 2011
-+++ configure	Thu Sep 27 13:05:49 2012
-@@ -12100,8 +12100,11 @@
+Recreated using autoreconf -i because of applying failed
+
+--- configure.orig	2013-06-15 09:41:05.000000000 +0000
++++ configure
+@@ -1,13 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for evas 1.7.7.
++# Generated by GNU Autoconf 2.69 for evas 1.7.7.
+ #
+ # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
+ #
+ #
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -136,6 +134,31 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
++# Use a proper internal environment variable to ensure we don't fall
++  # into an infinite loop, continuously re-executing ourselves.
++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++    _as_can_reexec=no; export _as_can_reexec;
++    # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++  fi
++  # We don't want this to propagate to other subprocesses.
++          { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test 
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -222,21 +246,25 @@ IFS=$as_save_IFS
+ 
+ 
+       if test "x$CONFIG_SHELL" != x; then :
+-  # We cannot yet assume a decent shell, so we have to provide a
+-	# neutralization value for shells without unset; and this also
+-	# works around shells that cannot unset nonexistent variables.
+-	# Preserve -v and -x to the replacement shell.
+-	BASH_ENV=/dev/null
+-	ENV=/dev/null
+-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-	export CONFIG_SHELL
+-	case $- in # ((((
+-	  *v*x* | *x*v* ) as_opts=-vx ;;
+-	  *v* ) as_opts=-v ;;
+-	  *x* ) as_opts=-x ;;
+-	  * ) as_opts= ;;
+-	esac
+-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++  export CONFIG_SHELL
++             # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
+ 
+ 
+ } # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+   chmod +x "$as_me.lineno" ||
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++  # already done that, so ensure we don't try to do so again and fall
++  # in an infinite loop.  This has already happened in practice.
++  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensitive to this).
+@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -515,28 +555,8 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -1721,8 +1741,6 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1890,10 +1908,12 @@ Optional Features:
+   --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --enable-silent-rules          less verbose build output (undo: `make V=1')
+-  --disable-silent-rules         verbose build output (undo: `make V=0')
+-  --disable-dependency-tracking  speeds up one-time build
+-  --enable-dependency-tracking   do not reject slow dependency extractors
++  --enable-silent-rules   less verbose build output (undo: "make V=1")
++  --disable-silent-rules  verbose build output (undo: "make V=0")
++  --enable-dependency-tracking
++                          do not reject slow dependency extractors
++  --disable-dependency-tracking
++                          speeds up one-time build
+   --enable-shared[=PKGS]  build shared libraries [default=yes]
+   --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-fast-install[=PKGS]
+@@ -2254,9 +2274,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ evas configure 1.7.7
+-generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.69
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -2533,7 +2553,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -2684,7 +2704,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -2805,7 +2825,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -2841,7 +2861,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) >= 0)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+ 
+   ;
+   return 0;
+@@ -2857,7 +2878,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+ 
+   ;
+   return 0;
+@@ -2883,7 +2905,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) < 0)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+ 
+   ;
+   return 0;
+@@ -2899,7 +2922,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+ 
+   ;
+   return 0;
+@@ -2933,7 +2957,8 @@ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0
++test_array [0] = 0;
++return test_array [0];
+ 
+   ;
+   return 0;
+@@ -3106,7 +3131,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by evas $as_me 1.7.7, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -3462,7 +3487,7 @@ ac_config_headers="$ac_config_headers co
+ 
+ 
+ 
+-am__api_version='1.11'
++am__api_version='1.13'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -3530,7 +3555,7 @@ case $as_dir/ in #((
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -3588,9 +3613,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -3601,32 +3623,40 @@ case `pwd` in
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+ esac
+ 
+-# Do `set' in a subshell so we don't clobber the current shell's
++# Do 'set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-   if test "$*" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t "$srcdir/configure" conftest.file`
+-   fi
+-   rm -f conftest.file
+-   if test "$*" != "X $srcdir/configure conftest.file" \
+-      && test "$*" != "X conftest.file $srcdir/configure"; then
+-
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # if, for instance, CONFIG_SHELL is bash and it inherits a
+-      # broken ls alias from the environment.  This has actually
+-      # happened.  Such a system could not be considered "sane".
+-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment" "$LINENO" 5
+-   fi
++   am_has_slept=no
++   for am_try in 1 2; do
++     echo "timestamp, slept: $am_has_slept" > conftest.file
++     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++     if test "$*" = "X"; then
++	# -L didn't work.
++	set X `ls -t "$srcdir/configure" conftest.file`
++     fi
++     if test "$*" != "X $srcdir/configure conftest.file" \
++	&& test "$*" != "X conftest.file $srcdir/configure"; then
+ 
++	# If neither matched, then we have a broken ls.  This can happen
++	# if, for instance, CONFIG_SHELL is bash and it inherits a
++	# broken ls alias from the environment.  This has actually
++	# happened.  Such a system could not be considered "sane".
++	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
++  alias in your environment" "$LINENO" 5
++     fi
++     if test "$2" = conftest.file || test $am_try -eq 2; then
++       break
++     fi
++     # Just in case.
++     sleep 1
++     am_has_slept=yes
++   done
+    test "$2" = conftest.file
+    )
+ then
+@@ -3638,6 +3668,16 @@ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++# If we didn't sleep, we still need to ensure time stamps of config.status and
++# generated files are strictly newer.
++am_sleep_pid=
++if grep 'slept: no' conftest.file >/dev/null 2>&1; then
++  ( sleep 1 ) &
++  am_sleep_pid=$!
++fi
++
++rm -f conftest.file
++
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -3660,12 +3700,12 @@ if test x"${MISSING+set}" != xset; then
+   esac
+ fi
+ # Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+-  am_missing_run="$MISSING --run "
++if eval "$MISSING --is-lightweight"; then
++  am_missing_run="$MISSING "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ fi
+ 
+ if test x"${install_sh}" != xset; then
+@@ -3677,10 +3717,10 @@ if test x"${install_sh}" != xset; then
+   esac
+ fi
+ 
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
++# Installed binaries are usually stripped using 'strip' when the user
++# run "make install-strip".  However 'strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
++# will honor the 'STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+@@ -3699,7 +3739,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3739,7 +3779,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3790,7 +3830,7 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_prog in mkdir gmkdir; do
+ 	 for ac_exec_ext in '' $ac_executable_extensions; do
+-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 	     'mkdir (GNU coreutils) '* | \
+ 	     'mkdir (coreutils) '* | \
+@@ -3819,12 +3859,6 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
+-mkdir_p="$MKDIR_P"
+-case $mkdir_p in
+-  [\\/$]* | ?:[\\/]*) ;;
+-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -3843,7 +3877,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AWK="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3907,6 +3941,45 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+ 
++# Check whether --enable-silent-rules was given.
++if test "${enable_silent_rules+set}" = set; then :
++  enableval=$enable_silent_rules;
++fi
++
++case $enable_silent_rules in # (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++    *) AM_DEFAULT_VERBOSITY=1;;
++esac
++am_make=${MAKE-make}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
++$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
++if ${am_cv_make_support_nested_variables+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if $as_echo 'TRUE=$(BAR$(V))
++BAR0=false
++BAR1=true
++V=1
++am__doit:
++	@$(TRUE)
++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
++  am_cv_make_support_nested_variables=yes
++else
++  am_cv_make_support_nested_variables=no
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
++$as_echo "$am_cv_make_support_nested_variables" >&6; }
++if test $am_cv_make_support_nested_variables = yes; then
++    AM_V='$(V)'
++  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
++else
++  AM_V=$AM_DEFAULT_VERBOSITY
++  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
++fi
++AM_BACKSLASH='\'
++
+ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+   # is not polluted with repeated "-I."
+@@ -3957,27 +4030,38 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
++# For better backward compatibility.  To be removed once Automake 1.9.x
++# dies out for good.  For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++mkdir_p='$(MKDIR_P)'
++
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+ 
++
++# We'll loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar  pax cpio none'
++
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
+ 
+ 
++
+ # Check whether --enable-silent-rules was given.
+ if test "${enable_silent_rules+set}" = set; then :
+   enableval=$enable_silent_rules;
+ fi
+ 
+-case $enable_silent_rules in
+-yes) AM_DEFAULT_VERBOSITY=0;;
+-no)  AM_DEFAULT_VERBOSITY=1;;
+-*)   AM_DEFAULT_VERBOSITY=0;;
++case $enable_silent_rules in # (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++    *) AM_DEFAULT_VERBOSITY=0;;
+ esac
+ am_make=${MAKE-make}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+@@ -4028,7 +4112,7 @@ am__quote=
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
++# Ignore all kinds of additional output from 'make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -4094,7 +4178,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4134,7 +4218,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4187,7 +4271,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4228,7 +4312,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -4286,7 +4370,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4330,7 +4414,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4776,8 +4860,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -4873,8 +4956,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -4909,16 +4992,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -4927,8 +5010,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -4936,7 +5019,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -5145,7 +5228,7 @@ do
+     for ac_prog in grep ggrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++      as_fn_executable_p "$ac_path_GREP" || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5211,7 +5294,7 @@ do
+     for ac_prog in egrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++      as_fn_executable_p "$ac_path_EGREP" || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -5418,8 +5501,8 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#	  define __EXTENSIONS__ 1
+-	  $ac_includes_default
++#         define __EXTENSIONS__ 1
++          $ac_includes_default
+ int
+ main ()
+ {
+@@ -5543,7 +5626,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AS="${ac_tool_prefix}as"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5583,7 +5666,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AS="as"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5635,7 +5718,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5675,7 +5758,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5727,7 +5810,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5767,7 +5850,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5941,7 +6024,7 @@ do
+     for ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
++      as_fn_executable_p "$ac_path_SED" || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+   # Check for GNU $ac_path_SED
+ case `"$ac_path_SED" --version 2>&1` in
+@@ -6020,7 +6103,7 @@ do
+     for ac_prog in fgrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
++      as_fn_executable_p "$ac_path_FGREP" || continue
+ # Check for GNU ac_path_FGREP and select it if it is found.
+   # Check for GNU $ac_path_FGREP
+ case `"$ac_path_FGREP" --version 2>&1` in
+@@ -6276,7 +6359,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6320,7 +6403,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6744,7 +6827,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6784,7 +6867,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7087,7 +7170,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7127,7 +7210,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7227,7 +7310,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7271,7 +7354,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AR="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7396,7 +7479,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7436,7 +7519,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7495,7 +7578,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7535,7 +7618,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8184,7 +8267,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8224,7 +8307,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8304,7 +8387,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8344,7 +8427,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8396,7 +8479,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8436,7 +8519,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_NMEDIT="nmedit"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8488,7 +8571,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8528,7 +8611,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_LIPO="lipo"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8580,7 +8663,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8620,7 +8703,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OTOOL="otool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8672,7 +8755,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8712,7 +8795,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OTOOL64="otool64"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -12977,8 +13060,11 @@ case "$host_os" in
     mingw32ce*)
        MODULE_ARCH="$host_os-$host_cpu"
        ;;
 +   solaris*)
-+      MODULE_ARCH="solaris-$host_cpu-1.1.0"
++      MODULE_ARCH="solaris-$host_cpu-1.7.7"
 +      ;;
     *)
--      MODULE_ARCH="$host_os-$host_cpu-1.1.0"
-+      MODULE_ARCH="${host_os%-gnu}-$host_cpu-1.1.0"
+-      MODULE_ARCH="$host_os-$host_cpu-1.7.7"
++      MODULE_ARCH="${host_os%-gnu}-$host_cpu-1.7.7"
        ;;
  esac
  
-@@ -19846,6 +19849,7 @@
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13130,7 +13216,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13174,7 +13260,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OBJC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13368,8 +13454,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -13402,16 +13488,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -13420,8 +13506,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -13429,7 +13515,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -13495,8 +13581,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -13529,16 +13615,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -13547,8 +13633,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -13556,7 +13642,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -13681,7 +13767,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13725,7 +13811,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13921,8 +14007,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -13957,16 +14043,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -13975,8 +14061,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -13984,7 +14070,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -17263,7 +17349,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17303,7 +17389,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17356,7 +17442,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17397,7 +17483,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -17455,7 +17541,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17499,7 +17585,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17695,8 +17781,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -17792,8 +17877,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -17828,16 +17913,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -17846,8 +17931,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -17855,7 +17940,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -17917,6 +18002,7 @@ fi
+ 
+ 
+ 
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -17937,7 +18023,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17980,7 +18066,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -18087,7 +18173,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_efl_have_doxygen="yes"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -18136,7 +18222,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_efl_have_doxygen="yes"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -18220,6 +18306,7 @@ if test -n "$EVIL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil >= 1.0.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18236,6 +18323,7 @@ if test -n "$EVIL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil >= 1.0.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18255,9 +18343,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1`
++	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil >= 1.0.0" 2>&1`
+         else
+-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1`
++	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil >= 1.0.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVIL_PKG_ERRORS" >&5
+@@ -18272,7 +18360,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables EVIL_CFLAGS
+ and EVIL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18288,7 +18375,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
+ 	EVIL_LIBS=$pkg_cv_EVIL_LIBS
+@@ -18320,6 +18406,7 @@ if test -n "$EXOTIC_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EXOTIC_CFLAGS=`$PKG_CONFIG --cflags "exotic" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18336,6 +18423,7 @@ if test -n "$EXOTIC_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EXOTIC_LIBS=`$PKG_CONFIG --libs "exotic" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18355,9 +18443,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exotic" 2>&1`
++	        EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "exotic" 2>&1`
+         else
+-	        EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors "exotic" 2>&1`
++	        EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "exotic" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EXOTIC_PKG_ERRORS" >&5
+@@ -18409,6 +18497,7 @@ if test -n "$EINA_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.6.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18425,6 +18514,7 @@ if test -n "$EINA_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.6.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18444,9 +18534,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= 1.6.0" 2>&1`
++	        EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina >= 1.6.0" 2>&1`
+         else
+-	        EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= 1.6.0" 2>&1`
++	        EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina >= 1.6.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EINA_PKG_ERRORS" >&5
+@@ -18461,7 +18551,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables EINA_CFLAGS
+ and EINA_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18477,7 +18566,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	EINA_CFLAGS=$pkg_cv_EINA_CFLAGS
+ 	EINA_LIBS=$pkg_cv_EINA_LIBS
+@@ -18539,6 +18627,7 @@ if test -n "$FREETYPE_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 9.3.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18555,6 +18644,7 @@ if test -n "$FREETYPE_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 9.3.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18574,9 +18664,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2 >= 9.3.0" 2>&1`
++	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 >= 9.3.0" 2>&1`
+         else
+-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2 >= 9.3.0" 2>&1`
++	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 >= 9.3.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$FREETYPE_PKG_ERRORS" >&5
+@@ -18591,7 +18681,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables FREETYPE_CFLAGS
+ and FREETYPE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18607,7 +18696,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
+ 	FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
+@@ -18651,6 +18739,7 @@ if test -n "$FONTCONFIG_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.5.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18667,6 +18756,7 @@ if test -n "$FONTCONFIG_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.5.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18686,9 +18776,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= 2.5.0" 2>&1`
++	        FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig >= 2.5.0" 2>&1`
+         else
+-	        FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= 2.5.0" 2>&1`
++	        FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig >= 2.5.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$FONTCONFIG_PKG_ERRORS" >&5
+@@ -18788,6 +18878,7 @@ if test -n "$FRIBIDI_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_FRIBIDI_CFLAGS=`$PKG_CONFIG --cflags "fribidi >= 0.19.2" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18804,6 +18895,7 @@ if test -n "$FRIBIDI_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_FRIBIDI_LIBS=`$PKG_CONFIG --libs "fribidi >= 0.19.2" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18823,9 +18915,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fribidi >= 0.19.2" 2>&1`
++	        FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fribidi >= 0.19.2" 2>&1`
+         else
+-	        FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors "fribidi >= 0.19.2" 2>&1`
++	        FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fribidi >= 0.19.2" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$FRIBIDI_PKG_ERRORS" >&5
+@@ -18930,6 +19022,7 @@ if test -n "$HARFBUZZ_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "harfbuzz >= 0.9.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18946,6 +19039,7 @@ if test -n "$HARFBUZZ_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "harfbuzz >= 0.9.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -18965,9 +19059,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "harfbuzz >= 0.9.0" 2>&1`
++	        HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz >= 0.9.0" 2>&1`
+         else
+-	        HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors "harfbuzz >= 0.9.0" 2>&1`
++	        HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz >= 0.9.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$HARFBUZZ_PKG_ERRORS" >&5
+@@ -19059,6 +19153,7 @@ if test -n "$PIXMAN_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -19075,6 +19170,7 @@ if test -n "$PIXMAN_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PIXMAN_LIBS=`$PKG_CONFIG --libs "pixman-1" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -19094,9 +19190,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pixman-1" 2>&1`
++	        PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1" 2>&1`
+         else
+-	        PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "pixman-1" 2>&1`
++	        PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PIXMAN_PKG_ERRORS" >&5
+@@ -19427,11 +19523,11 @@ else
+ int
+ main ()
+ {
+-/* FIXME: Include the comments suggested by Paul. */
++
+ #ifndef __cplusplus
+-  /* Ultrix mips cc rejects this.  */
++  /* Ultrix mips cc rejects this sort of thing.  */
+   typedef int charset[2];
+-  const charset cs;
++  const charset cs = { 0, 0 };
+   /* SunOS 4.1.1 cc rejects this.  */
+   char const *const *pcpcc;
+   char **ppc;
+@@ -19448,8 +19544,9 @@ main ()
+   ++pcpcc;
+   ppc = (char**) pcpcc;
+   pcpcc = (char const *const *) ppc;
+-  { /* SCO 3.2v4 cc rejects this.  */
+-    char *t;
++  { /* SCO 3.2v4 cc rejects this sort of thing.  */
++    char tx;
++    char *t = &tx;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
+@@ -19465,10 +19562,10 @@ main ()
+     iptr p = 0;
+     ++p;
+   }
+-  { /* AIX XL C 1.02.0.0 rejects this saying
++  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+-    struct s { int j; const int *ap[3]; };
+-    struct s *b; b->j = 5;
++    struct s { int j; const int *ap[3]; } bx;
++    struct s *b = &bx; b->j = 5;
+   }
+   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+     const int foo = 10;
+@@ -19870,7 +19967,7 @@ main ()
+   return 0;
+ }
+ _ACEOF
+-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
++for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+ do
+   CC="$ac_save_CC $ac_arg"
+   if ac_fn_c_try_compile "$LINENO"; then :
+@@ -19910,8 +20007,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -20309,6 +20405,8 @@ else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
++# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++#   include <stdlib.h>
+ # else
+ #  ifdef HAVE_ALLOCA_H
+ #   include <alloca.h>
+@@ -20412,23 +20510,20 @@ else
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+-find_stack_direction ()
++find_stack_direction (int *addr, int depth)
+ {
+-  static char *addr = 0;
+-  auto char dummy;
+-  if (addr == 0)
+-    {
+-      addr = &dummy;
+-      return find_stack_direction ();
+-    }
+-  else
+-    return (&dummy > addr) ? 1 : -1;
++  int dir, dummy = 0;
++  if (! addr)
++    addr = &dummy;
++  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
++  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
++  return dir + dummy;
+ }
+ 
+ int
+-main ()
++main (int argc, char **argv)
+ {
+-  return find_stack_direction () < 0;
++  return find_stack_direction (0, argc + !argv + 20) < 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -21681,6 +21776,7 @@ if test -n "$SDL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -21697,6 +21793,7 @@ if test -n "$SDL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -21716,9 +21813,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1`
++	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1`
+         else
+-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1`
++	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SDL_PKG_ERRORS" >&5
+@@ -21733,7 +21830,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables SDL_CFLAGS
+ and SDL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -21749,7 +21845,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ 	SDL_LIBS=$pkg_cv_SDL_LIBS
+@@ -22063,6 +22158,7 @@ if test -n "$GL_EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -22079,6 +22175,7 @@ if test -n "$GL_EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -22098,9 +22195,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         else
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GL_EET_PKG_ERRORS" >&5
+@@ -22346,6 +22443,7 @@ if test -n "$DIRECTFB_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.16" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -22362,6 +22460,7 @@ if test -n "$DIRECTFB_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.16" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -22381,9 +22480,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= 0.9.16" 2>&1`
++	        DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "directfb >= 0.9.16" 2>&1`
+         else
+-	        DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= 0.9.16" 2>&1`
++	        DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "directfb >= 0.9.16" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DIRECTFB_PKG_ERRORS" >&5
+@@ -22398,7 +22497,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables DIRECTFB_CFLAGS
+ and DIRECTFB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -22414,7 +22512,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
+ 	DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
+@@ -22550,6 +22647,7 @@ if test -n "$XCB_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -22566,6 +22664,7 @@ if test -n "$XCB_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -22585,9 +22684,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
++	        XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
+         else
+-	        XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
++	        XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$XCB_PKG_ERRORS" >&5
+@@ -23735,6 +23834,7 @@ if test -n "$SDL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -23751,6 +23851,7 @@ if test -n "$SDL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -23770,9 +23871,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1`
++	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1`
+         else
+-	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1`
++	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SDL_PKG_ERRORS" >&5
+@@ -23787,7 +23888,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables SDL_CFLAGS
+ and SDL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -23803,7 +23903,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ 	SDL_LIBS=$pkg_cv_SDL_LIBS
+@@ -24042,6 +24141,7 @@ if test -n "$WAYLAND_EGL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_WAYLAND_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -24058,6 +24158,7 @@ if test -n "$WAYLAND_EGL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -24077,9 +24178,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1`
++	        WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1`
+         else
+-	        WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1`
++	        WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$WAYLAND_EGL_PKG_ERRORS" >&5
+@@ -24124,6 +24225,7 @@ if test -n "$GL_EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -24140,6 +24242,7 @@ if test -n "$GL_EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -24159,9 +24262,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         else
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GL_EET_PKG_ERRORS" >&5
+@@ -24417,6 +24520,7 @@ if test -n "$XCB_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -24433,6 +24537,7 @@ if test -n "$XCB_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -24452,9 +24557,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
++	        XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
+         else
+-	        XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
++	        XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$XCB_PKG_ERRORS" >&5
+@@ -26490,6 +26595,7 @@ if test -n "$XCB_GL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_XCB_GL_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -26506,6 +26612,7 @@ if test -n "$XCB_GL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_XCB_GL_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -26525,9 +26632,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        XCB_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1`
++	        XCB_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1`
+         else
+-	        XCB_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1`
++	        XCB_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$XCB_GL_PKG_ERRORS" >&5
+@@ -26576,6 +26683,7 @@ if test -n "$GL_EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -26592,6 +26700,7 @@ if test -n "$GL_EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -26611,9 +26720,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         else
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GL_EET_PKG_ERRORS" >&5
+@@ -26720,6 +26829,7 @@ if test -n "$GL_EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -26736,6 +26846,7 @@ if test -n "$GL_EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -26755,9 +26866,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         else
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GL_EET_PKG_ERRORS" >&5
+@@ -27811,6 +27922,7 @@ if test -n "$GL_EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -27827,6 +27939,7 @@ if test -n "$GL_EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -27846,9 +27959,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         else
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GL_EET_PKG_ERRORS" >&5
+@@ -27960,6 +28073,7 @@ if test -n "$GL_EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -27976,6 +28090,7 @@ if test -n "$GL_EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -27995,9 +28110,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         else
+-	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1`
++	        GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GL_EET_PKG_ERRORS" >&5
+@@ -28393,6 +28508,7 @@ if test -n "$EDB_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EDB_CFLAGS=`$PKG_CONFIG --cflags "edb" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -28409,6 +28525,7 @@ if test -n "$EDB_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EDB_LIBS=`$PKG_CONFIG --libs "edb" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -28428,9 +28545,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "edb" 2>&1`
++	        EDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "edb" 2>&1`
+         else
+-	        EDB_PKG_ERRORS=`$PKG_CONFIG --print-errors "edb" 2>&1`
++	        EDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "edb" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EDB_PKG_ERRORS" >&5
+@@ -28575,6 +28692,7 @@ if test -n "$EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -28591,6 +28709,7 @@ if test -n "$EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -28610,9 +28729,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.0" 2>&1`
++	        EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.0" 2>&1`
+         else
+-	        EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.0" 2>&1`
++	        EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EET_PKG_ERRORS" >&5
+@@ -28735,6 +28854,7 @@ if test -n "$EET_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -28751,6 +28871,7 @@ if test -n "$EET_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -28770,9 +28891,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.0" 2>&1`
++	        EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.0" 2>&1`
+         else
+-	        EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.0" 2>&1`
++	        EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EET_PKG_ERRORS" >&5
+@@ -29385,6 +29506,7 @@ if test -n "$PNG_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2.10" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29401,6 +29523,7 @@ if test -n "$PNG_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2.10" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29420,9 +29543,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng >= 1.2.10" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2.10" 2>&1`
+         else
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng >= 1.2.10" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2.10" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PNG_PKG_ERRORS" >&5
+@@ -29456,6 +29579,7 @@ if test -n "$PNG_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng15" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29472,6 +29596,7 @@ if test -n "$PNG_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng15" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29491,9 +29616,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng15" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng15" 2>&1`
+         else
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng15" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng15" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PNG_PKG_ERRORS" >&5
+@@ -29528,6 +29653,7 @@ if test -n "$PNG_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng14" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29544,6 +29670,7 @@ if test -n "$PNG_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng14" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29563,9 +29690,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng14" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng14" 2>&1`
+         else
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng14" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng14" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PNG_PKG_ERRORS" >&5
+@@ -29600,6 +29727,7 @@ if test -n "$PNG_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12 >= 1.2.10" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29616,6 +29744,7 @@ if test -n "$PNG_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng12 >= 1.2.10" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29635,9 +29764,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng12 >= 1.2.10" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng12 >= 1.2.10" 2>&1`
+         else
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng12 >= 1.2.10" 2>&1`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng12 >= 1.2.10" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PNG_PKG_ERRORS" >&5
+@@ -29784,6 +29913,7 @@ if test -n "$SVG_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_SVG_CFLAGS=`$PKG_CONFIG --cflags "esvg >= 0.0.16" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29800,6 +29930,7 @@ if test -n "$SVG_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_SVG_LIBS=`$PKG_CONFIG --libs "esvg >= 0.0.16" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -29819,9 +29950,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "esvg >= 0.0.16" 2>&1`
++	        SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "esvg >= 0.0.16" 2>&1`
+         else
+-	        SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "esvg >= 0.0.16" 2>&1`
++	        SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "esvg >= 0.0.16" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SVG_PKG_ERRORS" >&5
+@@ -32793,6 +32924,7 @@ if test -n "$VALGRIND_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind >= 2.4.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -32809,6 +32941,7 @@ if test -n "$VALGRIND_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind >= 2.4.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -32828,9 +32961,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "valgrind >= 2.4.0" 2>&1`
++	        VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind >= 2.4.0" 2>&1`
+         else
+-	        VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors "valgrind >= 2.4.0" 2>&1`
++	        VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind >= 2.4.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$VALGRIND_PKG_ERRORS" >&5
+@@ -32914,6 +33047,7 @@ if test -n "$ECORE_EVAS_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ECORE_EVAS_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas ecore" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -32930,6 +33064,7 @@ if test -n "$ECORE_EVAS_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ECORE_EVAS_LIBS=`$PKG_CONFIG --libs "ecore-evas ecore" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -32949,9 +33084,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas ecore" 2>&1`
++	        ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-evas ecore" 2>&1`
+         else
+-	        ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas ecore" 2>&1`
++	        ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-evas ecore" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ECORE_EVAS_PKG_ERRORS" >&5
+@@ -32983,6 +33118,7 @@ if test -n "$EDJE_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags "edje" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -32999,6 +33135,7 @@ if test -n "$EDJE_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs "edje" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -33018,9 +33155,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "edje" 2>&1`
++	        EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "edje" 2>&1`
+         else
+-	        EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors "edje" 2>&1`
++	        EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "edje" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EDJE_PKG_ERRORS" >&5
+@@ -33097,6 +33234,7 @@ if test -n "$CHECK_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -33113,6 +33251,7 @@ if test -n "$CHECK_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -33132,9 +33271,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1`
++	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.5" 2>&1`
+         else
+-	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1`
++	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.5" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CHECK_PKG_ERRORS" >&5
+@@ -33222,7 +33361,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_have_lcov="yes"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -33413,6 +33552,14 @@ LIBOBJS=$ac_libobjs
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
++$as_echo_n "checking that generated files are newer than configure... " >&6; }
++   if test -n "$am_sleep_pid"; then
++     # Hide warnings about reused PIDs.
++     wait $am_sleep_pid 2>/dev/null
++   fi
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
++$as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+@@ -34136,16 +34283,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -34205,28 +34352,16 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -34248,7 +34383,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by evas $as_me 1.7.7, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -34314,10 +34449,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ evas config.status 1.7.7
+-configured by $0, generated by GNU Autoconf 2.68,
++configured by $0, generated by GNU Autoconf 2.69,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -34408,7 +34543,7 @@ fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   shift
+   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+   CONFIG_SHELL='$SHELL'
+@@ -35523,7 +35658,7 @@ $as_echo "$as_me: executing $ac_file com
  
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/mman.h>
- #include <fcntl.h>
+   case $ac_file$ac_mode in
+     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
++  # Older Autoconf quotes --file arguments for eval, but not when files
+   # are listed without --file.  Let's play safe and only enable the eval
+   # if we detect the quoting.
+   case $CONFIG_FILES in
+@@ -35536,7 +35671,7 @@ $as_echo "$as_me: executing $ac_file com
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named `Makefile.in', but
++    # We used to match only the files named 'Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -35570,21 +35705,19 @@ $as_echo X"$mf" |
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running `make'.
++    # from the Makefile without running 'make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-    test -z "am__include" && continue
++    test -z "$am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-    # When using ansi2knr, U may be empty or an underscore; expand it
+-    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`$as_dirname -- "$file" ||
diff --git a/graphics/evas/patches/patch-configure.ac b/graphics/evas/patches/patch-configure.ac
index 1225ef4dae1..8b86bca7687 100644
--- a/graphics/evas/patches/patch-configure.ac
+++ b/graphics/evas/patches/patch-configure.ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.3 2012/09/27 13:20:42 jperkin Exp $
+$NetBSD: patch-configure.ac,v 1.4 2013/06/16 18:56:05 sno Exp $
+
+Patch for solaris nice name
 
 --- configure.ac.orig	Thu Nov 17 03:25:24 2011
 +++ configure.ac	Thu Sep 27 13:04:34 2012
@@ -15,11 +17,3 @@ $NetBSD: patch-configure.ac,v 1.3 2012/09/27 13:20:42 jperkin Exp $
        ;;
  esac
  AC_SUBST(MODULE_ARCH)
-@@ -569,6 +572,7 @@
-    AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/mman.h>
- #include <fcntl.h>
diff --git a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c
index 5e07b74d72c..0cb0390560d 100644
--- a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c
+++ b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.2 2012/09/27 13:20:42 jperkin Exp $
+$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.3 2013/06/16 18:56:05 sno Exp $
+
+jperkin knows o.O (but didn't use pkglint)
 
 --- src/modules/loaders/psd/evas_image_load_psd.c.orig	2011-08-11 07:46:01.000000000 +0200
 +++ src/modules/loaders/psd/evas_image_load_psd.c	2011-12-27 15:15:11.097276116 +0100
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index abb1ecfc740..08c691e82c4 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2012/10/02 20:11:38 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/16 18:56:05 sno Exp $
 #
 
-DISTNAME=	embryo-1.1.0
+DISTNAME=	embryo-1.7.7
 CATEGORIES=	lang
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +10,9 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Embeddable Scripting Language
 
+# some potions of the code have a special license - but it's free, too
+LICENSE=	2-clause-bsd
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
diff --git a/lang/embryo/buildlink3.mk b/lang/embryo/buildlink3.mk
index 01950a5382b..3cdb34b3323 100644
--- a/lang/embryo/buildlink3.mk
+++ b/lang/embryo/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2011/12/05 17:17:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2013/06/16 18:56:05 sno Exp $
 
 BUILDLINK_TREE+=	embryo
 
 .if !defined(EMBRYO_BUILDLINK3_MK)
 EMBRYO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.embryo+=	embryo>=1.1.0
+BUILDLINK_API_DEPENDS.embryo+=	embryo>=1.7.7
 BUILDLINK_PKGSRCDIR.embryo?=	../../lang/embryo
 
 .include "../../devel/eina/buildlink3.mk"
diff --git a/lang/embryo/distinfo b/lang/embryo/distinfo
index a1ec00aef52..966a6e68e79 100644
--- a/lang/embryo/distinfo
+++ b/lang/embryo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2011/12/05 17:17:36 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/06/16 18:56:05 sno Exp $
 
-SHA1 (embryo-1.1.0.tar.bz2) = 02f5c2b882c973a539ed28094609264c4b6e9d9b
-RMD160 (embryo-1.1.0.tar.bz2) = ac8ec525b05e0875ea97f7dd655bd008e35f88b0
-Size (embryo-1.1.0.tar.bz2) = 443457 bytes
+SHA1 (embryo-1.7.7.tar.bz2) = 80b0efd5eff98f22dd6fa4107499475d8bb922d3
+RMD160 (embryo-1.7.7.tar.bz2) = 9b5e8af643554c92c783ec1ffea6e0fb88030416
+Size (embryo-1.7.7.tar.bz2) = 461222 bytes
diff --git a/sysutils/edbus/Makefile b/sysutils/edbus/Makefile
index 3b5b08d8b96..2ff94db2a17 100644
--- a/sysutils/edbus/Makefile
+++ b/sysutils/edbus/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/06/04 22:17:04 tron Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/16 18:56:05 sno Exp $
 #
 
-DISTNAME=	e_dbus-1.1.0
-PKGNAME=	edbus-1.1.0
-PKGREVISION=	5
+DISTNAME=	e_dbus-1.7.7
+PKGNAME=	edbus-1.7.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.enlightenment.org/
 COMMENT=	Convenience wrappers around dbus to ease integrating dbus with E17
+LICENSE=	2-clause-bsd
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/sysutils/edbus/PLIST b/sysutils/edbus/PLIST
index eae8becb212..5e61e4231d8 100644
--- a/sysutils/edbus/PLIST
+++ b/sysutils/edbus/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/05 17:41:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/16 18:56:05 sno Exp $
 bin/e-notify-send
+bin/e_dbus_async_client_test
+bin/e_dbus_async_server_test
 bin/e_dbus_bluez_test
 bin/e_dbus_connman0_7x_test
 bin/e_dbus_notification_daemon
diff --git a/sysutils/edbus/buildlink3.mk b/sysutils/edbus/buildlink3.mk
index fbb094337de..5f989114940 100644
--- a/sysutils/edbus/buildlink3.mk
+++ b/sysutils/edbus/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:17:04 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2013/06/16 18:56:05 sno Exp $
 
 BUILDLINK_TREE+=	edbus
 
 .if !defined(EDBUS_BUILDLINK3_MK)
 EDBUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.edbus+=	edbus>=1.1.0
-BUILDLINK_ABI_DEPENDS.edbus?=	edbus>=1.1.0nb5
+BUILDLINK_API_DEPENDS.edbus+=	edbus>=1.7.7
+BUILDLINK_ABI_DEPENDS.edbus?=	edbus>=1.7.7
 BUILDLINK_PKGSRCDIR.edbus?=	../../sysutils/edbus
 
 .include "../../devel/ecore/buildlink3.mk"
diff --git a/sysutils/edbus/distinfo b/sysutils/edbus/distinfo
index 4f7460e324d..be17a15ac4f 100644
--- a/sysutils/edbus/distinfo
+++ b/sysutils/edbus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/12/05 17:41:22 joerg Exp $
+$NetBSD: distinfo,v 1.2 2013/06/16 18:56:05 sno Exp $
 
-SHA1 (e_dbus-1.1.0.tar.bz2) = 470ff956279fe8e26f86df5dff14d649e533550b
-RMD160 (e_dbus-1.1.0.tar.bz2) = 6e2390a3432a09ff07e6fe6080b2a7fd83dce7e9
-Size (e_dbus-1.1.0.tar.bz2) = 404269 bytes
+SHA1 (e_dbus-1.7.7.tar.bz2) = 24b4b26e7d0c9dd6f75a597db055ceb44a355738
+RMD160 (e_dbus-1.7.7.tar.bz2) = 027cc808378c93343c125d649a5890e2a3605981
+Size (e_dbus-1.7.7.tar.bz2) = 436665 bytes
diff --git a/sysutils/efreet/Makefile b/sysutils/efreet/Makefile
index bae8c8d22c4..5bec39e13b3 100644
--- a/sysutils/efreet/Makefile
+++ b/sysutils/efreet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2013/06/04 22:17:04 tron Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/16 18:56:05 sno Exp $
 #
 
-DISTNAME=	efreet-1.1.0
-PKGREVISION=	5
+DISTNAME=	efreet-1.7.7
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Interface Abstraction Library and Toolset
-
 LICENSE=	2-clause-bsd
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/efreet/PLIST b/sysutils/efreet/PLIST
index 809e9731b5a..ae07f71f194 100644
--- a/sysutils/efreet/PLIST
+++ b/sysutils/efreet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/05 17:38:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/16 18:56:05 sno Exp $
 bin/efreet_alloc
 bin/efreet_cache_test
 bin/efreet_icon_cache_dump
@@ -36,3 +36,17 @@ share/efreet/test/test.menu
 share/efreet/test/test_garbage
 share/efreet/test/test_menu_slash_bad.menu
 share/efreet/test/test_type.desktop
+share/locale/cs/LC_MESSAGES/efreet.mo
+share/locale/de/LC_MESSAGES/efreet.mo
+share/locale/el/LC_MESSAGES/efreet.mo
+share/locale/eo/LC_MESSAGES/efreet.mo
+share/locale/es/LC_MESSAGES/efreet.mo
+share/locale/fr/LC_MESSAGES/efreet.mo
+share/locale/it/LC_MESSAGES/efreet.mo
+share/locale/ja/LC_MESSAGES/efreet.mo
+share/locale/ko/LC_MESSAGES/efreet.mo
+share/locale/nl/LC_MESSAGES/efreet.mo
+share/locale/pt/LC_MESSAGES/efreet.mo
+share/locale/ru/LC_MESSAGES/efreet.mo
+share/locale/sl/LC_MESSAGES/efreet.mo
+share/locale/zh_CN/LC_MESSAGES/efreet.mo
diff --git a/sysutils/efreet/buildlink3.mk b/sysutils/efreet/buildlink3.mk
index 2b562536fa9..463c6be00be 100644
--- a/sysutils/efreet/buildlink3.mk
+++ b/sysutils/efreet/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2013/06/04 22:17:04 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2013/06/16 18:56:05 sno Exp $
 
 BUILDLINK_TREE+=	efreet
 
 .if !defined(EFREET_BUILDLINK3_MK)
 EFREET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.efreet+=	efreet>=1.1.0
-BUILDLINK_ABI_DEPENDS.efreet?=	efreet>=1.1.0nb5
+BUILDLINK_API_DEPENDS.efreet+=	efreet>=1.7.7
+BUILDLINK_ABI_DEPENDS.efreet?=	efreet>=1.7.7
 BUILDLINK_PKGSRCDIR.efreet?=	../../sysutils/efreet
 
 .include        "../../devel/ecore/buildlink3.mk"
diff --git a/sysutils/efreet/distinfo b/sysutils/efreet/distinfo
index ea19e316273..6d842e9fbd5 100644
--- a/sysutils/efreet/distinfo
+++ b/sysutils/efreet/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/12/05 17:38:21 joerg Exp $
+$NetBSD: distinfo,v 1.2 2013/06/16 18:56:05 sno Exp $
 
-SHA1 (efreet-1.1.0.tar.bz2) = 91c0558c80281ec64ece9deb260fa1c435b41b18
-RMD160 (efreet-1.1.0.tar.bz2) = c49e81628fbd9c531cc0b6d01e220f8d66f1ccf4
-Size (efreet-1.1.0.tar.bz2) = 388933 bytes
-SHA1 (patch-aa) = 26268fbd11f9d0c92ea2bd186c2e14609e92ba39
-SHA1 (patch-ac) = f6c79c3d0b44e76a276e09ef0f1aeea8550f98d6
+SHA1 (efreet-1.7.7.tar.bz2) = af31d42b24e83d41a8f2481fc4d501bd52f85bec
+RMD160 (efreet-1.7.7.tar.bz2) = d0485fe1a9ffa2e6a6eca74b1b0cf2b7ca9679f7
+Size (efreet-1.7.7.tar.bz2) = 445232 bytes
diff --git a/x11/Makefile b/x11/Makefile
index bb099a05e38..ee92be81812 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.698 2013/06/06 03:35:23 rodent Exp $
+# $NetBSD: Makefile,v 1.699 2013/06/16 18:56:04 sno Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -48,6 +48,9 @@ SUBDIR+=	editres
 SUBDIR+=	eekboard
 SUBDIR+=	efltk
 SUBDIR+=	egtk
+SUBDIR+=	elementary
+SUBDIR+=	elementary-icon-theme
+SUBDIR+=	enligthenment
 SUBDIR+=	eterm
 SUBDIR+=	evieext
 SUBDIR+=	fast-user-switch-applet
diff --git a/x11/elementary-icon-theme/DESCR b/x11/elementary-icon-theme/DESCR
new file mode 100644
index 00000000000..cf1bc2add49
--- /dev/null
+++ b/x11/elementary-icon-theme/DESCR
@@ -0,0 +1 @@
+The elementary icons are designed to be simple and appealing.
diff --git a/x11/elementary-icon-theme/Makefile b/x11/elementary-icon-theme/Makefile
new file mode 100644
index 00000000000..9a7f53e41be
--- /dev/null
+++ b/x11/elementary-icon-theme/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2013/06/16 18:56:05 sno Exp $
+#
+
+DISTNAME=	elementary-icon-theme-3.0
+CATEGORIES=	graphics
+MASTER_SITES=	https://launchpad.net/elementaryicons/3.x/3.0/+download/
+DISTFILES=	elementary.tar.gz
+
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://elementaryos.org/docs/packaging/themes/elementary-icons
+COMMENT=	Simple and appealing Tango-styled icon theme
+LICENSE=	gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+# Needed for launchpad
+FETCH_USING=	curl
+
+WRKSRC=		${WRKDIR}/elementary
+NO_BUILD=	yes
+USE_LANGUAGES=	# none
+USE_TOOLS+=	pax
+
+do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons
+	cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${PREFIX}/share/icons/
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/elementary-icon-theme/PLIST b/x11/elementary-icon-theme/PLIST
new file mode 100644
index 00000000000..f931440cc87
--- /dev/null
+++ b/x11/elementary-icon-theme/PLIST
@@ -0,0 +1,2245 @@
+@comment $NetBSD: PLIST,v 1.1 2013/06/16 18:56:05 sno Exp $
+share/icons/.bzrignore
+share/icons/AUTHORS
+share/icons/CONTRIBUTORS
+share/icons/COPYING
+share/icons/actions/128/add.svg
+share/icons/actions/128/address-book-new.svg
+share/icons/actions/128/bookmark-new.svg
+share/icons/actions/128/browser-download.svg
+share/icons/actions/128/contact-new.svg
+share/icons/actions/128/document-export.svg
+share/icons/actions/128/document-import.svg
+share/icons/actions/128/document-new.svg
+share/icons/actions/128/document-open-recent.svg
+share/icons/actions/128/document-open.svg
+share/icons/actions/128/document-page-setup.svg
+share/icons/actions/128/document-revert.svg
+share/icons/actions/128/document-save.svg
+share/icons/actions/128/edit-copy.svg
+share/icons/actions/128/edit-delete.svg
+share/icons/actions/128/edit-redo.svg
+share/icons/actions/128/edit-undo.svg
+share/icons/actions/128/folder-new.svg
+share/icons/actions/128/help-about.svg
+share/icons/actions/128/help-contents.svg
+share/icons/actions/128/help-hint.svg
+share/icons/actions/128/help-info.svg
+share/icons/actions/128/list-add.svg
+share/icons/actions/128/list-remove.svg
+share/icons/actions/128/mail-forward.svg
+share/icons/actions/128/mail-reply-all.svg
+share/icons/actions/128/mail-reply-sender.svg
+share/icons/actions/128/media-import-audio-cd.svg
+share/icons/actions/128/media-optical-audio-new.svg
+share/icons/actions/128/media-playback-stop.svg
+share/icons/actions/128/media-record.svg
+share/icons/actions/128/object-inverse.svg
+share/icons/actions/128/process-stop.svg
+share/icons/actions/128/remove.svg
+share/icons/actions/128/tag-new.svg
+share/icons/actions/128/window-new.svg
+share/icons/actions/16/add.svg
+share/icons/actions/16/address-book-new.svg
+share/icons/actions/16/align-horizontal-center.svg
+share/icons/actions/16/align-horizontal-left.svg
+share/icons/actions/16/align-horizontal-right.svg
+share/icons/actions/16/align-vertical-bottom.svg
+share/icons/actions/16/align-vertical-center.svg
+share/icons/actions/16/align-vertical-top.svg
+share/icons/actions/16/appointment-new.svg
+share/icons/actions/16/bookmark-new.svg
+share/icons/actions/16/browser-download.svg
+share/icons/actions/16/call-start.svg
+share/icons/actions/16/contact-new.svg
+share/icons/actions/16/dialog-apply.svg
+share/icons/actions/16/dialog-cancel.svg
+share/icons/actions/16/dialog-close.svg
+share/icons/actions/16/dialog-no.svg
+share/icons/actions/16/dialog-ok.svg
+share/icons/actions/16/distribute-horizontal-right.svg
+share/icons/actions/16/distribute-vertical-bottom.svg
+share/icons/actions/16/distribute-vertical-top.svg
+share/icons/actions/16/document-export.svg
+share/icons/actions/16/document-import.svg
+share/icons/actions/16/document-new.svg
+share/icons/actions/16/document-open-recent.svg
+share/icons/actions/16/document-open.svg
+share/icons/actions/16/document-page-setup.svg
+share/icons/actions/16/document-print-preview.svg
+share/icons/actions/16/document-print.svg
+share/icons/actions/16/document-properties.svg
+share/icons/actions/16/document-revert.svg
+share/icons/actions/16/document-save.svg
+share/icons/actions/16/edit-copy.svg
+share/icons/actions/16/edit-delete.svg
+share/icons/actions/16/edit-find.svg
+share/icons/actions/16/edit-redo.svg
+share/icons/actions/16/edit-undo.svg
+share/icons/actions/16/edit.svg
+share/icons/actions/16/folder-new.svg
+share/icons/actions/16/format-text-none.svg
+share/icons/actions/16/go-bottom.svg
+share/icons/actions/16/go-down.svg
+share/icons/actions/16/go-first.svg
+share/icons/actions/16/go-home.svg
+share/icons/actions/16/go-last.svg
+share/icons/actions/16/go-next.svg
+share/icons/actions/16/go-previous.svg
+share/icons/actions/16/go-top.svg
+share/icons/actions/16/go-up.svg
+share/icons/actions/16/gtk-go-back-ltr.svg
+share/icons/actions/16/gtk-go-back-rtl.svg
+share/icons/actions/16/gtk-go-forward-ltr.svg
+share/icons/actions/16/gtk-go-forward-rtl.svg
+share/icons/actions/16/gtk-goto-first-ltr.svg
+share/icons/actions/16/gtk-goto-first-rtl.svg
+share/icons/actions/16/gtk-goto-last-ltr.svg
+share/icons/actions/16/gtk-goto-last-rtl.svg
+share/icons/actions/16/gtk-media-forward-ltr.svg
+share/icons/actions/16/gtk-media-forward-rtl.svg
+share/icons/actions/16/gtk-media-next-ltr.svg
+share/icons/actions/16/gtk-media-next-rtl.svg
+share/icons/actions/16/gtk-media-play-ltr.svg
+share/icons/actions/16/gtk-media-previous-ltr.svg
+share/icons/actions/16/gtk-media-previous-rtl.svg
+share/icons/actions/16/gtk-media-rewind-ltr.svg
+share/icons/actions/16/gtk-media-rewind-rtl.svg
+share/icons/actions/16/help-about.svg
+share/icons/actions/16/help-contents.svg
+share/icons/actions/16/help-hint.svg
+share/icons/actions/16/help-info.svg
+share/icons/actions/16/im-message-new.svg
+share/icons/actions/16/list-add.svg
+share/icons/actions/16/list-remove.svg
+share/icons/actions/16/mail-archive.svg
+share/icons/actions/16/mail-forward.svg
+share/icons/actions/16/mail-reply-all.svg
+share/icons/actions/16/mail-reply-sender.svg
+share/icons/actions/16/media-eject.svg
+share/icons/actions/16/media-import-audio-cd.svg
+share/icons/actions/16/media-playback-pause.svg
+share/icons/actions/16/media-playback-start.svg
+share/icons/actions/16/media-playback-stop.svg
+share/icons/actions/16/media-record.svg
+share/icons/actions/16/media-seek-backward.svg
+share/icons/actions/16/media-seek-forward.svg
+share/icons/actions/16/media-skip-backward.svg
+share/icons/actions/16/media-skip-forward.svg
+share/icons/actions/16/node-add.svg
+share/icons/actions/16/node-align-horizontal.svg
+share/icons/actions/16/node-align-vertical.svg
+share/icons/actions/16/node-break.svg
+share/icons/actions/16/node-cusp.svg
+share/icons/actions/16/node-delete-segment.svg
+share/icons/actions/16/node-delete.svg
+share/icons/actions/16/node-distribute-horizontal.svg
+share/icons/actions/16/node-distribute-vertical.svg
+share/icons/actions/16/node-insert.svg
+share/icons/actions/16/node-join-segment.svg
+share/icons/actions/16/node-join.svg
+share/icons/actions/16/node-smooth.svg
+share/icons/actions/16/node-symmetric.svg
+share/icons/actions/16/object-group.svg
+share/icons/actions/16/object-inverse.svg
+share/icons/actions/16/object-rotate-left.svg
+share/icons/actions/16/object-rotate-right.svg
+share/icons/actions/16/object-to-path.svg
+share/icons/actions/16/object-ungroup.svg
+share/icons/actions/16/package-available-locked.svg
+share/icons/actions/16/package-available.svg
+share/icons/actions/16/package-broken.svg
+share/icons/actions/16/package-downgrade.svg
+share/icons/actions/16/package-install.svg
+share/icons/actions/16/package-installed-locked.svg
+share/icons/actions/16/package-installed-outdated.svg
+share/icons/actions/16/package-installed-updated.svg
+share/icons/actions/16/package-new.svg
+share/icons/actions/16/package-purge.svg
+share/icons/actions/16/package-reinstall.svg
+share/icons/actions/16/package-remove.svg
+share/icons/actions/16/package-upgrade.svg
+share/icons/actions/16/panel-searchtool.svg
+share/icons/actions/16/process-stop.svg
+share/icons/actions/16/remove.svg
+share/icons/actions/16/segment-curve.svg
+share/icons/actions/16/segment-line.svg
+share/icons/actions/16/selection-break.svg
+share/icons/actions/16/selection-combine.svg
+share/icons/actions/16/selection-exclude.svg
+share/icons/actions/16/stroke-to-path.svg
+share/icons/actions/16/system-lock-screen.svg
+share/icons/actions/16/system-log-out.svg
+share/icons/actions/16/system-search.svg
+share/icons/actions/16/tab-new.svg
+share/icons/actions/16/tag-new.svg
+share/icons/actions/16/view-refresh.svg
+share/icons/actions/16/window-close.svg
+share/icons/actions/16/window-new.svg
+share/icons/actions/22/add.svg
+share/icons/actions/22/address-book-new.svg
+share/icons/actions/22/align-horizontal-center.svg
+share/icons/actions/22/align-horizontal-left.svg
+share/icons/actions/22/align-horizontal-right.svg
+share/icons/actions/22/align-vertical-bottom.svg
+share/icons/actions/22/align-vertical-center.svg
+share/icons/actions/22/align-vertical-top.svg
+share/icons/actions/22/appointment-new.svg
+share/icons/actions/22/bookmark-new.svg
+share/icons/actions/22/browser-download.svg
+share/icons/actions/22/contact-new.svg
+share/icons/actions/22/dialog-apply.svg
+share/icons/actions/22/dialog-cancel.svg
+share/icons/actions/22/dialog-close.svg
+share/icons/actions/22/dialog-no.svg
+share/icons/actions/22/dialog-ok.svg
+share/icons/actions/22/distribute-horizontal-left.svg
+share/icons/actions/22/distribute-horizontal-right.svg
+share/icons/actions/22/distribute-vertical-bottom.svg
+share/icons/actions/22/distribute-vertical-center.svg
+share/icons/actions/22/distribute-vertical-top.svg
+share/icons/actions/22/document-export.svg
+share/icons/actions/22/document-import.svg
+share/icons/actions/22/document-new.svg
+share/icons/actions/22/document-open-recent.svg
+share/icons/actions/22/document-open.svg
+share/icons/actions/22/document-page-setup.svg
+share/icons/actions/22/document-print-preview.svg
+share/icons/actions/22/document-print.svg
+share/icons/actions/22/document-properties.svg
+share/icons/actions/22/document-revert.svg
+share/icons/actions/22/document-save-as.svg
+share/icons/actions/22/document-save.svg
+share/icons/actions/22/edit-copy.svg
+share/icons/actions/22/edit-delete.svg
+share/icons/actions/22/edit-find-replace.svg
+share/icons/actions/22/edit-find.svg
+share/icons/actions/22/edit-redo.svg
+share/icons/actions/22/edit-select-all.svg
+share/icons/actions/22/edit-undo.svg
+share/icons/actions/22/edit.svg
+share/icons/actions/22/folder-new.svg
+share/icons/actions/22/gnome-searchtool.svg
+share/icons/actions/22/go-bottom.svg
+share/icons/actions/22/go-down.svg
+share/icons/actions/22/go-first.svg
+share/icons/actions/22/go-home.svg
+share/icons/actions/22/go-jump.svg
+share/icons/actions/22/go-last.svg
+share/icons/actions/22/go-next.svg
+share/icons/actions/22/go-previous.svg
+share/icons/actions/22/go-top.svg
+share/icons/actions/22/go-up.svg
+share/icons/actions/22/gtk-go-back-ltr.svg
+share/icons/actions/22/gtk-go-back-rtl.svg
+share/icons/actions/22/gtk-go-forward-ltr.svg
+share/icons/actions/22/gtk-go-forward-rtl.svg
+share/icons/actions/22/gtk-goto-first-ltr.svg
+share/icons/actions/22/gtk-goto-first-rtl.svg
+share/icons/actions/22/gtk-goto-last-ltr.svg
+share/icons/actions/22/gtk-goto-last-rtl.svg
+share/icons/actions/22/gtk-media-play-ltr.svg
+share/icons/actions/22/help-about.svg
+share/icons/actions/22/help-contents.svg
+share/icons/actions/22/help-hint.svg
+share/icons/actions/22/help-info.svg
+share/icons/actions/22/im-message-new.svg
+share/icons/actions/22/list-add.svg
+share/icons/actions/22/list-remove.svg
+share/icons/actions/22/mail-archive.svg
+share/icons/actions/22/mail-forward-all.svg
+share/icons/actions/22/mail-forward.svg
+share/icons/actions/22/mail-message-new.svg
+share/icons/actions/22/mail-reply-all.svg
+share/icons/actions/22/mail-reply-sender.svg
+share/icons/actions/22/media-eject.svg
+share/icons/actions/22/media-import-audio-cd.svg
+share/icons/actions/22/media-playback-start.svg
+share/icons/actions/22/media-playback-stop.svg
+share/icons/actions/22/media-record.svg
+share/icons/actions/22/node-add.svg
+share/icons/actions/22/node-align-horizontal.svg
+share/icons/actions/22/node-align-vertical.svg
+share/icons/actions/22/node-break.svg
+share/icons/actions/22/node-curve.svg
+share/icons/actions/22/node-cusp.svg
+share/icons/actions/22/node-delete-segment.svg
+share/icons/actions/22/node-delete.svg
+share/icons/actions/22/node-distribute-horizontal.svg
+share/icons/actions/22/node-distribute-vertical.png
+share/icons/actions/22/node-distribute-vertical.svg
+share/icons/actions/22/node-insert.svg
+share/icons/actions/22/node-join-segment.svg
+share/icons/actions/22/node-join.svg
+share/icons/actions/22/node-line.svg
+share/icons/actions/22/node-smooth.svg
+share/icons/actions/22/node-symmectric.svg
+share/icons/actions/22/node-symmetric.svg
+share/icons/actions/22/node-to-curve.svg
+share/icons/actions/22/object-flip-horizontal.svg
+share/icons/actions/22/object-flip-vertical.svg
+share/icons/actions/22/object-inverse.svg
+share/icons/actions/22/object-to-path.svg
+share/icons/actions/22/process-stop.svg
+share/icons/actions/22/remove.svg
+share/icons/actions/22/segment-curve.svg
+share/icons/actions/22/segment-line.svg
+share/icons/actions/22/selection-break.svg
+share/icons/actions/22/selection-exclude.svg
+share/icons/actions/22/selection-union.svg
+share/icons/actions/22/sleep.svg
+share/icons/actions/22/stroke-to-path.svg
+share/icons/actions/22/system-lock-screen.svg
+share/icons/actions/22/system-reboot.svg
+share/icons/actions/22/system-restart.svg
+share/icons/actions/22/system-search.svg
+share/icons/actions/22/system-upgrade.svg
+share/icons/actions/22/tab-new.svg
+share/icons/actions/22/tag-new.svg
+share/icons/actions/22/view-refresh.svg
+share/icons/actions/22/window-close.svg
+share/icons/actions/22/window-new.svg
+share/icons/actions/24/add.svg
+share/icons/actions/24/address-book-new.svg
+share/icons/actions/24/align-horizontal-center.svg
+share/icons/actions/24/align-horizontal-left.svg
+share/icons/actions/24/align-horizontal-right.svg
+share/icons/actions/24/appointment-new.svg
+share/icons/actions/24/bookmark-new.svg
+share/icons/actions/24/browser-download.svg
+share/icons/actions/24/contact-new.svg
+share/icons/actions/24/dialog-apply.svg
+share/icons/actions/24/dialog-cancel.svg
+share/icons/actions/24/dialog-close.svg
+share/icons/actions/24/dialog-ok.svg
+share/icons/actions/24/document-export.svg
+share/icons/actions/24/document-import.svg
+share/icons/actions/24/document-new.svg
+share/icons/actions/24/document-open-recent.svg
+share/icons/actions/24/document-open.svg
+share/icons/actions/24/document-page-setup.svg
+share/icons/actions/24/document-print-preview.svg
+share/icons/actions/24/document-print.svg
+share/icons/actions/24/document-properties.svg
+share/icons/actions/24/document-revert.svg
+share/icons/actions/24/document-save-as.svg
+share/icons/actions/24/document-save.svg
+share/icons/actions/24/edit-clear.svg
+share/icons/actions/24/edit-copy.svg
+share/icons/actions/24/edit-delete.svg
+share/icons/actions/24/edit-find-replace.svg
+share/icons/actions/24/edit-find.svg
+share/icons/actions/24/edit-flag.svg
+share/icons/actions/24/edit-mark.svg
+share/icons/actions/24/edit-redo.svg
+share/icons/actions/24/edit-select-all.svg
+share/icons/actions/24/edit-undo-archive.svg
+share/icons/actions/24/edit-undo.svg
+share/icons/actions/24/edit.svg
+share/icons/actions/24/event-new.svg
+share/icons/actions/24/folder-new.svg
+share/icons/actions/24/format-text-none.svg
+share/icons/actions/24/go-bottom.svg
+share/icons/actions/24/go-down.svg
+share/icons/actions/24/go-first.svg
+share/icons/actions/24/go-home.svg
+share/icons/actions/24/go-jump.svg
+share/icons/actions/24/go-last.svg
+share/icons/actions/24/go-next.svg
+share/icons/actions/24/go-previous.svg
+share/icons/actions/24/go-top.svg
+share/icons/actions/24/go-up.svg
+share/icons/actions/24/gtk-go-back-ltr.svg
+share/icons/actions/24/gtk-go-back-rtl.svg
+share/icons/actions/24/gtk-go-forward-ltr.svg
+share/icons/actions/24/gtk-go-forward-rtl.svg
+share/icons/actions/24/gtk-goto-first-ltr.svg
+share/icons/actions/24/gtk-goto-first-rtl.svg
+share/icons/actions/24/gtk-goto-last-ltr.svg
+share/icons/actions/24/gtk-goto-last-rtl.svg
+share/icons/actions/24/gtk-jump-to-ltr.svg
+share/icons/actions/24/gtk-jump-to-rtl.svg
+share/icons/actions/24/gtk-media-forward-ltr.svg
+share/icons/actions/24/gtk-media-forward-rtl.svg
+share/icons/actions/24/gtk-media-next-ltr.svg
+share/icons/actions/24/gtk-media-next-rtl.svg
+share/icons/actions/24/gtk-media-play-ltr.svg
+share/icons/actions/24/gtk-media-previous-ltr.svg
+share/icons/actions/24/gtk-media-previous-rtl.svg
+share/icons/actions/24/gtk-media-rewind-ltr.svg
+share/icons/actions/24/gtk-media-rewind-rtl.svg
+share/icons/actions/24/gtk-redo-ltr.svg
+share/icons/actions/24/gtk-redo-rtl.svg
+share/icons/actions/24/gtk-undo-ltr.svg
+share/icons/actions/24/gtk-undo-rtl.svg
+share/icons/actions/24/help-about.svg
+share/icons/actions/24/help-contents.svg
+share/icons/actions/24/help-hint.svg
+share/icons/actions/24/help-info.svg
+share/icons/actions/24/im-message-new.svg
+share/icons/actions/24/jockey-proprietary.svg
+share/icons/actions/24/list-add.svg
+share/icons/actions/24/list-remove.svg
+share/icons/actions/24/mail-archive.svg
+share/icons/actions/24/mail-forward.svg
+share/icons/actions/24/mail-message-new.svg
+share/icons/actions/24/mail-move.svg
+share/icons/actions/24/mail-reply-all.svg
+share/icons/actions/24/mail-reply-sender.svg
+share/icons/actions/24/mail-send-receive.svg
+share/icons/actions/24/media-eject.svg
+share/icons/actions/24/media-import-audio-cd.svg
+share/icons/actions/24/media-playback-pause.svg
+share/icons/actions/24/media-playback-start.svg
+share/icons/actions/24/media-playback-stop.svg
+share/icons/actions/24/media-record.svg
+share/icons/actions/24/media-seek-backward.svg
+share/icons/actions/24/media-seek-forward.svg
+share/icons/actions/24/media-skip-backward.svg
+share/icons/actions/24/media-skip-forward.svg
+share/icons/actions/24/object-flip-horizontal.svg
+share/icons/actions/24/object-flip-vertical.svg
+share/icons/actions/24/object-inverse.svg
+share/icons/actions/24/object-rotate-left.svg
+share/icons/actions/24/object-rotate-right.svg
+share/icons/actions/24/process-stop.svg
+share/icons/actions/24/remove.svg
+share/icons/actions/24/system-lock-screen.svg
+share/icons/actions/24/system-log-out.svg
+share/icons/actions/24/system-reboot.svg
+share/icons/actions/24/system-restart.svg
+share/icons/actions/24/system-run.svg
+share/icons/actions/24/system-search.svg
+share/icons/actions/24/system-upgrade.svg
+share/icons/actions/24/tab-new.svg
+share/icons/actions/24/tag-new.svg
+share/icons/actions/24/view-refresh.svg
+share/icons/actions/24/window-close.svg
+share/icons/actions/24/window-new.svg
+share/icons/actions/32/add.svg
+share/icons/actions/32/address-book-new.svg
+share/icons/actions/32/bookmark-new.svg
+share/icons/actions/32/browser-download.svg
+share/icons/actions/32/contact-new.svg
+share/icons/actions/32/document-export.svg
+share/icons/actions/32/document-import.svg
+share/icons/actions/32/document-new.svg
+share/icons/actions/32/document-open-recent.svg
+share/icons/actions/32/document-open.svg
+share/icons/actions/32/document-page-setup.svg
+share/icons/actions/32/document-properties.svg
+share/icons/actions/32/document-revert.svg
+share/icons/actions/32/document-save.svg
+share/icons/actions/32/edit-copy.svg
+share/icons/actions/32/edit-delete.svg
+share/icons/actions/32/edit-redo.svg
+share/icons/actions/32/edit-undo.svg
+share/icons/actions/32/folder-new.svg
+share/icons/actions/32/help-about.svg
+share/icons/actions/32/help-contents.svg
+share/icons/actions/32/help-info.svg
+share/icons/actions/32/list-add.svg
+share/icons/actions/32/list-remove.svg
+share/icons/actions/32/mail-forward.svg
+share/icons/actions/32/mail-reply-all.svg
+share/icons/actions/32/mail-reply-sender.svg
+share/icons/actions/32/media-import-audio-cd.svg
+share/icons/actions/32/media-playback-stop.svg
+share/icons/actions/32/media-record.svg
+share/icons/actions/32/object-inverse.svg
+share/icons/actions/32/playlist-new.svg
+share/icons/actions/32/process-stop.svg
+share/icons/actions/32/remove.svg
+share/icons/actions/32/system-lock-screen.svg
+share/icons/actions/32/system-log-out.svg
+share/icons/actions/32/system-reboot.svg
+share/icons/actions/32/system-restart.svg
+share/icons/actions/32/system-upgrade.svg
+share/icons/actions/32/tag-new.svg
+share/icons/actions/32/view-refresh.svg
+share/icons/actions/32/window-new.svg
+share/icons/actions/48/add.svg
+share/icons/actions/48/address-book-insert.svg
+share/icons/actions/48/address-book-new.svg
+share/icons/actions/48/appointment-new.svg
+share/icons/actions/48/bookmark-new.svg
+share/icons/actions/48/browser-download.svg
+share/icons/actions/48/contact-new.svg
+share/icons/actions/48/dialog-apply.svg
+share/icons/actions/48/dialog-cancel.svg
+share/icons/actions/48/dialog-close.svg
+share/icons/actions/48/dialog-no.svg
+share/icons/actions/48/dialog-ok-apply.svg
+share/icons/actions/48/dialog-ok.svg
+share/icons/actions/48/document-export.svg
+share/icons/actions/48/document-import.svg
+share/icons/actions/48/document-new.svg
+share/icons/actions/48/document-open-recent.svg
+share/icons/actions/48/document-open.svg
+share/icons/actions/48/document-page-setup.svg
+share/icons/actions/48/document-print-preview.svg
+share/icons/actions/48/document-print.svg
+share/icons/actions/48/document-properties.svg
+share/icons/actions/48/document-revert.svg
+share/icons/actions/48/document-save.svg
+share/icons/actions/48/edit-clear.svg
+share/icons/actions/48/edit-copy.svg
+share/icons/actions/48/edit-delete.svg
+share/icons/actions/48/edit-find-replace.svg
+share/icons/actions/48/edit-find.svg
+share/icons/actions/48/edit-redo.svg
+share/icons/actions/48/edit-select-all.svg
+share/icons/actions/48/edit-undo.svg
+share/icons/actions/48/edit.svg
+share/icons/actions/48/folder-new.svg
+share/icons/actions/48/go-bottom.svg
+share/icons/actions/48/go-down.svg
+share/icons/actions/48/go-first.svg
+share/icons/actions/48/go-home.svg
+share/icons/actions/48/go-jump.svg
+share/icons/actions/48/go-last.svg
+share/icons/actions/48/go-next.svg
+share/icons/actions/48/go-previous.svg
+share/icons/actions/48/go-top.svg
+share/icons/actions/48/go-up.svg
+share/icons/actions/48/help-about.svg
+share/icons/actions/48/help-contents.svg
+share/icons/actions/48/help-hint.svg
+share/icons/actions/48/help-info.svg
+share/icons/actions/48/im-message-new.svg
+share/icons/actions/48/list-add.svg
+share/icons/actions/48/list-remove.svg
+share/icons/actions/48/mail-forward.svg
+share/icons/actions/48/mail-mark-important.svg
+share/icons/actions/48/mail-reply-all.svg
+share/icons/actions/48/mail-reply-sender.svg
+share/icons/actions/48/mail-send-receive.svg
+share/icons/actions/48/media-eject.svg
+share/icons/actions/48/media-import-audio-cd.svg
+share/icons/actions/48/media-playback-pause.svg
+share/icons/actions/48/media-playback-start.svg
+share/icons/actions/48/media-playback-stop.svg
+share/icons/actions/48/media-record.svg
+share/icons/actions/48/media-seek-backward.svg
+share/icons/actions/48/media-seek-forward.svg
+share/icons/actions/48/media-skip-backward.svg
+share/icons/actions/48/media-skip-forward.svg
+share/icons/actions/48/object-inverse.svg
+share/icons/actions/48/object-rotate-left.svg
+share/icons/actions/48/object-rotate-right.svg
+share/icons/actions/48/object-rotate.svg
+share/icons/actions/48/process-stop.svg
+share/icons/actions/48/remove.svg
+share/icons/actions/48/system-lock-screen.svg
+share/icons/actions/48/system-log-out.svg
+share/icons/actions/48/system-reboot.svg
+share/icons/actions/48/system-restart.svg
+share/icons/actions/48/system-run.svg
+share/icons/actions/48/system-search.svg
+share/icons/actions/48/system-shutdown.svg
+share/icons/actions/48/system-upgrade.svg
+share/icons/actions/48/tab-new.svg
+share/icons/actions/48/tag-new.svg
+share/icons/actions/48/transform-rotate.svg
+share/icons/actions/48/view-refresh.svg
+share/icons/actions/48/window-close.svg
+share/icons/actions/48/window-new.svg
+share/icons/actions/64/add.svg
+share/icons/actions/64/address-book-new.svg
+share/icons/actions/64/bookmark-new.svg
+share/icons/actions/64/browser-download.svg
+share/icons/actions/64/contact-new.svg
+share/icons/actions/64/document-export.svg
+share/icons/actions/64/document-import.svg
+share/icons/actions/64/document-new.svg
+share/icons/actions/64/document-open-recent.svg
+share/icons/actions/64/document-open.svg
+share/icons/actions/64/document-page-setup.svg
+share/icons/actions/64/document-properties.svg
+share/icons/actions/64/document-revert.svg
+share/icons/actions/64/document-save.svg
+share/icons/actions/64/edit-copy.svg
+share/icons/actions/64/edit-delete.svg
+share/icons/actions/64/edit-redo.svg
+share/icons/actions/64/edit-undo.svg
+share/icons/actions/64/folder-new.svg
+share/icons/actions/64/go-down.svg
+share/icons/actions/64/help-about.svg
+share/icons/actions/64/help-contents.svg
+share/icons/actions/64/help-hint.svg
+share/icons/actions/64/help-info.svg
+share/icons/actions/64/list-add.svg
+share/icons/actions/64/list-remove.svg
+share/icons/actions/64/mail-forward.svg
+share/icons/actions/64/mail-reply-all.svg
+share/icons/actions/64/mail-reply-sender.svg
+share/icons/actions/64/media-import-audio-cd.svg
+share/icons/actions/64/media-playback-stop.svg
+share/icons/actions/64/media-record.svg
+share/icons/actions/64/object-inverse.svg
+share/icons/actions/64/process-stop.svg
+share/icons/actions/64/remove.svg
+share/icons/actions/64/tag-new.svg
+share/icons/actions/64/window-new.svg
+share/icons/actions/symbolic/browser-download-symbolic.svg
+share/icons/actions/symbolic/call-end-symbolic.svg
+share/icons/actions/symbolic/call-start-symbolic.svg
+share/icons/actions/symbolic/contact-new-symbolic.svg
+share/icons/actions/symbolic/document-export-symbolic.svg
+share/icons/actions/symbolic/document-print-symbolic.svg
+share/icons/actions/symbolic/document-properties-symbolic.svg
+share/icons/actions/symbolic/edit-clear-rtl-symbolic.svg
+share/icons/actions/symbolic/edit-clear-symbolic.svg
+share/icons/actions/symbolic/edit-delete-symbolic.svg
+share/icons/actions/symbolic/edit-find-symbolic.svg
+share/icons/actions/symbolic/edit-redo-symbolic.svg
+share/icons/actions/symbolic/edit-undo-symbolic.svg
+share/icons/actions/symbolic/format-indent-less-rtl-symbolic.svg
+share/icons/actions/symbolic/format-indent-less-symbolic.svg
+share/icons/actions/symbolic/format-indent-more-rtl-symbolic.svg
+share/icons/actions/symbolic/format-indent-more-symbolic.svg
+share/icons/actions/symbolic/format-justify-center-symbolic.svg
+share/icons/actions/symbolic/format-justify-fill-symbolic.svg
+share/icons/actions/symbolic/format-justify-left-symbolic.svg
+share/icons/actions/symbolic/format-justify-right-symbolic.svg
+share/icons/actions/symbolic/format-text-larger-symbolic.svg
+share/icons/actions/symbolic/format-text-smaller-symbolic.svg
+share/icons/actions/symbolic/go-bottom-symbolic.svg
+share/icons/actions/symbolic/go-down-symbolic.svg
+share/icons/actions/symbolic/go-first-symbolic.svg
+share/icons/actions/symbolic/go-home-symbolic.svg
+share/icons/actions/symbolic/go-jump-symbolic.svg
+share/icons/actions/symbolic/go-last-symbolic.svg
+share/icons/actions/symbolic/go-next-symbolic.svg
+share/icons/actions/symbolic/go-previous-symbolic.svg
+share/icons/actions/symbolic/go-top-symbolic.svg
+share/icons/actions/symbolic/go-up-symbolic.svg
+share/icons/actions/symbolic/help-info-symbolic.svg
+share/icons/actions/symbolic/image-crop-symbolic.svg
+share/icons/actions/symbolic/image-red-eye-symbolic.svg
+share/icons/actions/symbolic/insert-image-symbolic.svg
+share/icons/actions/symbolic/list-add-symbolic.svg
+share/icons/actions/symbolic/list-remove-symbolic.svg
+share/icons/actions/symbolic/mail-forward-symbolic.svg
+share/icons/actions/symbolic/mail-reply-sender-symbolic.svg
+share/icons/actions/symbolic/media-eject-symbolic.svg
+share/icons/actions/symbolic/media-eq-symbolic.svg
+share/icons/actions/symbolic/media-playback-pause-symbolic.svg
+share/icons/actions/symbolic/media-playback-start-symbolic.svg
+share/icons/actions/symbolic/media-seek-backward-symbolic.svg
+share/icons/actions/symbolic/media-seek-forward-symbolic.svg
+share/icons/actions/symbolic/media-skip-backward-symbolic.svg
+share/icons/actions/symbolic/media-skip-forward-symbolic.svg
+share/icons/actions/symbolic/pane-hide-symbolic.svg
+share/icons/actions/symbolic/pane-show-symbolic.svg
+share/icons/actions/symbolic/process-stop-symbolic.svg
+share/icons/actions/symbolic/system-devices-symbolic.svg
+share/icons/actions/symbolic/system-shutdown-symbolic.svg
+share/icons/actions/symbolic/view-column-symbolic.svg
+share/icons/actions/symbolic/view-coverflow-symbolic.svg
+share/icons/actions/symbolic/view-filter-symbolic.svg
+share/icons/actions/symbolic/view-fullscreen-symbolic.svg
+share/icons/actions/symbolic/view-grid-symbolic.svg
+share/icons/actions/symbolic/view-list-compact-symbolic.svg
+share/icons/actions/symbolic/view-list-images-symbolic.svg
+share/icons/actions/symbolic/view-list-symbolic.svg
+share/icons/actions/symbolic/view-list-video-symbolic.svg
+share/icons/actions/symbolic/view-refresh-symbolic.svg
+share/icons/actions/symbolic/view-restore-symbolic.svg
+share/icons/actions/symbolic/window-close-symbolic.svg
+share/icons/animations/22/nm-stage01-connecting01.svg
+share/icons/animations/22/nm-stage01-connecting02.svg
+share/icons/animations/22/nm-stage01-connecting03.svg
+share/icons/animations/22/nm-stage01-connecting04.svg
+share/icons/animations/22/nm-stage01-connecting05.svg
+share/icons/animations/22/nm-stage01-connecting06.svg
+share/icons/animations/22/nm-stage01-connecting07.svg
+share/icons/animations/22/nm-stage01-connecting08.svg
+share/icons/animations/22/nm-stage01-connecting09.svg
+share/icons/animations/22/nm-stage01-connecting10.svg
+share/icons/animations/22/nm-stage01-connecting11.svg
+share/icons/animations/22/nm-stage02-connecting01.svg
+share/icons/animations/22/nm-stage02-connecting02.svg
+share/icons/animations/22/nm-stage02-connecting03.svg
+share/icons/animations/22/nm-stage02-connecting04.svg
+share/icons/animations/22/nm-stage02-connecting05.svg
+share/icons/animations/22/nm-stage02-connecting06.svg
+share/icons/animations/22/nm-stage02-connecting07.svg
+share/icons/animations/22/nm-stage02-connecting08.svg
+share/icons/animations/22/nm-stage02-connecting09.svg
+share/icons/animations/22/nm-stage02-connecting10.svg
+share/icons/animations/22/nm-stage02-connecting11.svg
+share/icons/animations/22/nm-stage03-connecting01.svg
+share/icons/animations/22/nm-stage03-connecting02.svg
+share/icons/animations/22/nm-stage03-connecting03.svg
+share/icons/animations/22/nm-stage03-connecting04.svg
+share/icons/animations/22/nm-stage03-connecting05.svg
+share/icons/animations/22/nm-stage03-connecting06.svg
+share/icons/animations/22/nm-stage03-connecting07.svg
+share/icons/animations/22/nm-stage03-connecting08.svg
+share/icons/animations/22/nm-stage03-connecting09.svg
+share/icons/animations/22/nm-stage03-connecting10.svg
+share/icons/animations/22/nm-stage03-connecting11.svg
+share/icons/animations/22/nm-vpn-connecting01.svg
+share/icons/animations/22/nm-vpn-connecting02.svg
+share/icons/animations/22/nm-vpn-connecting03.svg
+share/icons/animations/22/nm-vpn-connecting04.svg
+share/icons/animations/22/nm-vpn-connecting05.svg
+share/icons/animations/22/nm-vpn-connecting06.svg
+share/icons/animations/22/nm-vpn-connecting07.svg
+share/icons/animations/22/nm-vpn-connecting08.svg
+share/icons/animations/22/nm-vpn-connecting09.svg
+share/icons/animations/22/nm-vpn-connecting10.svg
+share/icons/animations/22/nm-vpn-connecting11.svg
+share/icons/animations/24/nm-stage01-connecting01.svg
+share/icons/animations/24/nm-stage01-connecting02.svg
+share/icons/animations/24/nm-stage01-connecting03.svg
+share/icons/animations/24/nm-stage01-connecting04.svg
+share/icons/animations/24/nm-stage01-connecting05.svg
+share/icons/animations/24/nm-stage01-connecting06.svg
+share/icons/animations/24/nm-stage01-connecting07.svg
+share/icons/animations/24/nm-stage01-connecting08.svg
+share/icons/animations/24/nm-stage01-connecting09.svg
+share/icons/animations/24/nm-stage01-connecting10.svg
+share/icons/animations/24/nm-stage01-connecting11.svg
+share/icons/animations/24/nm-stage02-connecting01.svg
+share/icons/animations/24/nm-stage02-connecting02.svg
+share/icons/animations/24/nm-stage02-connecting03.svg
+share/icons/animations/24/nm-stage02-connecting04.svg
+share/icons/animations/24/nm-stage02-connecting05.svg
+share/icons/animations/24/nm-stage02-connecting06.svg
+share/icons/animations/24/nm-stage02-connecting07.svg
+share/icons/animations/24/nm-stage02-connecting08.svg
+share/icons/animations/24/nm-stage02-connecting09.svg
+share/icons/animations/24/nm-stage02-connecting10.svg
+share/icons/animations/24/nm-stage02-connecting11.svg
+share/icons/animations/24/nm-stage03-connecting01.svg
+share/icons/animations/24/nm-stage03-connecting02.svg
+share/icons/animations/24/nm-stage03-connecting03.svg
+share/icons/animations/24/nm-stage03-connecting04.svg
+share/icons/animations/24/nm-stage03-connecting05.svg
+share/icons/animations/24/nm-stage03-connecting06.svg
+share/icons/animations/24/nm-stage03-connecting07.svg
+share/icons/animations/24/nm-stage03-connecting08.svg
+share/icons/animations/24/nm-stage03-connecting09.svg
+share/icons/animations/24/nm-stage03-connecting10.svg
+share/icons/animations/24/nm-stage03-connecting11.svg
+share/icons/animations/24/nm-vpn-connecting01.svg
+share/icons/animations/24/nm-vpn-connecting02.svg
+share/icons/animations/24/nm-vpn-connecting03.svg
+share/icons/animations/24/nm-vpn-connecting04.svg
+share/icons/animations/24/nm-vpn-connecting05.svg
+share/icons/animations/24/nm-vpn-connecting06.svg
+share/icons/animations/24/nm-vpn-connecting07.svg
+share/icons/animations/24/nm-vpn-connecting08.svg
+share/icons/animations/24/nm-vpn-connecting09.svg
+share/icons/animations/24/nm-vpn-connecting10.svg
+share/icons/animations/24/nm-vpn-connecting11.svg
+share/icons/animations/24/nm-vpn-connecting12.svg
+share/icons/animations/24/nm-vpn-connecting13.svg
+share/icons/animations/24/nm-vpn-connecting14.svg
+share/icons/animations/48/pk-action-refresh-cache.svg
+share/icons/apps/128/accessories-dictionary.svg
+share/icons/apps/128/accessories-text-editor.svg
+share/icons/apps/128/application-default-icon.svg
+share/icons/apps/128/evince.svg
+share/icons/apps/128/facebook.svg
+share/icons/apps/128/help-browser.svg
+share/icons/apps/128/help.svg
+share/icons/apps/128/im-facebook.svg
+share/icons/apps/128/internet-mail.svg
+share/icons/apps/128/internet-news-reader.svg
+share/icons/apps/128/midori.svg
+share/icons/apps/128/multimedia-audio-player.svg
+share/icons/apps/128/multimedia-video-player.svg
+share/icons/apps/128/office-address-book.svg
+share/icons/apps/128/office-calendar.svg
+share/icons/apps/128/office-database.svg
+share/icons/apps/128/postscript-viewer.svg
+share/icons/apps/128/preferences-desktop.svg
+share/icons/apps/128/shotwell.svg
+share/icons/apps/128/softwarecenter.svg
+share/icons/apps/128/system-file-manager.svg
+share/icons/apps/128/system-software-installer.svg
+share/icons/apps/128/system-software-update.svg
+share/icons/apps/128/totem.svg
+share/icons/apps/128/twitter.svg
+share/icons/apps/128/ubiquity.svg
+share/icons/apps/128/utilities-system-monitor.svg
+share/icons/apps/128/utilities-terminal.svg
+share/icons/apps/16/accessories-calculator.svg
+share/icons/apps/16/accessories-dictionary.svg
+share/icons/apps/16/accessories-text-editor.svg
+share/icons/apps/16/application-default-icon.svg
+share/icons/apps/16/evince.svg
+share/icons/apps/16/facebook.svg
+share/icons/apps/16/flickr.svg
+share/icons/apps/16/help-browser.svg
+share/icons/apps/16/help.svg
+share/icons/apps/16/im-facebook.svg
+share/icons/apps/16/internet-mail.svg
+share/icons/apps/16/internet-news-reader.svg
+share/icons/apps/16/multimedia-audio-player.svg
+share/icons/apps/16/multimedia-video-player.svg
+share/icons/apps/16/office-address-book.svg
+share/icons/apps/16/office-calendar.svg
+share/icons/apps/16/office-database.svg
+share/icons/apps/16/postscript-viewer.svg
+share/icons/apps/16/shotwell.svg
+share/icons/apps/16/softwarecenter.svg
+share/icons/apps/16/system-file-manager.svg
+share/icons/apps/16/system-software-installer.svg
+share/icons/apps/16/system-software-update.svg
+share/icons/apps/16/system-users.svg
+share/icons/apps/16/totem.svg
+share/icons/apps/16/ubiquity.svg
+share/icons/apps/16/utilities-terminal.svg
+share/icons/apps/22/accessories-calculator.svg
+share/icons/apps/22/accessories-dictionary.svg
+share/icons/apps/22/accessories-text-editor.svg
+share/icons/apps/22/application-default-icon.svg
+share/icons/apps/22/bluetooth.svg
+share/icons/apps/22/evince.svg
+share/icons/apps/22/gmail.svg
+share/icons/apps/22/help-browser.svg
+share/icons/apps/22/help.svg
+share/icons/apps/22/internet-news-reader.svg
+share/icons/apps/22/multimedia-audio-player.svg
+share/icons/apps/22/office-address-book.svg
+share/icons/apps/22/office-calendar.svg
+share/icons/apps/22/office-database.svg
+share/icons/apps/22/postscript-viewer.svg
+share/icons/apps/22/softwarecenter.svg
+share/icons/apps/22/system-file-manager.svg
+share/icons/apps/22/system-software-installer.svg
+share/icons/apps/22/system-software-update.svg
+share/icons/apps/22/system-users.svg
+share/icons/apps/22/ubiquity.svg
+share/icons/apps/22/utilities-terminal.svg
+share/icons/apps/24/accessories-calculator.svg
+share/icons/apps/24/accessories-dictionary.svg
+share/icons/apps/24/accessories-text-editor.svg
+share/icons/apps/24/application-default-icon.svg
+share/icons/apps/24/bluetooth.svg
+share/icons/apps/24/evince.svg
+share/icons/apps/24/gmail.svg
+share/icons/apps/24/help-browser.svg
+share/icons/apps/24/help.svg
+share/icons/apps/24/hwbrowser.svg
+share/icons/apps/24/hwinfo.svg
+share/icons/apps/24/internet-news-reader.svg
+share/icons/apps/24/internet-web-browser.svg
+share/icons/apps/24/jockey.svg
+share/icons/apps/24/multimedia-audio-player.svg
+share/icons/apps/24/multimedia-video-player.svg
+share/icons/apps/24/office-address-book.svg
+share/icons/apps/24/office-calendar.svg
+share/icons/apps/24/office-database.svg
+share/icons/apps/24/postscript-viewer.svg
+share/icons/apps/24/software-properties.svg
+share/icons/apps/24/softwarecenter.svg
+share/icons/apps/24/system-file-manager.svg
+share/icons/apps/24/system-software-installer.svg
+share/icons/apps/24/system-software-update.svg
+share/icons/apps/24/system-users.svg
+share/icons/apps/24/totem.svg
+share/icons/apps/24/ubiquity.svg
+share/icons/apps/24/utilities-system-monitor.svg
+share/icons/apps/24/utilities-terminal.svg
+share/icons/apps/24/web-browser.svg
+share/icons/apps/32/accessories-dictionary.svg
+share/icons/apps/32/accessories-text-editor.svg
+share/icons/apps/32/application-default-icon.svg
+share/icons/apps/32/bluetooth.svg
+share/icons/apps/32/evince.svg
+share/icons/apps/32/help-browser.svg
+share/icons/apps/32/help.svg
+share/icons/apps/32/internet-mail.svg
+share/icons/apps/32/internet-news-reader.svg
+share/icons/apps/32/midori.svg
+share/icons/apps/32/multimedia-audio-player.svg
+share/icons/apps/32/multimedia-video-player.svg
+share/icons/apps/32/office-address-book.svg
+share/icons/apps/32/office-calendar.svg
+share/icons/apps/32/office-database.svg
+share/icons/apps/32/postscript-viewer.svg
+share/icons/apps/32/softwarecenter.svg
+share/icons/apps/32/system-file-manager.svg
+share/icons/apps/32/system-software-installer.svg
+share/icons/apps/32/system-software-update.svg
+share/icons/apps/32/system-users.svg
+share/icons/apps/32/totem.svg
+share/icons/apps/32/ubiquity.svg
+share/icons/apps/32/utilities-system-monitor.svg
+share/icons/apps/32/utilities-terminal.svg
+share/icons/apps/48/accessories-calculator.svg
+share/icons/apps/48/accessories-camera.svg
+share/icons/apps/48/accessories-dictionary.svg
+share/icons/apps/48/accessories-text-editor.svg
+share/icons/apps/48/applets-screenshooter.svg
+share/icons/apps/48/application-default-icon.svg
+share/icons/apps/48/apport.svg
+share/icons/apps/48/bluetooth.svg
+share/icons/apps/48/empathy.svg
+share/icons/apps/48/evince.svg
+share/icons/apps/48/facebook.svg
+share/icons/apps/48/gmail.svg
+share/icons/apps/48/google.svg
+share/icons/apps/48/help-browser.svg
+share/icons/apps/48/help.svg
+share/icons/apps/48/im-facebook.svg
+share/icons/apps/48/internet-chat.svg
+share/icons/apps/48/internet-mail.svg
+share/icons/apps/48/internet-news-reader.svg
+share/icons/apps/48/internet-web-browser.svg
+share/icons/apps/48/jockey.svg
+share/icons/apps/48/midori.svg
+share/icons/apps/48/multimedia-audio-player.svg
+share/icons/apps/48/multimedia-video-player.svg
+share/icons/apps/48/office-address-book.svg
+share/icons/apps/48/office-calendar.svg
+share/icons/apps/48/office-database.svg
+share/icons/apps/48/postscript-viewer.svg
+share/icons/apps/48/shotwell.svg
+share/icons/apps/48/software-properties.svg
+share/icons/apps/48/softwarecenter.svg
+share/icons/apps/48/system-file-manager.svg
+share/icons/apps/48/system-software-installer.svg
+share/icons/apps/48/system-software-update.svg
+share/icons/apps/48/system-users.svg
+share/icons/apps/48/totem.svg
+share/icons/apps/48/twitter.svg
+share/icons/apps/48/ubiquity.svg
+share/icons/apps/48/utilities-system-monitor.svg
+share/icons/apps/48/utilities-terminal.svg
+share/icons/apps/48/web-browser.svg
+share/icons/apps/64/accessories-calculator.svg
+share/icons/apps/64/accessories-camera.svg
+share/icons/apps/64/accessories-dictionary.svg
+share/icons/apps/64/accessories-text-editor.svg
+share/icons/apps/64/applets-screenshooter.svg
+share/icons/apps/64/application-default-icon.svg
+share/icons/apps/64/apport.svg
+share/icons/apps/64/empathy.svg
+share/icons/apps/64/evince.svg
+share/icons/apps/64/help-browser.svg
+share/icons/apps/64/help.svg
+share/icons/apps/64/internet-chat.svg
+share/icons/apps/64/internet-mail.svg
+share/icons/apps/64/internet-news-reader.svg
+share/icons/apps/64/midori.svg
+share/icons/apps/64/multimedia-audio-player.svg
+share/icons/apps/64/multimedia-video-player.svg
+share/icons/apps/64/office-address-book.svg
+share/icons/apps/64/office-calendar.svg
+share/icons/apps/64/postscript-viewer.svg
+share/icons/apps/64/preferences-desktop.svg
+share/icons/apps/64/shotwell.svg
+share/icons/apps/64/softwarecenter.svg
+share/icons/apps/64/system-file-manager.svg
+share/icons/apps/64/system-software-installer.svg
+share/icons/apps/64/system-software-update.svg
+share/icons/apps/64/system-users.svg
+share/icons/apps/64/totem.svg
+share/icons/apps/64/twitter.svg
+share/icons/apps/64/ubiquity.svg
+share/icons/apps/64/utilities-system-monitor.svg
+share/icons/apps/64/utilities-terminal.svg
+share/icons/apps/symbolic/facebook-symbolic.svg
+share/icons/apps/symbolic/preferences-desktop-accessibility-symbolic.svg
+share/icons/apps/symbolic/system-users-symbolic.svg
+share/icons/apps/symbolic/twitter-symbolic.svg
+share/icons/categories/128/preferences-desktop-accessibility.svg
+share/icons/categories/16/config-language.svg
+share/icons/categories/16/preferences-desktop-accessibility.svg
+share/icons/categories/16/preferences-desktop-effects.svg
+share/icons/categories/16/preferences-desktop-locale.svg
+share/icons/categories/16/preferences-desktop-sound.svg
+share/icons/categories/16/preferences-system-network.svg
+share/icons/categories/16/preferences-system-time.svg
+share/icons/categories/22/config-language.svg
+share/icons/categories/22/ppa.svg
+share/icons/categories/22/preferences-desktop-accessibility.svg
+share/icons/categories/22/preferences-desktop-effects.svg
+share/icons/categories/22/preferences-desktop-locale.svg
+share/icons/categories/22/preferences-desktop-sound.svg
+share/icons/categories/22/preferences-system-time.svg
+share/icons/categories/24/config-language.svg
+share/icons/categories/24/ppa.svg
+share/icons/categories/24/preferences-desktop-accessibility.svg
+share/icons/categories/24/preferences-desktop-locale.svg
+share/icons/categories/24/preferences-desktop-sound.svg
+share/icons/categories/24/preferences-system-time.svg
+share/icons/categories/32/activity-log-manager.svg
+share/icons/categories/32/config-language.svg
+share/icons/categories/32/preferences-desktop-accessibility.svg
+share/icons/categories/32/preferences-desktop-default-applications.svg
+share/icons/categories/32/preferences-desktop-display.svg
+share/icons/categories/32/preferences-desktop-keyboard.svg
+share/icons/categories/32/preferences-desktop-locale.svg
+share/icons/categories/32/preferences-desktop-notifications.svg
+share/icons/categories/32/preferences-desktop-peripherals.svg
+share/icons/categories/32/preferences-desktop-privacy.svg
+share/icons/categories/32/preferences-desktop-sound.svg
+share/icons/categories/32/preferences-desktop-wallpaper.svg
+share/icons/categories/32/preferences-system-network.svg
+share/icons/categories/32/preferences-system-power.svg
+share/icons/categories/32/preferences-system-session.svg
+share/icons/categories/32/preferences-system-time.svg
+share/icons/categories/48/activity-log-manager.svg
+share/icons/categories/48/application-community.svg
+share/icons/categories/48/applications-3D.svg
+share/icons/categories/48/applications-accessories.svg
+share/icons/categories/48/applications-arcade.svg
+share/icons/categories/48/applications-astronomy.svg
+share/icons/categories/48/applications-biology.svg
+share/icons/categories/48/applications-boardgames.svg
+share/icons/categories/48/applications-cardgames.svg
+share/icons/categories/48/applications-chat.svg
+share/icons/categories/48/applications-debugging.svg
+share/icons/categories/48/applications-development.svg
+share/icons/categories/48/applications-drawing.svg
+share/icons/categories/48/applications-education.svg
+share/icons/categories/48/applications-electronics.svg
+share/icons/categories/48/applications-engineering.svg
+share/icons/categories/48/applications-filesharing.svg
+share/icons/categories/48/applications-fonts.svg
+share/icons/categories/48/applications-games.svg
+share/icons/categories/48/applications-geography.svg
+share/icons/categories/48/applications-geology.svg
+share/icons/categories/48/applications-graphics.svg
+share/icons/categories/48/applications-haskell.svg
+share/icons/categories/48/applications-ide.svg
+share/icons/categories/48/applications-interfacedesign.svg
+share/icons/categories/48/applications-internet.svg
+share/icons/categories/48/applications-java.svg
+share/icons/categories/48/applications-libraries.svg
+share/icons/categories/48/applications-lisp.svg
+share/icons/categories/48/applications-mail.svg
+share/icons/categories/48/applications-mathematics.svg
+share/icons/categories/48/applications-monodevelopment.svg
+share/icons/categories/48/applications-multimedia.svg
+share/icons/categories/48/applications-ocaml.svg
+share/icons/categories/48/applications-office.svg
+share/icons/categories/48/applications-other.svg
+share/icons/categories/48/applications-painting.svg
+share/icons/categories/48/applications-perl.svg
+share/icons/categories/48/applications-photography.svg
+share/icons/categories/48/applications-physics.svg
+share/icons/categories/48/applications-profiling.svg
+share/icons/categories/48/applications-publishing.svg
+share/icons/categories/48/applications-puzzles.svg
+share/icons/categories/48/applications-python.svg
+share/icons/categories/48/applications-roleplaying.svg
+share/icons/categories/48/applications-ruby.svg
+share/icons/categories/48/applications-science.svg
+share/icons/categories/48/applications-simulation.svg
+share/icons/categories/48/applications-sports.svg
+share/icons/categories/48/applications-system.svg
+share/icons/categories/48/applications-utilities.svg
+share/icons/categories/48/applications-versioncontrol.svg
+share/icons/categories/48/applications-viewers.svg
+share/icons/categories/48/applications-webbrowsers.svg
+share/icons/categories/48/config-language.svg
+share/icons/categories/48/ppa.svg
+share/icons/categories/48/preferences-desktop-accessibility.svg
+share/icons/categories/48/preferences-desktop-locale.svg
+share/icons/categories/48/preferences-desktop-online-accounts.svg
+share/icons/categories/48/preferences-desktop-privacy.svg
+share/icons/categories/48/preferences-desktop-sound.svg
+share/icons/categories/48/preferences-desktop.svg
+share/icons/categories/48/preferences-system-network.svg
+share/icons/categories/48/preferences-system-power.svg
+share/icons/categories/48/preferences-system-time.svg
+share/icons/categories/48/system-help.svg
+share/icons/categories/64/ppa.svg
+share/icons/categories/64/preferences-desktop-accessibility.svg
+share/icons/categories/64/preferences-system-network.svg
+share/icons/devices/128/display.svg
+share/icons/devices/128/drive-cdrom.svg
+share/icons/devices/128/drive-harddisk.svg
+share/icons/devices/128/drive-optical.svg
+share/icons/devices/128/input-mouse.svg
+share/icons/devices/128/media-cdr.svg
+share/icons/devices/128/media-cdrom-audio.svg
+share/icons/devices/128/media-cdrom.svg
+share/icons/devices/128/media-cdrw.svg
+share/icons/devices/128/media-dvd.svg
+share/icons/devices/128/media-dvdrw.svg
+share/icons/devices/128/media-optical-audio.svg
+share/icons/devices/128/media-optical.svg
+share/icons/devices/128/monitor.svg
+share/icons/devices/128/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/128/multimedia-player-ipod-touch.svg
+share/icons/devices/128/phone.svg
+share/icons/devices/128/system.svg
+share/icons/devices/128/video-display.svg
+share/icons/devices/16/audio-input-microphone.svg
+share/icons/devices/16/display.svg
+share/icons/devices/16/drive-cdrom.svg
+share/icons/devices/16/drive-harddisk.svg
+share/icons/devices/16/drive-optical.svg
+share/icons/devices/16/input-mouse.svg
+share/icons/devices/16/media-cdr.svg
+share/icons/devices/16/media-cdrom-audio.svg
+share/icons/devices/16/media-cdrom.svg
+share/icons/devices/16/media-cdrw.svg
+share/icons/devices/16/media-dvd.svg
+share/icons/devices/16/media-dvdrw.svg
+share/icons/devices/16/media-optical-audio.svg
+share/icons/devices/16/media-optical.svg
+share/icons/devices/16/monitor.svg
+share/icons/devices/16/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/16/multimedia-player-apple-ipod.svg
+share/icons/devices/16/multimedia-player-ipod-touch.svg
+share/icons/devices/16/multimedia-player-ipod.svg
+share/icons/devices/16/multimedia-player.svg
+share/icons/devices/16/music-player.svg
+share/icons/devices/16/phone-motorola-droid.svg
+share/icons/devices/16/phone.svg
+share/icons/devices/16/system.svg
+share/icons/devices/16/video-display.svg
+share/icons/devices/22/audio-input-microphone.svg
+share/icons/devices/22/camera-photo.svg
+share/icons/devices/22/camera.svg
+share/icons/devices/22/display.svg
+share/icons/devices/22/drive-cdrom.svg
+share/icons/devices/22/drive-harddisk.svg
+share/icons/devices/22/drive-optical.svg
+share/icons/devices/22/input-mouse.svg
+share/icons/devices/22/media-cdr.svg
+share/icons/devices/22/media-cdrom-audio.svg
+share/icons/devices/22/media-cdrom.svg
+share/icons/devices/22/media-cdrw.svg
+share/icons/devices/22/media-dvd.svg
+share/icons/devices/22/media-dvdrw.svg
+share/icons/devices/22/media-optical-audio.svg
+share/icons/devices/22/media-optical.svg
+share/icons/devices/22/monitor.svg
+share/icons/devices/22/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/22/multimedia-player-ipod-touch.svg
+share/icons/devices/22/phone-motorola-droid.svg
+share/icons/devices/22/phone.svg
+share/icons/devices/22/system.svg
+share/icons/devices/22/video-display.svg
+share/icons/devices/24/audio-input-microphone.svg
+share/icons/devices/24/battery.svg
+share/icons/devices/24/camera-photo.svg
+share/icons/devices/24/camera.svg
+share/icons/devices/24/display.svg
+share/icons/devices/24/drive-cdrom.svg
+share/icons/devices/24/drive-harddisk.svg
+share/icons/devices/24/drive-optical.svg
+share/icons/devices/24/drive-removable-media-ieee1394.svg
+share/icons/devices/24/drive-removable-media-usb.svg
+share/icons/devices/24/drive-removable-media.svg
+share/icons/devices/24/input-mouse.svg
+share/icons/devices/24/media-cdr.svg
+share/icons/devices/24/media-cdrom-audio.svg
+share/icons/devices/24/media-cdrom.svg
+share/icons/devices/24/media-cdrw.svg
+share/icons/devices/24/media-dvd.svg
+share/icons/devices/24/media-dvdrw.svg
+share/icons/devices/24/media-optical-audio.svg
+share/icons/devices/24/media-optical.svg
+share/icons/devices/24/monitor.svg
+share/icons/devices/24/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/24/multimedia-player-apple-ipod.svg
+share/icons/devices/24/multimedia-player-ipod-touch.svg
+share/icons/devices/24/multimedia-player-ipod.svg
+share/icons/devices/24/multimedia-player.svg
+share/icons/devices/24/music-player.svg
+share/icons/devices/24/phone-motorola-droid.svg
+share/icons/devices/24/phone.svg
+share/icons/devices/24/printer.svg
+share/icons/devices/24/system.svg
+share/icons/devices/24/video-display.svg
+share/icons/devices/32/display.svg
+share/icons/devices/32/drive-cdrom.svg
+share/icons/devices/32/drive-harddisk.svg
+share/icons/devices/32/drive-optical.svg
+share/icons/devices/32/input-mouse.svg
+share/icons/devices/32/media-cdr.svg
+share/icons/devices/32/media-cdrom-audio.svg
+share/icons/devices/32/media-cdrom.svg
+share/icons/devices/32/media-cdrw.svg
+share/icons/devices/32/media-dvd.svg
+share/icons/devices/32/media-dvdrw.svg
+share/icons/devices/32/media-optical-audio.svg
+share/icons/devices/32/media-optical.svg
+share/icons/devices/32/monitor.svg
+share/icons/devices/32/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/32/multimedia-player-ipod-touch.svg
+share/icons/devices/32/phone-motorola-droid.svg
+share/icons/devices/32/phone.svg
+share/icons/devices/32/system.svg
+share/icons/devices/32/video-display.svg
+share/icons/devices/48/audio-card.svg
+share/icons/devices/48/audio-input-microphone.svg
+share/icons/devices/48/battery.svg
+share/icons/devices/48/camera-photo.svg
+share/icons/devices/48/camera.svg
+share/icons/devices/48/display.svg
+share/icons/devices/48/drive-cdrom.svg
+share/icons/devices/48/drive-harddisk-ieee1394.svg
+share/icons/devices/48/drive-harddisk-usb.svg
+share/icons/devices/48/drive-harddisk.svg
+share/icons/devices/48/drive-optical.svg
+share/icons/devices/48/drive-removable-media-ieee1394.svg
+share/icons/devices/48/drive-removable-media-usb.svg
+share/icons/devices/48/drive-removable-media.svg
+share/icons/devices/48/gnome-dev-pcmcia.svg
+share/icons/devices/48/gnome-dev-printer-new.svg
+share/icons/devices/48/input-mouse.svg
+share/icons/devices/48/media-cdr.svg
+share/icons/devices/48/media-cdrom-audio.svg
+share/icons/devices/48/media-cdrom.svg
+share/icons/devices/48/media-cdrw.svg
+share/icons/devices/48/media-dvd.svg
+share/icons/devices/48/media-dvdrw.svg
+share/icons/devices/48/media-flash-cf.svg
+share/icons/devices/48/media-flash-ms.svg
+share/icons/devices/48/media-flash.svg
+share/icons/devices/48/media-memory-sd.svg
+share/icons/devices/48/media-memory-sm.svg
+share/icons/devices/48/media-memory.svg
+share/icons/devices/48/media-optical-audio.svg
+share/icons/devices/48/media-optical.svg
+share/icons/devices/48/monitor.svg
+share/icons/devices/48/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/48/multimedia-player-apple-ipod.svg
+share/icons/devices/48/multimedia-player-ipod-touch.svg
+share/icons/devices/48/multimedia-player-ipod.svg
+share/icons/devices/48/multimedia-player.svg
+share/icons/devices/48/music-player.svg
+share/icons/devices/48/pda.svg
+share/icons/devices/48/phone-motorola-droid.svg
+share/icons/devices/48/phone.svg
+share/icons/devices/48/printer-remote.svg
+share/icons/devices/48/printer.svg
+share/icons/devices/48/processor.svg
+share/icons/devices/48/system.svg
+share/icons/devices/48/video-display.svg
+share/icons/devices/64/camera-photo.svg
+share/icons/devices/64/camera.svg
+share/icons/devices/64/display.svg
+share/icons/devices/64/drive-cdrom.svg
+share/icons/devices/64/drive-harddisk.svg
+share/icons/devices/64/drive-optical.svg
+share/icons/devices/64/input-mouse.svg
+share/icons/devices/64/media-cdr.svg
+share/icons/devices/64/media-cdrom-audio.svg
+share/icons/devices/64/media-cdrom.svg
+share/icons/devices/64/media-cdrw.svg
+share/icons/devices/64/media-dvd.svg
+share/icons/devices/64/media-dvdrw.svg
+share/icons/devices/64/media-optical-audio.svg
+share/icons/devices/64/media-optical.svg
+share/icons/devices/64/monitor.svg
+share/icons/devices/64/multimedia-player-apple-ipod-touch.svg
+share/icons/devices/64/multimedia-player-ipod-touch.svg
+share/icons/devices/64/phone-motorola-droid.svg
+share/icons/devices/64/phone.svg
+share/icons/devices/64/processor.svg
+share/icons/devices/64/system.svg
+share/icons/devices/64/video-display.svg
+share/icons/devices/symbolic/camera-photo-symbolic.svg
+share/icons/devices/symbolic/camera-video-symbolic.svg
+share/icons/devices/symbolic/drive-harddisk-symbolic.svg
+share/icons/devices/symbolic/phone-symbolic.svg
+share/icons/devices/symbolic/printer-symbolic.svg
+share/icons/emblems/24/emblem-symbolic-link.svg
+share/icons/emblems/24/emblem-synchronizing.svg
+share/icons/emblems/48/emblem-readonly.svg
+share/icons/emblems/48/emblem-symbolic-link.svg
+share/icons/emblems/48/emblem-unreadable.svg
+share/icons/emblems/symbolic/emblem-synchronizing-symbolic.svg
+share/icons/emotes/16/face-angel.svg
+share/icons/emotes/16/face-angry.svg
+share/icons/emotes/16/face-cool.svg
+share/icons/emotes/16/face-crying.svg
+share/icons/emotes/16/face-devilish.svg
+share/icons/emotes/16/face-heart-broken.svg
+share/icons/emotes/16/face-heart.svg
+share/icons/emotes/16/face-kiss.svg
+share/icons/emotes/16/face-laugh.svg
+share/icons/emotes/16/face-plain.svg
+share/icons/emotes/16/face-raspberry-squint.svg
+share/icons/emotes/16/face-raspberry-wink.svg
+share/icons/emotes/16/face-raspberry.svg
+share/icons/emotes/16/face-sad.svg
+share/icons/emotes/16/face-sick.svg
+share/icons/emotes/16/face-smile-big-squint.svg
+share/icons/emotes/16/face-smile-big.svg
+share/icons/emotes/16/face-smile-crying.svg
+share/icons/emotes/16/face-smile.svg
+share/icons/emotes/16/face-surprise.svg
+share/icons/emotes/16/face-tired.svg
+share/icons/emotes/16/face-uncertain.svg
+share/icons/emotes/16/face-wink.svg
+share/icons/emotes/16/face-worried.svg
+share/icons/index.theme
+share/icons/mimes/128/application-atom+xml.svg
+share/icons/mimes/128/application-illustrator.svg
+share/icons/mimes/128/application-rss+xml.svg
+share/icons/mimes/128/application-rtf.svg
+share/icons/mimes/128/application-vnd.ms-excel.svg
+share/icons/mimes/128/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/128/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.svg
+share/icons/mimes/128/application-vnd.sun.xml.writer.svg
+share/icons/mimes/128/application-vnd.wordperfect.svg
+share/icons/mimes/128/application-x-bittorrent.svg
+share/icons/mimes/128/application-x-cd-image.svg
+share/icons/mimes/128/application-x-deb.svg
+share/icons/mimes/128/application-x-desktop.svg
+share/icons/mimes/128/application-x-executable.svg
+share/icons/mimes/128/application-x-flash-video.svg
+share/icons/mimes/128/application-x-gnome-theme-package.svg
+share/icons/mimes/128/application-x-ms-dos-executable.svg
+share/icons/mimes/128/application-x-msi.svg
+share/icons/mimes/128/application-x-python-bytecode.svg
+share/icons/mimes/128/application-x-shockwave-flash.svg
+share/icons/mimes/128/application-x-theme.svg
+share/icons/mimes/128/audio-mpeg.svg
+share/icons/mimes/128/audio-x-generic.svg
+share/icons/mimes/128/binary.svg
+share/icons/mimes/128/document.svg
+share/icons/mimes/128/empty.svg
+share/icons/mimes/128/exec.svg
+share/icons/mimes/128/internet-feed.svg
+share/icons/mimes/128/office-contact.svg
+share/icons/mimes/128/office-document.svg
+share/icons/mimes/128/package-x-generic.svg
+share/icons/mimes/128/playlist.svg
+share/icons/mimes/128/text-directory.svg
+share/icons/mimes/128/text-enriched.svg
+share/icons/mimes/128/text-plain.svg
+share/icons/mimes/128/text-richtext.svg
+share/icons/mimes/128/text-x-copying.svg
+share/icons/mimes/128/text-x-generic.svg
+share/icons/mimes/128/text-x-install.svg
+share/icons/mimes/128/text-x-preview.svg
+share/icons/mimes/128/text.svg
+share/icons/mimes/128/vcard.svg
+share/icons/mimes/128/wordprocessing.svg
+share/icons/mimes/128/x-office-address-book.svg
+share/icons/mimes/128/x-office-document.svg
+share/icons/mimes/16/application-epub+zip.svg
+share/icons/mimes/16/application-illustrator.svg
+share/icons/mimes/16/application-msword.svg
+share/icons/mimes/16/application-octet-stream.svg
+share/icons/mimes/16/application-pdf.svg
+share/icons/mimes/16/application-rtf.svg
+share/icons/mimes/16/application-vnd.ms-access.svg
+share/icons/mimes/16/application-vnd.ms-excel.svg
+share/icons/mimes/16/application-vnd.ms-powerpoint.svg
+share/icons/mimes/16/application-vnd.oasis.opendocument.chart.svg
+share/icons/mimes/16/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/16/application-vnd.rn-realmedia.svg
+share/icons/mimes/16/application-vnd.sun.xml.writer.svg
+share/icons/mimes/16/application-vnd.wordperfect.svg
+share/icons/mimes/16/application-x-bittorrent.svg
+share/icons/mimes/16/application-x-cd-image.svg
+share/icons/mimes/16/application-x-deb.svg
+share/icons/mimes/16/application-x-desktop.svg
+share/icons/mimes/16/application-x-executable.svg
+share/icons/mimes/16/application-x-flash-video.svg
+share/icons/mimes/16/application-x-gnome-theme-package.svg
+share/icons/mimes/16/application-x-m4.svg
+share/icons/mimes/16/application-x-matroska.svg
+share/icons/mimes/16/application-x-ms-dos-executable.svg
+share/icons/mimes/16/application-x-msi.svg
+share/icons/mimes/16/application-x-python-bytecode.svg
+share/icons/mimes/16/application-x-shellscript.svg
+share/icons/mimes/16/application-x-shockwave-flash.svg
+share/icons/mimes/16/application-x-theme.svg
+share/icons/mimes/16/audio-mpeg.svg
+share/icons/mimes/16/audio-x-generic.svg
+share/icons/mimes/16/authors.svg
+share/icons/mimes/16/binary.svg
+share/icons/mimes/16/document.svg
+share/icons/mimes/16/empty.svg
+share/icons/mimes/16/exec.svg
+share/icons/mimes/16/extension.svg
+share/icons/mimes/16/image-x-xcf.svg
+share/icons/mimes/16/internet-feed.svg
+share/icons/mimes/16/media-video.svg
+share/icons/mimes/16/office-contact.svg
+share/icons/mimes/16/office-document.svg
+share/icons/mimes/16/playlist-automatic.svg
+share/icons/mimes/16/playlist.svg
+share/icons/mimes/16/shellscript.svg
+share/icons/mimes/16/text-css.svg
+share/icons/mimes/16/text-directory.svg
+share/icons/mimes/16/text-enriched.svg
+share/icons/mimes/16/text-html.svg
+share/icons/mimes/16/text-plain.svg
+share/icons/mimes/16/text-richtext.svg
+share/icons/mimes/16/text-x-authors.svg
+share/icons/mimes/16/text-x-c++.svg
+share/icons/mimes/16/text-x-copying.svg
+share/icons/mimes/16/text-x-csharp.svg
+share/icons/mimes/16/text-x-generic-template.svg
+share/icons/mimes/16/text-x-generic.svg
+share/icons/mimes/16/text-x-install.svg
+share/icons/mimes/16/text-x-makefile.svg
+share/icons/mimes/16/text-x-preview.svg
+share/icons/mimes/16/text-x-readme.svg
+share/icons/mimes/16/text-x-script.svg
+share/icons/mimes/16/text-x-source.svg
+share/icons/mimes/16/text.svg
+share/icons/mimes/16/vcard.svg
+share/icons/mimes/16/video-x-generic.svg
+share/icons/mimes/16/wordprocessing.svg
+share/icons/mimes/16/x-office-address-book.svg
+share/icons/mimes/16/x-office-document-template.svg
+share/icons/mimes/16/x-office-document.svg
+share/icons/mimes/16/x-office-drawing-template.svg
+share/icons/mimes/16/x-office-presentation-template.svg
+share/icons/mimes/16/x-office-presentation.svg
+share/icons/mimes/16/x-office-spreadsheet-template.svg
+share/icons/mimes/16/x-office-spreadsheet.svg
+share/icons/mimes/22/application-rtf.svg
+share/icons/mimes/22/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/22/application-vnd.sun.xml.writer.svg
+share/icons/mimes/22/application-vnd.wordperfect.svg
+share/icons/mimes/22/application-x-bittorrent.svg
+share/icons/mimes/22/application-x-cd-image.svg
+share/icons/mimes/22/application-x-deb.svg
+share/icons/mimes/22/application-x-desktop.svg
+share/icons/mimes/22/application-x-executable.svg
+share/icons/mimes/22/application-x-flash-video.svg
+share/icons/mimes/22/application-x-gnome-theme-package.svg
+share/icons/mimes/22/application-x-ms-dos-executable.svg
+share/icons/mimes/22/application-x-msi.svg
+share/icons/mimes/22/application-x-python-bytecode.svg
+share/icons/mimes/22/application-x-shockwave-flash.svg
+share/icons/mimes/22/application-x-theme.svg
+share/icons/mimes/22/audio-mpeg.svg
+share/icons/mimes/22/audio-x-generic.svg
+share/icons/mimes/22/binary.svg
+share/icons/mimes/22/document.svg
+share/icons/mimes/22/empty.svg
+share/icons/mimes/22/exec.svg
+share/icons/mimes/22/office-contact.svg
+share/icons/mimes/22/office-document.svg
+share/icons/mimes/22/playlist.svg
+share/icons/mimes/22/text-directory.svg
+share/icons/mimes/22/text-enriched.svg
+share/icons/mimes/22/text-plain.svg
+share/icons/mimes/22/text-richtext.svg
+share/icons/mimes/22/text-x-copying.svg
+share/icons/mimes/22/text-x-generic.svg
+share/icons/mimes/22/text-x-install.svg
+share/icons/mimes/22/text-x-preview.svg
+share/icons/mimes/22/text.svg
+share/icons/mimes/22/vcard.svg
+share/icons/mimes/22/wordprocessing.svg
+share/icons/mimes/22/x-office-address-book.svg
+share/icons/mimes/22/x-office-document.svg
+share/icons/mimes/24/application-epub+zip.svg
+share/icons/mimes/24/application-illustrator.svg
+share/icons/mimes/24/application-msword.svg
+share/icons/mimes/24/application-rtf.svg
+share/icons/mimes/24/application-vnd.ms-access.svg
+share/icons/mimes/24/application-vnd.ms-excel.svg
+share/icons/mimes/24/application-vnd.ms-powerpoint.svg
+share/icons/mimes/24/application-vnd.oasis.opendocument.chart.svg
+share/icons/mimes/24/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/24/application-vnd.sun.xml.writer.svg
+share/icons/mimes/24/application-vnd.wordperfect.svg
+share/icons/mimes/24/application-x-bittorrent.svg
+share/icons/mimes/24/application-x-cd-image.svg
+share/icons/mimes/24/application-x-deb.svg
+share/icons/mimes/24/application-x-desktop.svg
+share/icons/mimes/24/application-x-executable.svg
+share/icons/mimes/24/application-x-flash-video.svg
+share/icons/mimes/24/application-x-gnome-theme-package.svg
+share/icons/mimes/24/application-x-ms-dos-executable.svg
+share/icons/mimes/24/application-x-msi.svg
+share/icons/mimes/24/application-x-python-bytecode.svg
+share/icons/mimes/24/application-x-shockwave-flash.svg
+share/icons/mimes/24/application-x-theme.svg
+share/icons/mimes/24/audio-mpeg.svg
+share/icons/mimes/24/audio-x-generic.svg
+share/icons/mimes/24/binary.svg
+share/icons/mimes/24/document.svg
+share/icons/mimes/24/empty.svg
+share/icons/mimes/24/exec.svg
+share/icons/mimes/24/image-x-generic.svg
+share/icons/mimes/24/image.svg
+share/icons/mimes/24/office-contact.svg
+share/icons/mimes/24/office-document.svg
+share/icons/mimes/24/playlist.svg
+share/icons/mimes/24/text-directory.svg
+share/icons/mimes/24/text-enriched.svg
+share/icons/mimes/24/text-html.svg
+share/icons/mimes/24/text-plain.svg
+share/icons/mimes/24/text-richtext.svg
+share/icons/mimes/24/text-x-copying.svg
+share/icons/mimes/24/text-x-generic.svg
+share/icons/mimes/24/text-x-install.svg
+share/icons/mimes/24/text-x-preview.svg
+share/icons/mimes/24/text-x-readme.svg
+share/icons/mimes/24/text.svg
+share/icons/mimes/24/unknown.svg
+share/icons/mimes/24/vcard.svg
+share/icons/mimes/24/wordprocessing.svg
+share/icons/mimes/24/x-office-address-book.svg
+share/icons/mimes/24/x-office-document-template.svg
+share/icons/mimes/24/x-office-document.svg
+share/icons/mimes/24/x-office-drawing-template.svg
+share/icons/mimes/24/x-office-drawing.svg
+share/icons/mimes/24/x-office-presentation-template.svg
+share/icons/mimes/24/x-office-presentation.svg
+share/icons/mimes/24/x-office-spreadsheet-template.svg
+share/icons/mimes/24/x-office-spreadsheet.svg
+share/icons/mimes/32/application-epub+zip.svg
+share/icons/mimes/32/application-illustrator.svg
+share/icons/mimes/32/application-msword.svg
+share/icons/mimes/32/application-rss+xml.svg
+share/icons/mimes/32/application-rtf.svg
+share/icons/mimes/32/application-vnd.ms-access.svg
+share/icons/mimes/32/application-vnd.ms-excel.svg
+share/icons/mimes/32/application-vnd.ms-powerpoint.svg
+share/icons/mimes/32/application-vnd.oasis.opendocument.chart.svg
+share/icons/mimes/32/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/32/application-vnd.sun.xml.writer.svg
+share/icons/mimes/32/application-vnd.wordperfect.svg
+share/icons/mimes/32/application-x-bittorrent.svg
+share/icons/mimes/32/application-x-cd-image.svg
+share/icons/mimes/32/application-x-deb.svg
+share/icons/mimes/32/application-x-desktop.svg
+share/icons/mimes/32/application-x-executable.svg
+share/icons/mimes/32/application-x-flash-video.svg
+share/icons/mimes/32/application-x-gnome-theme-package.svg
+share/icons/mimes/32/application-x-ms-dos-executable.svg
+share/icons/mimes/32/application-x-msi.svg
+share/icons/mimes/32/application-x-python-bytecode.svg
+share/icons/mimes/32/application-x-shockwave-flash.svg
+share/icons/mimes/32/application-x-theme.svg
+share/icons/mimes/32/audio-mpeg.svg
+share/icons/mimes/32/audio-x-generic.svg
+share/icons/mimes/32/audio-x-smart-playlist.svg
+share/icons/mimes/32/binary.svg
+share/icons/mimes/32/document.svg
+share/icons/mimes/32/empty.svg
+share/icons/mimes/32/exec.svg
+share/icons/mimes/32/extension.svg
+share/icons/mimes/32/font-x-generic.svg
+share/icons/mimes/32/multipart-encrypted.svg
+share/icons/mimes/32/office-contact.svg
+share/icons/mimes/32/office-document.svg
+share/icons/mimes/32/package-x-generic.svg
+share/icons/mimes/32/playlist.svg
+share/icons/mimes/32/text-directory.svg
+share/icons/mimes/32/text-enriched.svg
+share/icons/mimes/32/text-html.svg
+share/icons/mimes/32/text-plain.svg
+share/icons/mimes/32/text-richtext.svg
+share/icons/mimes/32/text-x-copying.svg
+share/icons/mimes/32/text-x-generic.svg
+share/icons/mimes/32/text-x-install.svg
+share/icons/mimes/32/text-x-preview.svg
+share/icons/mimes/32/text-x-script.svg
+share/icons/mimes/32/text.svg
+share/icons/mimes/32/vcard.svg
+share/icons/mimes/32/wordprocessing.svg
+share/icons/mimes/32/x-office-address-book.svg
+share/icons/mimes/32/x-office-document-template.svg
+share/icons/mimes/32/x-office-document.svg
+share/icons/mimes/32/x-office-drawing-template.svg
+share/icons/mimes/32/x-office-drawing.svg
+share/icons/mimes/32/x-office-presentation-template.svg
+share/icons/mimes/32/x-office-presentation.svg
+share/icons/mimes/32/x-office-spreadsheet-template.svg
+share/icons/mimes/32/x-office-spreadsheet.svg
+share/icons/mimes/48/application-atom+xml.svg
+share/icons/mimes/48/application-epub+zip.svg
+share/icons/mimes/48/application-illustrator.svg
+share/icons/mimes/48/application-msword.svg
+share/icons/mimes/48/application-octet-stream.svg
+share/icons/mimes/48/application-pdf.svg
+share/icons/mimes/48/application-rss+xml.svg
+share/icons/mimes/48/application-rtf.svg
+share/icons/mimes/48/application-vnd.ms-access.svg
+share/icons/mimes/48/application-vnd.ms-excel.svg
+share/icons/mimes/48/application-vnd.ms-powerpoint.presentation.macroEnabled.12.svg
+share/icons/mimes/48/application-vnd.ms-powerpoint.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.chart.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.database.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.drawing.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.graphics.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.spreadsheet.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.text-web.svg
+share/icons/mimes/48/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/48/application-vnd.openxmlformats-officedocument.presentationml.presentation.svg
+share/icons/mimes/48/application-vnd.openxmlformats-officedocument.presentationml.slideshow.svg
+share/icons/mimes/48/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.svg
+share/icons/mimes/48/application-vnd.openxmlformats-officedocument.wordprocessingml.document.svg
+share/icons/mimes/48/application-vnd.rn-realmedia.svg
+share/icons/mimes/48/application-vnd.sun.xml.calc.svg
+share/icons/mimes/48/application-vnd.sun.xml.draw.svg
+share/icons/mimes/48/application-vnd.sun.xml.writer.svg
+share/icons/mimes/48/application-vnd.wordperfect.svg
+share/icons/mimes/48/application-x-bittorrent.svg
+share/icons/mimes/48/application-x-cd-image.svg
+share/icons/mimes/48/application-x-class-file.svg
+share/icons/mimes/48/application-x-csproj.svg
+share/icons/mimes/48/application-x-deb.svg
+share/icons/mimes/48/application-x-desktop.svg
+share/icons/mimes/48/application-x-executable.svg
+share/icons/mimes/48/application-x-flash-video.svg
+share/icons/mimes/48/application-x-gnome-theme-package.svg
+share/icons/mimes/48/application-x-gnumeric.svg
+share/icons/mimes/48/application-x-java.svg
+share/icons/mimes/48/application-x-javascript.svg
+share/icons/mimes/48/application-x-m4.svg
+share/icons/mimes/48/application-x-matroska.svg
+share/icons/mimes/48/application-x-ms-dos-executable.svg
+share/icons/mimes/48/application-x-msi.svg
+share/icons/mimes/48/application-x-object.svg
+share/icons/mimes/48/application-x-php.svg
+share/icons/mimes/48/application-x-python-bytecode.svg
+share/icons/mimes/48/application-x-shellscript.svg
+share/icons/mimes/48/application-x-shockwave-flash.svg
+share/icons/mimes/48/application-x-sln.svg
+share/icons/mimes/48/application-x-sqlite2.svg
+share/icons/mimes/48/application-x-sqlite3.svg
+share/icons/mimes/48/application-x-theme.svg
+share/icons/mimes/48/application-xml.svg
+share/icons/mimes/48/audio-mpeg.svg
+share/icons/mimes/48/audio-x-generic.svg
+share/icons/mimes/48/binary.svg
+share/icons/mimes/48/document.svg
+share/icons/mimes/48/empty.svg
+share/icons/mimes/48/exec.svg
+share/icons/mimes/48/extension.svg
+share/icons/mimes/48/font-x-generic.svg
+share/icons/mimes/48/html.svg
+share/icons/mimes/48/image-vnd.adobe.photoshop.svg
+share/icons/mimes/48/image-x-generic.svg
+share/icons/mimes/48/image-x-svg+xml.svg
+share/icons/mimes/48/image-x-xcf.svg
+share/icons/mimes/48/image.svg
+share/icons/mimes/48/internet-feed.svg
+share/icons/mimes/48/libpeas-plugin.svg
+share/icons/mimes/48/media-video.svg
+share/icons/mimes/48/office-contact.svg
+share/icons/mimes/48/office-database.svg
+share/icons/mimes/48/office-document.svg
+share/icons/mimes/48/office-illustration.svg
+share/icons/mimes/48/office-spreadsheet.svg
+share/icons/mimes/48/package-x-generic.svg
+share/icons/mimes/48/playlist-automatic.svg
+share/icons/mimes/48/playlist.svg
+share/icons/mimes/48/shellscript.svg
+share/icons/mimes/48/text-css.svg
+share/icons/mimes/48/text-directory.svg
+share/icons/mimes/48/text-enriched.svg
+share/icons/mimes/48/text-html.svg
+share/icons/mimes/48/text-htmlh.svg
+share/icons/mimes/48/text-plain.svg
+share/icons/mimes/48/text-richtext.svg
+share/icons/mimes/48/text-spreadsheet.svg
+share/icons/mimes/48/text-x-authors.svg
+share/icons/mimes/48/text-x-c++.svg
+share/icons/mimes/48/text-x-c++src.svg
+share/icons/mimes/48/text-x-changelog.svg
+share/icons/mimes/48/text-x-chdr.svg
+share/icons/mimes/48/text-x-copying.svg
+share/icons/mimes/48/text-x-credits.svg
+share/icons/mimes/48/text-x-csharp.svg
+share/icons/mimes/48/text-x-csrc.svg
+share/icons/mimes/48/text-x-generic-template.svg
+share/icons/mimes/48/text-x-generic.svg
+share/icons/mimes/48/text-x-gtkrc.svg
+share/icons/mimes/48/text-x-install.svg
+share/icons/mimes/48/text-x-java-source.svg
+share/icons/mimes/48/text-x-java.svg
+share/icons/mimes/48/text-x-javascript.svg
+share/icons/mimes/48/text-x-makefile.svg
+share/icons/mimes/48/text-x-preview.svg
+share/icons/mimes/48/text-x-python.svg
+share/icons/mimes/48/text-x-readme.svg
+share/icons/mimes/48/text-x-script.svg
+share/icons/mimes/48/text-x-source.svg
+share/icons/mimes/48/text-x-sql.svg
+share/icons/mimes/48/text-x-vala.svg
+share/icons/mimes/48/text-xml.svg
+share/icons/mimes/48/text.svg
+share/icons/mimes/48/unknown.svg
+share/icons/mimes/48/vcalendar.svg
+share/icons/mimes/48/vcard.svg
+share/icons/mimes/48/video-x-generic.svg
+share/icons/mimes/48/wordprocessing.svg
+share/icons/mimes/48/www.svg
+share/icons/mimes/48/x-office-address-book.svg
+share/icons/mimes/48/x-office-calendar.svg
+share/icons/mimes/48/x-office-document-template.svg
+share/icons/mimes/48/x-office-document.svg
+share/icons/mimes/48/x-office-drawing-template.svg
+share/icons/mimes/48/x-office-drawing.svg
+share/icons/mimes/48/x-office-presentation-template.svg
+share/icons/mimes/48/x-office-presentation.svg
+share/icons/mimes/48/x-office-spreadsheet-template.svg
+share/icons/mimes/48/x-office-spreadsheet.svg
+share/icons/mimes/64/application-msword.svg
+share/icons/mimes/64/application-rtf.svg
+share/icons/mimes/64/application-vnd.ms-access.svg
+share/icons/mimes/64/application-vnd.oasis.opendocument.database.svg
+share/icons/mimes/64/application-vnd.oasis.opendocument.text.svg
+share/icons/mimes/64/application-vnd.openxmlformats-officedocument.wordprocessingml.document.svg
+share/icons/mimes/64/application-vnd.sun.xml.writer.svg
+share/icons/mimes/64/application-vnd.wordperfect.svg
+share/icons/mimes/64/application-x-bittorrent.svg
+share/icons/mimes/64/application-x-cd-image.svg
+share/icons/mimes/64/application-x-deb.svg
+share/icons/mimes/64/application-x-desktop.svg
+share/icons/mimes/64/application-x-executable.svg
+share/icons/mimes/64/application-x-flash-video.svg
+share/icons/mimes/64/application-x-gnome-theme-package.svg
+share/icons/mimes/64/application-x-m4.svg
+share/icons/mimes/64/application-x-ms-dos-executable.svg
+share/icons/mimes/64/application-x-msi.svg
+share/icons/mimes/64/application-x-python-bytecode.svg
+share/icons/mimes/64/application-x-shellscript.svg
+share/icons/mimes/64/application-x-shockwave-flash.svg
+share/icons/mimes/64/application-x-sqlite2.svg
+share/icons/mimes/64/application-x-sqlite3.svg
+share/icons/mimes/64/application-x-theme.svg
+share/icons/mimes/64/audio-mpeg.svg
+share/icons/mimes/64/audio-x-generic.svg
+share/icons/mimes/64/binary.svg
+share/icons/mimes/64/document.svg
+share/icons/mimes/64/empty.svg
+share/icons/mimes/64/exec.svg
+share/icons/mimes/64/office-contact.svg
+share/icons/mimes/64/office-database.svg
+share/icons/mimes/64/office-document.svg
+share/icons/mimes/64/package-x-generic.svg
+share/icons/mimes/64/playlist.svg
+share/icons/mimes/64/shellscript.svg
+share/icons/mimes/64/text-directory.svg
+share/icons/mimes/64/text-enriched.svg
+share/icons/mimes/64/text-plain.svg
+share/icons/mimes/64/text-richtext.svg
+share/icons/mimes/64/text-x-authors.svg
+share/icons/mimes/64/text-x-c++.svg
+share/icons/mimes/64/text-x-c++src.svg
+share/icons/mimes/64/text-x-copying.svg
+share/icons/mimes/64/text-x-csharp.svg
+share/icons/mimes/64/text-x-generic.svg
+share/icons/mimes/64/text-x-install.svg
+share/icons/mimes/64/text-x-preview.svg
+share/icons/mimes/64/text-x-script.svg
+share/icons/mimes/64/text-x-source.svg
+share/icons/mimes/64/text.svg
+share/icons/mimes/64/vcard.svg
+share/icons/mimes/64/wordprocessing.svg
+share/icons/mimes/64/x-office-address-book.svg
+share/icons/mimes/64/x-office-document.svg
+share/icons/mimes/symbolic/text-html-symbolic.svg
+share/icons/notifications/48/notification-device-eject.svg
+share/icons/notifications/48/notification-device-firewire.svg
+share/icons/notifications/48/notification-message-im.svg
+share/icons/notifications/48/notification-power-disconnected.svg
+share/icons/notifications/48/notification-wireless-disconnected.svg
+share/icons/panel/128/avatar-default.svg
+share/icons/panel/16/account-logged-in.svg
+share/icons/panel/16/applications-chat-panel.svg
+share/icons/panel/16/applications-email-panel.svg
+share/icons/panel/16/audio-volume-high-panel.svg
+share/icons/panel/16/audio-volume-low-panel.svg
+share/icons/panel/16/audio-volume-low-zero-panel.svg
+share/icons/panel/16/audio-volume-medium-panel.svg
+share/icons/panel/16/nm-signal-0-secure.svg
+share/icons/panel/16/nm-signal-0.svg
+share/icons/panel/16/nm-signal-00-secure.svg
+share/icons/panel/16/nm-signal-00.svg
+share/icons/panel/16/nm-signal-100-secure.svg
+share/icons/panel/16/nm-signal-100.svg
+share/icons/panel/16/nm-signal-25-secure.svg
+share/icons/panel/16/nm-signal-25.svg
+share/icons/panel/16/nm-signal-50-secure.svg
+share/icons/panel/16/nm-signal-50.svg
+share/icons/panel/16/nm-signal-75-secure.svg
+share/icons/panel/16/nm-signal-75.svg
+share/icons/panel/22/applications-email-panel.svg
+share/icons/panel/22/audio-output-none-panel.svg
+share/icons/panel/22/audio-volume-high-panel.svg
+share/icons/panel/22/audio-volume-low-panel.svg
+share/icons/panel/22/audio-volume-low-zero-panel.svg
+share/icons/panel/22/audio-volume-medium-panel.svg
+share/icons/panel/22/audio-volume-muted-blocked-panel.svg
+share/icons/panel/22/audio-volume-muted-blocking-panel.svg
+share/icons/panel/22/audio-volume-muted-panel.svg
+share/icons/panel/22/avatar-default.svg
+share/icons/panel/22/bluetooth-active.svg
+share/icons/panel/22/bluetooth-disabled.svg
+share/icons/panel/22/indicator-messages-new.svg
+share/icons/panel/22/indicator-messages.svg
+share/icons/panel/22/input-keyboard.svg
+share/icons/panel/22/network-cellular-signal-excellent.svg
+share/icons/panel/22/network-cellular-signal-good.svg
+share/icons/panel/22/network-cellular-signal-none.svg
+share/icons/panel/22/network-cellular-signal-okay.svg
+share/icons/panel/22/network-cellular-signal-weak.svg
+share/icons/panel/22/nm-device-wired.svg
+share/icons/panel/22/nm-no-connection.svg
+share/icons/panel/22/nm-secure-lock.svg
+share/icons/panel/22/nm-signal-0.svg
+share/icons/panel/22/nm-signal-00.svg
+share/icons/panel/22/nm-signal-100.svg
+share/icons/panel/22/nm-signal-25.svg
+share/icons/panel/22/nm-signal-50.svg
+share/icons/panel/22/nm-signal-75.svg
+share/icons/panel/22/nm-vpn-active-lock.svg
+share/icons/panel/22/nm-vpn-connecting13.svg
+share/icons/panel/22/nm-vpn-connecting14.svg
+share/icons/panel/22/nm-vpn-lock.svg
+share/icons/panel/22/system-devices-panel-alert.svg
+share/icons/panel/22/system-devices-panel.svg
+share/icons/panel/24/avatar-default.svg
+share/icons/panel/48/avatar-default.svg
+share/icons/places/128/bookmark-missing.svg
+share/icons/places/128/folder-documents.svg
+share/icons/places/128/folder-download.svg
+share/icons/places/128/folder-drag-accept.svg
+share/icons/places/128/folder-music.svg
+share/icons/places/128/folder-open.svg
+share/icons/places/128/folder-pictures.svg
+share/icons/places/128/folder-publicshare.svg
+share/icons/places/128/folder-recent.svg
+share/icons/places/128/folder-remote.svg
+share/icons/places/128/folder-saved-search.svg
+share/icons/places/128/folder-templates.svg
+share/icons/places/128/folder-videos.svg
+share/icons/places/128/folder.svg
+share/icons/places/128/gtk-network.svg
+share/icons/places/128/inode-directory.svg
+share/icons/places/128/library-music.svg
+share/icons/places/128/mail-inbox.svg
+share/icons/places/128/mail-mailbox.svg
+share/icons/places/128/mail-outbox.svg
+share/icons/places/128/network-server.svg
+share/icons/places/128/network-workgroup.svg
+share/icons/places/128/user-bookmarks.svg
+share/icons/places/128/user-desktop.svg
+share/icons/places/128/user-home.svg
+share/icons/places/16/bookmark-missing.svg
+share/icons/places/16/distributor-logo.svg
+share/icons/places/16/folder-documents.svg
+share/icons/places/16/folder-download.svg
+share/icons/places/16/folder-drag-accept.svg
+share/icons/places/16/folder-music.svg
+share/icons/places/16/folder-open.svg
+share/icons/places/16/folder-pictures.svg
+share/icons/places/16/folder-publicshare.svg
+share/icons/places/16/folder-recent.svg
+share/icons/places/16/folder-remote.svg
+share/icons/places/16/folder-saved-search.svg
+share/icons/places/16/folder-templates.svg
+share/icons/places/16/folder-videos.svg
+share/icons/places/16/folder.svg
+share/icons/places/16/gtk-network.svg
+share/icons/places/16/inode-directory.svg
+share/icons/places/16/internet-radio.svg
+share/icons/places/16/library-audiobook.svg
+share/icons/places/16/library-music.svg
+share/icons/places/16/library-podcast.svg
+share/icons/places/16/mail-inbox.svg
+share/icons/places/16/mail-mailbox.svg
+share/icons/places/16/mail-outbox.svg
+share/icons/places/16/mail-sent.svg
+share/icons/places/16/network-server.svg
+share/icons/places/16/network-workgroup.svg
+share/icons/places/16/user-bookmarks.svg
+share/icons/places/16/user-desktop.svg
+share/icons/places/16/user-home.svg
+share/icons/places/16/user-trash-full.svg
+share/icons/places/16/user-trash.svg
+share/icons/places/22/bookmark-missing.svg
+share/icons/places/22/distributor-logo.svg
+share/icons/places/22/folder-documents.svg
+share/icons/places/22/folder-download.svg
+share/icons/places/22/folder-drag-accept.svg
+share/icons/places/22/folder-music.svg
+share/icons/places/22/folder-open.svg
+share/icons/places/22/folder-pictures.svg
+share/icons/places/22/folder-publicshare.svg
+share/icons/places/22/folder-recent.svg
+share/icons/places/22/folder-remote.svg
+share/icons/places/22/folder-saved-search.svg
+share/icons/places/22/folder-templates.svg
+share/icons/places/22/folder-videos.svg
+share/icons/places/22/folder.svg
+share/icons/places/22/gtk-network.svg
+share/icons/places/22/inode-directory.svg
+share/icons/places/22/library-music.svg
+share/icons/places/22/mail-inbox.svg
+share/icons/places/22/mail-mailbox.svg
+share/icons/places/22/mail-outbox.svg
+share/icons/places/22/mail-sent.svg
+share/icons/places/22/network-server.svg
+share/icons/places/22/network-workgroup.svg
+share/icons/places/22/user-bookmarks.svg
+share/icons/places/22/user-desktop.svg
+share/icons/places/22/user-home.svg
+share/icons/places/22/user-trash-full.svg
+share/icons/places/22/user-trash.svg
+share/icons/places/24/bookmark-missing.svg
+share/icons/places/24/distributor-logo.svg
+share/icons/places/24/folder-documents.svg
+share/icons/places/24/folder-download.svg
+share/icons/places/24/folder-drag-accept.svg
+share/icons/places/24/folder-music.svg
+share/icons/places/24/folder-open.svg
+share/icons/places/24/folder-pictures.svg
+share/icons/places/24/folder-publicshare.svg
+share/icons/places/24/folder-recent.svg
+share/icons/places/24/folder-remote.svg
+share/icons/places/24/folder-saved-search.svg
+share/icons/places/24/folder-templates.svg
+share/icons/places/24/folder-videos.svg
+share/icons/places/24/folder.svg
+share/icons/places/24/gtk-network.svg
+share/icons/places/24/inode-directory.svg
+share/icons/places/24/library-music.svg
+share/icons/places/24/mail-inbox.svg
+share/icons/places/24/mail-mailbox.svg
+share/icons/places/24/mail-outbox.svg
+share/icons/places/24/mail-sent.svg
+share/icons/places/24/network-server.svg
+share/icons/places/24/network-workgroup.svg
+share/icons/places/24/user-bookmarks.svg
+share/icons/places/24/user-desktop.svg
+share/icons/places/24/user-home.svg
+share/icons/places/24/user-trash-full.svg
+share/icons/places/24/user-trash.svg
+share/icons/places/32/bookmark-missing.svg
+share/icons/places/32/distributor-logo.svg
+share/icons/places/32/folder-documents.svg
+share/icons/places/32/folder-download.svg
+share/icons/places/32/folder-drag-accept.svg
+share/icons/places/32/folder-music.svg
+share/icons/places/32/folder-open.svg
+share/icons/places/32/folder-pictures.svg
+share/icons/places/32/folder-publicshare.svg
+share/icons/places/32/folder-recent.svg
+share/icons/places/32/folder-remote.svg
+share/icons/places/32/folder-saved-search.svg
+share/icons/places/32/folder-templates.svg
+share/icons/places/32/folder-videos.svg
+share/icons/places/32/folder.svg
+share/icons/places/32/gtk-network.svg
+share/icons/places/32/inode-directory.svg
+share/icons/places/32/library-music.svg
+share/icons/places/32/mail-inbox.svg
+share/icons/places/32/mail-mailbox.svg
+share/icons/places/32/mail-outbox.svg
+share/icons/places/32/network-server.svg
+share/icons/places/32/network-workgroup.svg
+share/icons/places/32/user-bookmarks.svg
+share/icons/places/32/user-desktop.svg
+share/icons/places/32/user-home.svg
+share/icons/places/32/user-trash.svg
+share/icons/places/48/bookmark-missing.svg
+share/icons/places/48/distributor-logo.svg
+share/icons/places/48/folder-documents.svg
+share/icons/places/48/folder-download.svg
+share/icons/places/48/folder-drag-accept.svg
+share/icons/places/48/folder-music.svg
+share/icons/places/48/folder-open.svg
+share/icons/places/48/folder-pictures.svg
+share/icons/places/48/folder-publicshare.svg
+share/icons/places/48/folder-recent.svg
+share/icons/places/48/folder-remote.svg
+share/icons/places/48/folder-saved-search.svg
+share/icons/places/48/folder-templates.svg
+share/icons/places/48/folder-videos.svg
+share/icons/places/48/folder.svg
+share/icons/places/48/gtk-network.svg
+share/icons/places/48/inode-directory.svg
+share/icons/places/48/library-music.svg
+share/icons/places/48/mail-inbox.svg
+share/icons/places/48/mail-mailbox.svg
+share/icons/places/48/mail-outbox.svg
+share/icons/places/48/network-server.svg
+share/icons/places/48/network-workgroup.svg
+share/icons/places/48/user-bookmarks.svg
+share/icons/places/48/user-desktop.svg
+share/icons/places/48/user-home.svg
+share/icons/places/48/user-trash-full.svg
+share/icons/places/48/user-trash.svg
+share/icons/places/64/bookmark-missing.svg
+share/icons/places/64/folder-documents.svg
+share/icons/places/64/folder-download.svg
+share/icons/places/64/folder-drag-accept.svg
+share/icons/places/64/folder-music.svg
+share/icons/places/64/folder-open.svg
+share/icons/places/64/folder-pictures.svg
+share/icons/places/64/folder-publicshare.svg
+share/icons/places/64/folder-recent.svg
+share/icons/places/64/folder-remote.svg
+share/icons/places/64/folder-saved-search.svg
+share/icons/places/64/folder-templates.svg
+share/icons/places/64/folder-videos.svg
+share/icons/places/64/folder.svg
+share/icons/places/64/gtk-network.svg
+share/icons/places/64/inode-directory.svg
+share/icons/places/64/library-music.svg
+share/icons/places/64/mail-inbox.svg
+share/icons/places/64/mail-mailbox.svg
+share/icons/places/64/mail-outbox.svg
+share/icons/places/64/network-server.svg
+share/icons/places/64/network-workgroup.svg
+share/icons/places/64/user-bookmarks.svg
+share/icons/places/64/user-desktop.svg
+share/icons/places/64/user-home.svg
+share/icons/places/symbolic/folder-documents-symbolic.svg
+share/icons/places/symbolic/folder-downloads-symbolic.svg
+share/icons/places/symbolic/folder-music-symbolic.svg
+share/icons/places/symbolic/folder-pictures-symbolic.svg
+share/icons/places/symbolic/folder-publicshare-symbolic.svg
+share/icons/places/symbolic/folder-recent-symbolic.svg
+share/icons/places/symbolic/folder-remote-symbolic.svg
+share/icons/places/symbolic/folder-symbolic.svg
+share/icons/places/symbolic/folder-videos-symbolic.svg
+share/icons/places/symbolic/user-trash-symbolic.svg
+share/icons/status/128/aptdaemon-add.svg
+share/icons/status/128/dialog-error.svg
+share/icons/status/128/dialog-information.svg
+share/icons/status/128/dialog-question.svg
+share/icons/status/128/image-missing.svg
+share/icons/status/16/aptdaemon-add.svg
+share/icons/status/16/aptdaemon-download.svg
+share/icons/status/16/battery-000-charging.svg
+share/icons/status/16/battery-000.svg
+share/icons/status/16/battery-020-charging.svg
+share/icons/status/16/battery-020.svg
+share/icons/status/16/battery-040-charging.svg
+share/icons/status/16/battery-040.svg
+share/icons/status/16/battery-060-charging.svg
+share/icons/status/16/battery-060.svg
+share/icons/status/16/battery-080-charging.svg
+share/icons/status/16/battery-080.svg
+share/icons/status/16/battery-100-charging.svg
+share/icons/status/16/battery-100.svg
+share/icons/status/16/battery-caution-charging.svg
+share/icons/status/16/battery-caution.svg
+share/icons/status/16/battery-charged.svg
+share/icons/status/16/battery-empty-charging.svg
+share/icons/status/16/battery-empty.svg
+share/icons/status/16/battery-full-charging.svg
+share/icons/status/16/dialog-error.svg
+share/icons/status/16/dialog-information.svg
+share/icons/status/16/dialog-question.svg
+share/icons/status/16/image-missing.svg
+share/icons/status/16/locked.svg
+share/icons/status/16/mail-forwarded.svg
+share/icons/status/16/mail-replied.svg
+share/icons/status/16/mail-unread.svg
+share/icons/status/16/non-starred-grey.svg
+share/icons/status/16/non-starred.svg
+share/icons/status/16/starred.svg
+share/icons/status/16/user-available.svg
+share/icons/status/16/user-away.svg
+share/icons/status/16/user-busy.svg
+share/icons/status/16/user-idle.svg
+share/icons/status/16/user-invisible.svg
+share/icons/status/16/user-offline.svg
+share/icons/status/16/user-typing.svg
+share/icons/status/22/aptdaemon-add.svg
+share/icons/status/22/aptdaemon-download.svg
+share/icons/status/22/battery-000-charging.svg
+share/icons/status/22/battery-000.svg
+share/icons/status/22/battery-020-charging.svg
+share/icons/status/22/battery-020.svg
+share/icons/status/22/battery-040-charging.svg
+share/icons/status/22/battery-040.svg
+share/icons/status/22/battery-060-charging.svg
+share/icons/status/22/battery-060.svg
+share/icons/status/22/battery-080-charging.svg
+share/icons/status/22/battery-080.svg
+share/icons/status/22/battery-100-charging.svg
+share/icons/status/22/battery-100.svg
+share/icons/status/22/battery-caution-charging.svg
+share/icons/status/22/battery-caution.svg
+share/icons/status/22/battery-charged.svg
+share/icons/status/22/battery-empty-charging.svg
+share/icons/status/22/battery-empty.svg
+share/icons/status/22/battery-full-charging.svg
+share/icons/status/22/battery-full.svg
+share/icons/status/22/battery-good-charging.svg
+share/icons/status/22/battery-good.svg
+share/icons/status/22/battery-low-charging.svg
+share/icons/status/22/battery-low.svg
+share/icons/status/22/dialog-error.svg
+share/icons/status/22/dialog-information.svg
+share/icons/status/22/dialog-question.svg
+share/icons/status/22/image-missing.svg
+share/icons/status/22/locked.svg
+share/icons/status/24/aptdaemon-add.svg
+share/icons/status/24/aptdaemon-download.svg
+share/icons/status/24/aptdaemon-working.svg
+share/icons/status/24/battery-000-charging.svg
+share/icons/status/24/battery-000.svg
+share/icons/status/24/battery-020-charging.svg
+share/icons/status/24/battery-020.svg
+share/icons/status/24/battery-040-charging.svg
+share/icons/status/24/battery-040.svg
+share/icons/status/24/battery-060-charging.svg
+share/icons/status/24/battery-060.svg
+share/icons/status/24/battery-080-charging.svg
+share/icons/status/24/battery-080.svg
+share/icons/status/24/battery-100-charging.svg
+share/icons/status/24/battery-100.svg
+share/icons/status/24/battery-caution.svg
+share/icons/status/24/battery-charged.svg
+share/icons/status/24/battery-empty.svg
+share/icons/status/24/battery-full-charging.svg
+share/icons/status/24/battery-full.svg
+share/icons/status/24/battery-good.svg
+share/icons/status/24/battery-low.svg
+share/icons/status/24/dialog-error.svg
+share/icons/status/24/dialog-information.svg
+share/icons/status/24/dialog-password.svg
+share/icons/status/24/dialog-question.svg
+share/icons/status/24/error.svg
+share/icons/status/24/image-missing.svg
+share/icons/status/24/locked.svg
+share/icons/status/32/aptdaemon-add.svg
+share/icons/status/32/aptdaemon-download.svg
+share/icons/status/32/aptdaemon-working.svg
+share/icons/status/32/battery-caution.svg
+share/icons/status/32/battery-empty.svg
+share/icons/status/32/battery-full.svg
+share/icons/status/32/battery-good.svg
+share/icons/status/32/battery-low.svg
+share/icons/status/32/dialog-error.svg
+share/icons/status/32/dialog-information.svg
+share/icons/status/32/dialog-password.svg
+share/icons/status/32/dialog-question.svg
+share/icons/status/32/image-loading.svg
+share/icons/status/32/image-missing.svg
+share/icons/status/32/locked.svg
+share/icons/status/32/network-wireless-encrypted.svg
+share/icons/status/32/security-medium.svg
+share/icons/status/48/aptdaemon-add.svg
+share/icons/status/48/aptdaemon-delete.svg
+share/icons/status/48/aptdaemon-download.svg
+share/icons/status/48/aptdaemon-setup.svg
+share/icons/status/48/aptdaemon-update-cache.svg
+share/icons/status/48/aptdaemon-upgrade.svg
+share/icons/status/48/aptdaemon-working.svg
+share/icons/status/48/batery-phone-000.svg
+share/icons/status/48/battery-ac-adapter.svg
+share/icons/status/48/battery-caution-charging.svg
+share/icons/status/48/battery-caution.svg
+share/icons/status/48/battery-empty-charging.svg
+share/icons/status/48/battery-empty.svg
+share/icons/status/48/battery-full-charging.svg
+share/icons/status/48/battery-full.svg
+share/icons/status/48/battery-good-charging.svg
+share/icons/status/48/battery-good.svg
+share/icons/status/48/battery-low-charging.svg
+share/icons/status/48/battery-low.svg
+share/icons/status/48/battery-mouse-000.svg
+share/icons/status/48/battery-mouse-020.svg
+share/icons/status/48/battery-mouse-040.svg
+share/icons/status/48/battery-mouse-060.svg
+share/icons/status/48/battery-mouse-080.svg
+share/icons/status/48/battery-mouse-100.svg
+share/icons/status/48/battery-phone-020.svg
+share/icons/status/48/battery-phone-040.svg
+share/icons/status/48/battery-phone-060.svg
+share/icons/status/48/battery-phone-080.svg
+share/icons/status/48/battery-phone-100.svg
+share/icons/status/48/dialog-error.svg
+share/icons/status/48/dialog-information.svg
+share/icons/status/48/dialog-password.svg
+share/icons/status/48/dialog-question.svg
+share/icons/status/48/dialog-warning.svg
+share/icons/status/48/image-loading.svg
+share/icons/status/48/image-missing.svg
+share/icons/status/48/locked.svg
+share/icons/status/48/network-wireless-encrypted.svg
+share/icons/status/48/printer-error.svg
+share/icons/status/48/printer-printing.svg
+share/icons/status/48/security-medium.svg
+share/icons/status/64/aptdaemon-add.svg
+share/icons/status/64/dialog-error.svg
+share/icons/status/64/dialog-information.svg
+share/icons/status/64/dialog-question.svg
+share/icons/status/64/dialog-warning.svg
+share/icons/status/64/image-loading.svg
+share/icons/status/64/image-missing.svg
+share/icons/status/symbolic/audio-volume-high-symbolic.svg
+share/icons/status/symbolic/audio-volume-low-symbolic.svg
+share/icons/status/symbolic/audio-volume-medium-symbolic.svg
+share/icons/status/symbolic/audio-volume-muted-symbolic.svg
+share/icons/status/symbolic/avatar-default-symbolic.svg
+share/icons/status/symbolic/bluetooth-active-symbolic.svg
+share/icons/status/symbolic/bluetooth-disabled-symbolic.svg
+share/icons/status/symbolic/brightness-display-symbolic.svg
+share/icons/status/symbolic/changes-allow-symbolic.svg
+share/icons/status/symbolic/changes-prevent-symbolic.svg
+share/icons/status/symbolic/channel-insecure-symbolic.svg
+share/icons/status/symbolic/channel-secure-symbolic.svg
+share/icons/status/symbolic/dialog-warning-symbolic.svg
+share/icons/status/symbolic/keyboard-brightness-symbolic.svg
+share/icons/status/symbolic/mail-attachment-symbolic.svg
+share/icons/status/symbolic/media-playlist-no-repeat-symbolic.svg
+share/icons/status/symbolic/media-playlist-no-shuffle-symbolic.svg
+share/icons/status/symbolic/media-playlist-repeat-one-symbolic.svg
+share/icons/status/symbolic/media-playlist-repeat-symbolic.svg
+share/icons/status/symbolic/media-playlist-shuffle-symbolic.svg
+share/icons/status/symbolic/microphone-sensitivity-high-symbolic.svg
+share/icons/status/symbolic/microphone-sensitivity-low-symbolic.svg
+share/icons/status/symbolic/microphone-sensitivity-medium-symbolic.svg
+share/icons/status/symbolic/microphone-sensitivity-muted-symbolic.svg
+share/icons/status/symbolic/network-cellular-signal-excellent-symbolic.svg
+share/icons/status/symbolic/network-cellular-signal-good-symbolic.svg
+share/icons/status/symbolic/network-cellular-signal-none-symbolic.svg
+share/icons/status/symbolic/network-cellular-signal-okay-symbolic.svg
+share/icons/status/symbolic/network-cellular-signal-weak-symbolic.svg
+share/icons/status/symbolic/network-wireless-encrypted-symbolic.svg
+share/icons/status/symbolic/network-wireless-signal-excellent-symbolic.svg
+share/icons/status/symbolic/network-wireless-signal-good-symbolic.svg
+share/icons/status/symbolic/network-wireless-signal-none-symbolic.svg
+share/icons/status/symbolic/network-wireless-signal-ok-symbolic.svg
+share/icons/status/symbolic/network-wireless-signal-weak-symbolic.svg
+share/icons/status/symbolic/non-starred-symbolic.svg
+share/icons/status/symbolic/process-completed-symbolic.svg
+share/icons/status/symbolic/process-error-symbolic.svg
+share/icons/status/symbolic/starred-symbolic.svg
+share/icons/tools/22/color-fill.svg
+share/icons/tools/22/draw-brush.svg
+share/icons/tools/22/draw-ellipse.svg
+share/icons/tools/22/draw-freehand.svg
+share/icons/tools/22/draw-polygon.png
+share/icons/tools/22/draw-polygon.svg
+share/icons/tools/22/draw-polyline.svg
+share/icons/tools/22/draw-rectangle.svg
+share/icons/tools/22/draw-smudge.png
+share/icons/tools/22/draw-star.png
+share/icons/tools/22/draw-star.svg
+share/icons/tools/22/draw-text.svg
+@pkgdir share/icons/panel/64
+@pkgdir share/icons/panel/32
+@pkgdir share/icons/emotes/64
+@pkgdir share/icons/emotes/48
+@pkgdir share/icons/emotes/32
+@pkgdir share/icons/emotes/24
+@pkgdir share/icons/emotes/22
+@pkgdir share/icons/emotes/128
+@pkgdir share/icons/emblems/64
+@pkgdir share/icons/emblems/32
+@pkgdir share/icons/emblems/22
+@pkgdir share/icons/emblems/16
+@pkgdir share/icons/emblems/128
+@pkgdir share/icons/animations/64
+@pkgdir share/icons/animations/32
+@pkgdir share/icons/animations/16
+@pkgdir share/icons/animations/128
diff --git a/x11/elementary-icon-theme/TODO b/x11/elementary-icon-theme/TODO
new file mode 100644
index 00000000000..224c144c9ef
--- /dev/null
+++ b/x11/elementary-icon-theme/TODO
@@ -0,0 +1,8 @@
+should I use libexec/icon-name-mapping ?
+
+how to get png files? does it matter? test this
+
+maybe skip these checks?
+=> Checking for non-existent script interpreters in elementary-icon-theme-2.7.1
+=> Checking for missing run-time search paths in elementary-icon-theme-2.7.1
+=> Checking for work-directory references in elementary-icon-theme-2.7.1
diff --git a/x11/elementary-icon-theme/distinfo b/x11/elementary-icon-theme/distinfo
new file mode 100644
index 00000000000..6317a65dc60
--- /dev/null
+++ b/x11/elementary-icon-theme/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/06/16 18:56:05 sno Exp $
+
+SHA1 (elementary.tar.gz) = bdc07339b69ec4a1ff3155cfd0ee429fb90d7785
+RMD160 (elementary.tar.gz) = 95d48806cf4ad5c59b8c21fb8244240ffb799a1e
+Size (elementary.tar.gz) = 2362700 bytes
diff --git a/x11/elementary/DESCR b/x11/elementary/DESCR
new file mode 100644
index 00000000000..b91460e4786
--- /dev/null
+++ b/x11/elementary/DESCR
@@ -0,0 +1,3 @@
+Elementary is a basic widget set that is easy to use especially on
+mobile touch-screen devices. It is based on and part of the
+Enlightenment Foundation Library.
diff --git a/x11/elementary/Makefile b/x11/elementary/Makefile
new file mode 100644
index 00000000000..1c39ae464c6
--- /dev/null
+++ b/x11/elementary/Makefile
@@ -0,0 +1,45 @@
+# $NetBSD: Makefile,v 1.1 2013/06/16 18:56:06 sno Exp $
+#
+
+DISTNAME=	elementary-1.7.7
+CATEGORIES=	x11
+MASTER_SITES=	http://download.enlightenment.org/releases/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://www.enlightenment.org/
+COMMENT=	E17 Widget Library
+LICENSE=	gnu-lgpl-v2.1
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+USE_TOOLS+=	autoconf # because I patched configure.ac
+USE_TOOLS+=	gmake
+
+PKGCONFIG_OVERRIDE=	elementary
+
+# currently it is like it is
+MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}-1.7.7
+PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+
+MAKE_FLAGS+=	MODULE_ARCH=${MODULE_ARCH}
+
+.include "../../devel/ecore/buildlink3.mk"
+.include "../../graphics/edje/buildlink3.mk"
+.include "../../sysutils/edbus/buildlink3.mk"
+.include "../../sysutils/efreet/buildlink3.mk"
+.include "../../devel/eet/buildlink3.mk"
+.include "../../graphics/evas-png/buildlink3.mk"
+.include "../../graphics/evas-jpeg/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../devel/eio/buildlink3.mk"
+#.include "../../devel/ewheather/buildlink3.mk"
+#.include "../../devel/emap/buildlink3.mk"
+#.include "../../devel/ethumb/buildlink3.mk"
+#.include "../../devel/emotion/buildlink3.mk"
+#.include "../../devel/webkit/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/elementary/PLIST b/x11/elementary/PLIST
new file mode 100644
index 00000000000..f5988e17ac8
--- /dev/null
+++ b/x11/elementary/PLIST
@@ -0,0 +1,285 @@
+@comment $NetBSD: PLIST,v 1.1 2013/06/16 18:56:06 sno Exp $
+bin/elementary_config
+bin/elementary_quicklaunch
+bin/elementary_run
+bin/elementary_test
+bin/elementary_testql
+include/elementary-1/Elementary.h
+include/elementary-1/Elementary_Cursor.h
+include/elementary-1/elc_ctxpopup.h
+include/elementary-1/elc_fileselector.h
+include/elementary-1/elc_fileselector_button.h
+include/elementary-1/elc_fileselector_entry.h
+include/elementary-1/elc_hoversel.h
+include/elementary-1/elc_multibuttonentry.h
+include/elementary-1/elc_naviframe.h
+include/elementary-1/elc_popup.h
+include/elementary-1/elm_actionslider.h
+include/elementary-1/elm_app.h
+include/elementary-1/elm_authors.h
+include/elementary-1/elm_bg.h
+include/elementary-1/elm_box.h
+include/elementary-1/elm_bubble.h
+include/elementary-1/elm_button.h
+include/elementary-1/elm_cache.h
+include/elementary-1/elm_calendar.h
+include/elementary-1/elm_check.h
+include/elementary-1/elm_clock.h
+include/elementary-1/elm_cnp.h
+include/elementary-1/elm_colorselector.h
+include/elementary-1/elm_config.h
+include/elementary-1/elm_conform.h
+include/elementary-1/elm_cursor.h
+include/elementary-1/elm_datetime.h
+include/elementary-1/elm_dayselector.h
+include/elementary-1/elm_debug.h
+include/elementary-1/elm_deprecated.h
+include/elementary-1/elm_diskselector.h
+include/elementary-1/elm_entry.h
+include/elementary-1/elm_finger.h
+include/elementary-1/elm_flip.h
+include/elementary-1/elm_flipselector.h
+include/elementary-1/elm_focus.h
+include/elementary-1/elm_font.h
+include/elementary-1/elm_frame.h
+include/elementary-1/elm_gen.h
+include/elementary-1/elm_general.h
+include/elementary-1/elm_gengrid.h
+include/elementary-1/elm_genlist.h
+include/elementary-1/elm_gesture_layer.h
+include/elementary-1/elm_getting_started.h
+include/elementary-1/elm_glview.h
+include/elementary-1/elm_grid.h
+include/elementary-1/elm_hover.h
+include/elementary-1/elm_icon.h
+include/elementary-1/elm_image.h
+include/elementary-1/elm_index.h
+include/elementary-1/elm_interface_scrollable.h
+include/elementary-1/elm_intro.h
+include/elementary-1/elm_inwin.h
+include/elementary-1/elm_label.h
+include/elementary-1/elm_layout.h
+include/elementary-1/elm_list.h
+include/elementary-1/elm_macros.h
+include/elementary-1/elm_map.h
+include/elementary-1/elm_mapbuf.h
+include/elementary-1/elm_menu.h
+include/elementary-1/elm_mirroring.h
+include/elementary-1/elm_need.h
+include/elementary-1/elm_notify.h
+include/elementary-1/elm_object.h
+include/elementary-1/elm_object_item.h
+include/elementary-1/elm_panel.h
+include/elementary-1/elm_panes.h
+include/elementary-1/elm_photo.h
+include/elementary-1/elm_photocam.h
+include/elementary-1/elm_plug.h
+include/elementary-1/elm_progressbar.h
+include/elementary-1/elm_radio.h
+include/elementary-1/elm_route.h
+include/elementary-1/elm_scale.h
+include/elementary-1/elm_scroll.h
+include/elementary-1/elm_scroller.h
+include/elementary-1/elm_segment_control.h
+include/elementary-1/elm_separator.h
+include/elementary-1/elm_slider.h
+include/elementary-1/elm_slideshow.h
+include/elementary-1/elm_spinner.h
+include/elementary-1/elm_store.h
+include/elementary-1/elm_table.h
+include/elementary-1/elm_theme.h
+include/elementary-1/elm_thumb.h
+include/elementary-1/elm_toolbar.h
+include/elementary-1/elm_tooltip.h
+include/elementary-1/elm_transit.h
+include/elementary-1/elm_video.h
+include/elementary-1/elm_web.h
+include/elementary-1/elm_widget.h
+include/elementary-1/elm_widget_actionslider.h
+include/elementary-1/elm_widget_bg.h
+include/elementary-1/elm_widget_box.h
+include/elementary-1/elm_widget_bubble.h
+include/elementary-1/elm_widget_button.h
+include/elementary-1/elm_widget_calendar.h
+include/elementary-1/elm_widget_check.h
+include/elementary-1/elm_widget_clock.h
+include/elementary-1/elm_widget_colorselector.h
+include/elementary-1/elm_widget_conform.h
+include/elementary-1/elm_widget_container.h
+include/elementary-1/elm_widget_datetime.h
+include/elementary-1/elm_widget_dayselector.h
+include/elementary-1/elm_widget_diskselector.h
+include/elementary-1/elm_widget_fileselector.h
+include/elementary-1/elm_widget_fileselector_button.h
+include/elementary-1/elm_widget_flip.h
+include/elementary-1/elm_widget_flipselector.h
+include/elementary-1/elm_widget_frame.h
+include/elementary-1/elm_widget_gengrid.h
+include/elementary-1/elm_widget_genlist.h
+include/elementary-1/elm_widget_glview.h
+include/elementary-1/elm_widget_grid.h
+include/elementary-1/elm_widget_hover.h
+include/elementary-1/elm_widget_hoversel.h
+include/elementary-1/elm_widget_icon.h
+include/elementary-1/elm_widget_image.h
+include/elementary-1/elm_widget_index.h
+include/elementary-1/elm_widget_inwin.h
+include/elementary-1/elm_widget_label.h
+include/elementary-1/elm_widget_layout.h
+include/elementary-1/elm_widget_list.h
+include/elementary-1/elm_widget_map.h
+include/elementary-1/elm_widget_mapbuf.h
+include/elementary-1/elm_widget_menu.h
+include/elementary-1/elm_widget_naviframe.h
+include/elementary-1/elm_widget_notify.h
+include/elementary-1/elm_widget_panes.h
+include/elementary-1/elm_widget_photo.h
+include/elementary-1/elm_widget_photocam.h
+include/elementary-1/elm_widget_player.h
+include/elementary-1/elm_widget_plug.h
+include/elementary-1/elm_widget_progressbar.h
+include/elementary-1/elm_widget_radio.h
+include/elementary-1/elm_widget_route.h
+include/elementary-1/elm_widget_scroller.h
+include/elementary-1/elm_widget_segment_control.h
+include/elementary-1/elm_widget_separator.h
+include/elementary-1/elm_widget_slider.h
+include/elementary-1/elm_widget_slideshow.h
+include/elementary-1/elm_widget_spinner.h
+include/elementary-1/elm_widget_table.h
+include/elementary-1/elm_widget_thumb.h
+include/elementary-1/elm_widget_video.h
+include/elementary-1/elm_widget_web.h
+include/elementary-1/elm_win.h
+lib/edje/modules/elm/netbsd-${MACHINE_ARCH}-1.0.0/module.la
+lib/elementary/modules/access_output/${MODULE_ARCH}/module.la
+lib/elementary/modules/datetime_input_ctxpopup/${MODULE_ARCH}/module.la
+lib/elementary/modules/test_entry/${MODULE_ARCH}/module.la
+lib/elementary/modules/test_map/${MODULE_ARCH}/module.la
+lib/elementary_testql.la
+lib/libelementary.la
+lib/pkgconfig/elementary.pc
+share/applications/elementary_config.desktop
+share/applications/elementary_test.desktop
+share/elementary/config/default/base.cfg
+share/elementary/config/default/icon.png
+share/elementary/config/default/profile.desktop
+share/elementary/config/mobile/base.cfg
+share/elementary/config/mobile/icon.png
+share/elementary/config/mobile/profile.desktop
+share/elementary/config/profile.cfg
+share/elementary/config/standard/base.cfg
+share/elementary/config/standard/icon.png
+share/elementary/config/standard/profile.desktop
+share/elementary/edje_externals/icons.edj
+share/elementary/images/animated_logo.gif
+share/elementary/images/bubble.png
+share/elementary/images/bubble_sh.png
+share/elementary/images/g_layer/double_tap_1.png
+share/elementary/images/g_layer/double_tap_2.png
+share/elementary/images/g_layer/double_tap_3.png
+share/elementary/images/g_layer/double_tap_4.png
+share/elementary/images/g_layer/double_tap_5.png
+share/elementary/images/g_layer/flick_1.png
+share/elementary/images/g_layer/flick_2.png
+share/elementary/images/g_layer/flick_3.png
+share/elementary/images/g_layer/flick_4.png
+share/elementary/images/g_layer/flick_5.png
+share/elementary/images/g_layer/line_1.png
+share/elementary/images/g_layer/line_2.png
+share/elementary/images/g_layer/line_3.png
+share/elementary/images/g_layer/line_4.png
+share/elementary/images/g_layer/line_5.png
+share/elementary/images/g_layer/long_tap_1.png
+share/elementary/images/g_layer/long_tap_2.png
+share/elementary/images/g_layer/long_tap_3.png
+share/elementary/images/g_layer/long_tap_4.png
+share/elementary/images/g_layer/long_tap_5.png
+share/elementary/images/g_layer/momentum_1.png
+share/elementary/images/g_layer/momentum_2.png
+share/elementary/images/g_layer/momentum_3.png
+share/elementary/images/g_layer/momentum_4.png
+share/elementary/images/g_layer/momentum_5.png
+share/elementary/images/g_layer/rotate_1.png
+share/elementary/images/g_layer/tap_1.png
+share/elementary/images/g_layer/tap_2.png
+share/elementary/images/g_layer/tap_3.png
+share/elementary/images/g_layer/tap_4.png
+share/elementary/images/g_layer/tap_5.png
+share/elementary/images/g_layer/triple_tap_1.png
+share/elementary/images/g_layer/triple_tap_2.png
+share/elementary/images/g_layer/triple_tap_3.png
+share/elementary/images/g_layer/triple_tap_4.png
+share/elementary/images/g_layer/triple_tap_5.png
+share/elementary/images/g_layer/zoom_1.png
+share/elementary/images/icon_00.png
+share/elementary/images/icon_01.png
+share/elementary/images/icon_02.png
+share/elementary/images/icon_03.png
+share/elementary/images/icon_04.png
+share/elementary/images/icon_05.png
+share/elementary/images/icon_06.png
+share/elementary/images/icon_07.png
+share/elementary/images/icon_08.png
+share/elementary/images/icon_09.png
+share/elementary/images/icon_10.png
+share/elementary/images/icon_11.png
+share/elementary/images/icon_12.png
+share/elementary/images/icon_13.png
+share/elementary/images/icon_14.png
+share/elementary/images/icon_15.png
+share/elementary/images/icon_16.png
+share/elementary/images/icon_17.png
+share/elementary/images/icon_18.png
+share/elementary/images/icon_19.png
+share/elementary/images/icon_20.png
+share/elementary/images/icon_21.png
+share/elementary/images/icon_22.png
+share/elementary/images/icon_23.png
+share/elementary/images/icon_right_arrow.png
+share/elementary/images/insanely_huge_test_image.jpg
+share/elementary/images/logo.png
+share/elementary/images/logo_small.png
+share/elementary/images/mystrale.jpg
+share/elementary/images/mystrale_2.jpg
+share/elementary/images/panel_01.jpg
+share/elementary/images/parking.png
+share/elementary/images/plant_01.jpg
+share/elementary/images/pol_shadow.png
+share/elementary/images/pol_sky.png
+share/elementary/images/pol_twofish.png
+share/elementary/images/pt.png
+share/elementary/images/rock_01.jpg
+share/elementary/images/rock_02.jpg
+share/elementary/images/sky_01.jpg
+share/elementary/images/sky_02.jpg
+share/elementary/images/sky_03.jpg
+share/elementary/images/sky_04.jpg
+share/elementary/images/twofish.jpg
+share/elementary/images/wood_01.jpg
+share/elementary/objects/cursors.edj
+share/elementary/objects/font_preview.edj
+share/elementary/objects/multibuttonentry.edj
+share/elementary/objects/multip.edj
+share/elementary/objects/postit_ent.edj
+share/elementary/objects/test.edj
+share/elementary/themes/default-desktop.edj
+share/elementary/themes/default.edj
+share/icons/elementary.png
+share/locale/ar/LC_MESSAGES/elementary.mo
+share/locale/az_IR/LC_MESSAGES/elementary.mo
+share/locale/cs/LC_MESSAGES/elementary.mo
+share/locale/de/LC_MESSAGES/elementary.mo
+share/locale/eo/LC_MESSAGES/elementary.mo
+share/locale/fa/LC_MESSAGES/elementary.mo
+share/locale/fr/LC_MESSAGES/elementary.mo
+share/locale/he/LC_MESSAGES/elementary.mo
+share/locale/it/LC_MESSAGES/elementary.mo
+share/locale/ko_KR/LC_MESSAGES/elementary.mo
+share/locale/nl/LC_MESSAGES/elementary.mo
+share/locale/ps/LC_MESSAGES/elementary.mo
+share/locale/pt/LC_MESSAGES/elementary.mo
+share/locale/ur/LC_MESSAGES/elementary.mo
+share/locale/yi/LC_MESSAGES/elementary.mo
+share/locale/zh_CN/LC_MESSAGES/elementary.mo
+@pkgdir share/elementary/examples
diff --git a/x11/elementary/buildlink3.mk b/x11/elementary/buildlink3.mk
new file mode 100644
index 00000000000..7b2f2fa0ea3
--- /dev/null
+++ b/x11/elementary/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+BUILDLINK_TREE+=	elementary
+
+.if !defined(ELEMENTARY_BUILDLINK3_MK)
+ELEMENTARY_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.elementary+=	elementary>=1.7.7
+BUILDLINK_PKGSRCDIR.elementary?=	../../x11/elementary
+
+.include "../../devel/ecore/buildlink3.mk"
+.include "../../graphics/edje/buildlink3.mk"
+.include "../../sysutils/edbus/buildlink3.mk"
+.include "../../sysutils/efreet/buildlink3.mk"
+.include "../../devel/eet/buildlink3.mk"
+.include "../../graphics/evas-png/buildlink3.mk"
+.include "../../graphics/evas-jpeg/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../devel/eio/buildlink3.mk"
+.endif	# ELEMENTARY_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-elementary
diff --git a/x11/elementary/distinfo b/x11/elementary/distinfo
new file mode 100644
index 00000000000..4eec834ce40
--- /dev/null
+++ b/x11/elementary/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+SHA1 (elementary-1.7.7.tar.bz2) = cff6de3f496139cd806575f5c36a05e2b00f64fc
+RMD160 (elementary-1.7.7.tar.bz2) = 71a25877149998791f7a9581b59330a8026fbbe5
+Size (elementary-1.7.7.tar.bz2) = 9360420 bytes
+SHA1 (patch-aa) = f52eda6a696da177ec1a6302244095cdeeae1e0f
+SHA1 (patch-ab) = 91c3a70d71d5d8fc9410c0fbe668ff343d59509b
diff --git a/x11/elementary/patches/patch-aa b/x11/elementary/patches/patch-aa
new file mode 100644
index 00000000000..0e5d93bc0ce
--- /dev/null
+++ b/x11/elementary/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+--- configure.ac.orig	2012-08-26 13:26:31.000000000 +0000
++++ configure.ac
+@@ -723,7 +723,7 @@ AC_DEFINE_UNQUOTED(ELEMENTARY_BASE_DIR, 
+ EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
+ EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
+ 
+-AC_TRY_COMPILE([
++AC_TRY_LINK([
+ # define _GNU_SOURCE 1
+ #include <unistd.h>
+ ], [
+@@ -732,7 +732,7 @@ extern char **environ;
+   AC_DEFINE(HAVE_ENVIRON, 1, [extern environ exists])
+ ])
+ 
+-AC_TRY_COMPILE([
++AC_TRY_LINK([
+ #include <stdlib.h>
+ ], [
+ clearenv();
diff --git a/x11/elementary/patches/patch-ab b/x11/elementary/patches/patch-ab
new file mode 100644
index 00000000000..22d847127c7
--- /dev/null
+++ b/x11/elementary/patches/patch-ab
@@ -0,0 +1,2108 @@
+$NetBSD: patch-ab,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+--- configure.orig	2013-06-15 12:14:08.000000000 +0000
++++ configure
+@@ -1,13 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for elementary 1.7.7.
++# Generated by GNU Autoconf 2.69 for elementary 1.7.7.
+ #
+ # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
+ #
+ #
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -136,6 +134,31 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
++# Use a proper internal environment variable to ensure we don't fall
++  # into an infinite loop, continuously re-executing ourselves.
++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++    _as_can_reexec=no; export _as_can_reexec;
++    # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++  fi
++  # We don't want this to propagate to other subprocesses.
++          { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test 
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -222,21 +246,25 @@ IFS=$as_save_IFS
+ 
+ 
+       if test "x$CONFIG_SHELL" != x; then :
+-  # We cannot yet assume a decent shell, so we have to provide a
+-	# neutralization value for shells without unset; and this also
+-	# works around shells that cannot unset nonexistent variables.
+-	# Preserve -v and -x to the replacement shell.
+-	BASH_ENV=/dev/null
+-	ENV=/dev/null
+-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-	export CONFIG_SHELL
+-	case $- in # ((((
+-	  *v*x* | *x*v* ) as_opts=-vx ;;
+-	  *v* ) as_opts=-v ;;
+-	  *x* ) as_opts=-x ;;
+-	  * ) as_opts= ;;
+-	esac
+-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++  export CONFIG_SHELL
++             # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
+ 
+ 
+ } # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+   chmod +x "$as_me.lineno" ||
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++  # already done that, so ensure we don't try to do so again and fall
++  # in an infinite loop.  This has already happened in practice.
++  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensitive to this).
+@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -515,28 +555,8 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -1402,8 +1422,6 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1567,10 +1585,12 @@ Optional Features:
+   --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --enable-silent-rules          less verbose build output (undo: `make V=1')
+-  --disable-silent-rules         verbose build output (undo: `make V=0')
+-  --disable-dependency-tracking  speeds up one-time build
+-  --enable-dependency-tracking   do not reject slow dependency extractors
++  --enable-silent-rules   less verbose build output (undo: "make V=1")
++  --disable-silent-rules  verbose build output (undo: "make V=0")
++  --enable-dependency-tracking
++                          do not reject slow dependency extractors
++  --disable-dependency-tracking
++                          speeds up one-time build
+   --enable-shared[=PKGS]  build shared libraries [default=yes]
+   --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-fast-install[=PKGS]
+@@ -1783,9 +1803,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ elementary configure 1.7.7
+-generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.69
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -2062,7 +2082,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -2206,7 +2226,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by elementary $as_me 1.7.7, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2663,7 +2683,7 @@ ac_config_headers="$ac_config_headers el
+ 
+ 
+ 
+-am__api_version='1.11'
++am__api_version='1.13'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -2702,7 +2722,7 @@ case $as_dir/ in #((
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -2760,9 +2780,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -2773,32 +2790,40 @@ case `pwd` in
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+ esac
+ 
+-# Do `set' in a subshell so we don't clobber the current shell's
++# Do 'set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-   if test "$*" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t "$srcdir/configure" conftest.file`
+-   fi
+-   rm -f conftest.file
+-   if test "$*" != "X $srcdir/configure conftest.file" \
+-      && test "$*" != "X conftest.file $srcdir/configure"; then
+-
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # if, for instance, CONFIG_SHELL is bash and it inherits a
+-      # broken ls alias from the environment.  This has actually
+-      # happened.  Such a system could not be considered "sane".
+-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment" "$LINENO" 5
+-   fi
++   am_has_slept=no
++   for am_try in 1 2; do
++     echo "timestamp, slept: $am_has_slept" > conftest.file
++     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++     if test "$*" = "X"; then
++	# -L didn't work.
++	set X `ls -t "$srcdir/configure" conftest.file`
++     fi
++     if test "$*" != "X $srcdir/configure conftest.file" \
++	&& test "$*" != "X conftest.file $srcdir/configure"; then
+ 
++	# If neither matched, then we have a broken ls.  This can happen
++	# if, for instance, CONFIG_SHELL is bash and it inherits a
++	# broken ls alias from the environment.  This has actually
++	# happened.  Such a system could not be considered "sane".
++	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
++  alias in your environment" "$LINENO" 5
++     fi
++     if test "$2" = conftest.file || test $am_try -eq 2; then
++       break
++     fi
++     # Just in case.
++     sleep 1
++     am_has_slept=yes
++   done
+    test "$2" = conftest.file
+    )
+ then
+@@ -2810,6 +2835,16 @@ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++# If we didn't sleep, we still need to ensure time stamps of config.status and
++# generated files are strictly newer.
++am_sleep_pid=
++if grep 'slept: no' conftest.file >/dev/null 2>&1; then
++  ( sleep 1 ) &
++  am_sleep_pid=$!
++fi
++
++rm -f conftest.file
++
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -2832,12 +2867,12 @@ if test x"${MISSING+set}" != xset; then
+   esac
+ fi
+ # Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+-  am_missing_run="$MISSING --run "
++if eval "$MISSING --is-lightweight"; then
++  am_missing_run="$MISSING "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ fi
+ 
+ if test x"${install_sh}" != xset; then
+@@ -2849,10 +2884,10 @@ if test x"${install_sh}" != xset; then
+   esac
+ fi
+ 
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
++# Installed binaries are usually stripped using 'strip' when the user
++# run "make install-strip".  However 'strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
++# will honor the 'STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+@@ -2871,7 +2906,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2911,7 +2946,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2962,7 +2997,7 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_prog in mkdir gmkdir; do
+ 	 for ac_exec_ext in '' $ac_executable_extensions; do
+-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 	     'mkdir (GNU coreutils) '* | \
+ 	     'mkdir (coreutils) '* | \
+@@ -2991,12 +3026,6 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
+-mkdir_p="$MKDIR_P"
+-case $mkdir_p in
+-  [\\/$]* | ?:[\\/]*) ;;
+-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -3015,7 +3044,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AWK="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3079,6 +3108,45 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+ 
++# Check whether --enable-silent-rules was given.
++if test "${enable_silent_rules+set}" = set; then :
++  enableval=$enable_silent_rules;
++fi
++
++case $enable_silent_rules in # (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++    *) AM_DEFAULT_VERBOSITY=1;;
++esac
++am_make=${MAKE-make}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
++$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
++if ${am_cv_make_support_nested_variables+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if $as_echo 'TRUE=$(BAR$(V))
++BAR0=false
++BAR1=true
++V=1
++am__doit:
++	@$(TRUE)
++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
++  am_cv_make_support_nested_variables=yes
++else
++  am_cv_make_support_nested_variables=no
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
++$as_echo "$am_cv_make_support_nested_variables" >&6; }
++if test $am_cv_make_support_nested_variables = yes; then
++    AM_V='$(V)'
++  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
++else
++  AM_V=$AM_DEFAULT_VERBOSITY
++  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
++fi
++AM_BACKSLASH='\'
++
+ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+   # is not polluted with repeated "-I."
+@@ -3129,27 +3197,38 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
++# For better backward compatibility.  To be removed once Automake 1.9.x
++# dies out for good.  For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++mkdir_p='$(MKDIR_P)'
++
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+ 
++
++# We'll loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar  pax cpio none'
++
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
+ 
+ 
++
+ # Check whether --enable-silent-rules was given.
+ if test "${enable_silent_rules+set}" = set; then :
+   enableval=$enable_silent_rules;
+ fi
+ 
+-case $enable_silent_rules in
+-yes) AM_DEFAULT_VERBOSITY=0;;
+-no)  AM_DEFAULT_VERBOSITY=1;;
+-*)   AM_DEFAULT_VERBOSITY=0;;
++case $enable_silent_rules in # (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++    *) AM_DEFAULT_VERBOSITY=0;;
+ esac
+ am_make=${MAKE-make}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+@@ -3200,7 +3279,7 @@ am__quote=
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
++# Ignore all kinds of additional output from 'make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -3266,7 +3345,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3306,7 +3385,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3359,7 +3438,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3400,7 +3479,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -3458,7 +3537,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3502,7 +3581,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3948,8 +4027,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -4045,8 +4123,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -4081,16 +4159,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -4099,8 +4177,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -4108,7 +4186,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -4317,7 +4395,7 @@ do
+     for ac_prog in grep ggrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++      as_fn_executable_p "$ac_path_GREP" || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4383,7 +4461,7 @@ do
+     for ac_prog in egrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++      as_fn_executable_p "$ac_path_EGREP" || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -4590,8 +4668,8 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#	  define __EXTENSIONS__ 1
+-	  $ac_includes_default
++#         define __EXTENSIONS__ 1
++          $ac_includes_default
+ int
+ main ()
+ {
+@@ -4925,7 +5003,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4965,7 +5043,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5018,7 +5096,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5059,7 +5137,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -5117,7 +5195,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5161,7 +5239,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5357,8 +5435,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -5454,8 +5531,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -5490,16 +5567,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -5508,8 +5585,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -5517,7 +5594,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok `-c -o', but also, the minuso test has
++      # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -5721,7 +5798,7 @@ main ()
+   return 0;
+ }
+ _ACEOF
+-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
++for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+ do
+   CC="$ac_save_CC $ac_arg"
+   if ac_fn_c_try_compile "$LINENO"; then :
+@@ -5761,8 +5838,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -5987,11 +6063,11 @@ else
+ int
+ main ()
+ {
+-/* FIXME: Include the comments suggested by Paul. */
++
+ #ifndef __cplusplus
+-  /* Ultrix mips cc rejects this.  */
++  /* Ultrix mips cc rejects this sort of thing.  */
+   typedef int charset[2];
+-  const charset cs;
++  const charset cs = { 0, 0 };
+   /* SunOS 4.1.1 cc rejects this.  */
+   char const *const *pcpcc;
+   char **ppc;
+@@ -6008,8 +6084,9 @@ main ()
+   ++pcpcc;
+   ppc = (char**) pcpcc;
+   pcpcc = (char const *const *) ppc;
+-  { /* SCO 3.2v4 cc rejects this.  */
+-    char *t;
++  { /* SCO 3.2v4 cc rejects this sort of thing.  */
++    char tx;
++    char *t = &tx;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
+@@ -6025,10 +6102,10 @@ main ()
+     iptr p = 0;
+     ++p;
+   }
+-  { /* AIX XL C 1.02.0.0 rejects this saying
++  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+-    struct s { int j; const int *ap[3]; };
+-    struct s *b; b->j = 5;
++    struct s { int j; const int *ap[3]; } bx;
++    struct s *b = &bx; b->j = 5;
+   }
+   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+     const int foo = 10;
+@@ -6169,6 +6246,8 @@ else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
++# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++#   include <stdlib.h>
+ # else
+ #  ifdef HAVE_ALLOCA_H
+ #   include <alloca.h>
+@@ -6272,23 +6351,20 @@ else
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+-find_stack_direction ()
++find_stack_direction (int *addr, int depth)
+ {
+-  static char *addr = 0;
+-  auto char dummy;
+-  if (addr == 0)
+-    {
+-      addr = &dummy;
+-      return find_stack_direction ();
+-    }
+-  else
+-    return (&dummy > addr) ? 1 : -1;
++  int dir, dummy = 0;
++  if (! addr)
++    addr = &dummy;
++  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
++  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
++  return dir + dummy;
+ }
+ 
+ int
+-main ()
++main (int argc, char **argv)
+ {
+-  return find_stack_direction () < 0;
++  return find_stack_direction (0, argc + !argv + 20) < 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -6332,7 +6408,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AS="${ac_tool_prefix}as"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6372,7 +6448,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AS="as"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6424,7 +6500,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6464,7 +6540,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6516,7 +6592,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6556,7 +6632,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6730,7 +6806,7 @@ do
+     for ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
++      as_fn_executable_p "$ac_path_SED" || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+   # Check for GNU $ac_path_SED
+ case `"$ac_path_SED" --version 2>&1` in
+@@ -6809,7 +6885,7 @@ do
+     for ac_prog in fgrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
++      as_fn_executable_p "$ac_path_FGREP" || continue
+ # Check for GNU ac_path_FGREP and select it if it is found.
+   # Check for GNU $ac_path_FGREP
+ case `"$ac_path_FGREP" --version 2>&1` in
+@@ -7065,7 +7141,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7109,7 +7185,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7533,7 +7609,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7573,7 +7649,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7876,7 +7952,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7916,7 +7992,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8016,7 +8092,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8060,7 +8136,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AR="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8185,7 +8261,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8225,7 +8301,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8284,7 +8360,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8324,7 +8400,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8973,7 +9049,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9013,7 +9089,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9093,7 +9169,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9133,7 +9209,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9185,7 +9261,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9225,7 +9301,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_NMEDIT="nmedit"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9277,7 +9353,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9317,7 +9393,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_LIPO="lipo"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9369,7 +9445,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9409,7 +9485,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OTOOL="otool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9461,7 +9537,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9501,7 +9577,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_OTOOL64="otool64"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13766,6 +13842,7 @@ VMIN=7
+ 
+ 
+ 
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -13786,7 +13863,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13829,7 +13906,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13920,6 +13997,7 @@ requirement_elm=""
+ 
+ 
+ 
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -13940,7 +14018,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -13983,7 +14061,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -14074,6 +14152,7 @@ if test -n "$EVIL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14090,6 +14169,7 @@ if test -n "$EVIL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14109,9 +14189,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil" 2>&1`
++	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil" 2>&1`
+         else
+-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil" 2>&1`
++	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVIL_PKG_ERRORS" >&5
+@@ -14126,7 +14206,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables EVIL_CFLAGS
+ and EVIL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14142,7 +14221,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
+ 	EVIL_LIBS=$pkg_cv_EVIL_LIBS
+@@ -14179,6 +14257,7 @@ if test -n "$EVIL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14195,6 +14274,7 @@ if test -n "$EVIL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14214,9 +14294,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil" 2>&1`
++	        EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil" 2>&1`
+         else
+-	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil" 2>&1`
++	        EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVIL_PKG_ERRORS" >&5
+@@ -14231,7 +14311,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables EVIL_CFLAGS
+ and EVIL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14247,7 +14326,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
+ 	EVIL_LIBS=$pkg_cv_EVIL_LIBS
+@@ -14707,6 +14785,7 @@ if test -n "$ELEMENTARY_CFLAGS"; then
+     edje >= 1.7.7
+ 
+ " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14750,6 +14829,7 @@ if test -n "$ELEMENTARY_LIBS"; then
+     edje >= 1.7.7
+ 
+ " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14769,7 +14849,7 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+     eina >= 1.7.7
+     eet >= 1.7.7
+     evas >= 1.7.7
+@@ -14780,7 +14860,7 @@ fi
+ 
+ " 2>&1`
+         else
+-	        ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+     eina >= 1.7.7
+     eet >= 1.7.7
+     evas >= 1.7.7
+@@ -14813,7 +14893,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables ELEMENTARY_CFLAGS
+ and ELEMENTARY_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14829,7 +14908,6 @@ See the pkg-config man page for more det
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+ 	ELEMENTARY_CFLAGS=$pkg_cv_ELEMENTARY_CFLAGS
+ 	ELEMENTARY_LIBS=$pkg_cv_ELEMENTARY_LIBS
+@@ -14855,6 +14933,7 @@ if test -n "$ELEMENTARY_ECORE_IMF_CFLAGS
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags "ecore-imf >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14871,6 +14950,7 @@ if test -n "$ELEMENTARY_ECORE_IMF_LIBS";
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_ECORE_IMF_LIBS=`$PKG_CONFIG --libs "ecore-imf >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14890,9 +14970,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-imf >= 1.7.7" 2>&1`
++	        ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-imf >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-imf >= 1.7.7" 2>&1`
++	        ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-imf >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_ECORE_IMF_PKG_ERRORS" >&5
+@@ -14942,6 +15022,7 @@ if test -n "$ELEMENTARY_ECORE_CON_CFLAGS
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_ECORE_CON_CFLAGS=`$PKG_CONFIG --cflags "ecore-con >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14958,6 +15039,7 @@ if test -n "$ELEMENTARY_ECORE_CON_LIBS";
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_ECORE_CON_LIBS=`$PKG_CONFIG --libs "ecore-con >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -14977,9 +15059,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-con >= 1.7.7" 2>&1`
++	        ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-con >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-con >= 1.7.7" 2>&1`
++	        ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-con >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_ECORE_CON_PKG_ERRORS" >&5
+@@ -15029,6 +15111,7 @@ if test -n "$EIO_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EIO_CFLAGS=`$PKG_CONFIG --cflags "eio" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15045,6 +15128,7 @@ if test -n "$EIO_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EIO_LIBS=`$PKG_CONFIG --libs "eio" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15064,9 +15148,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eio" 2>&1`
++	        EIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eio" 2>&1`
+         else
+-	        EIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "eio" 2>&1`
++	        EIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eio" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EIO_PKG_ERRORS" >&5
+@@ -15123,6 +15207,7 @@ if test -n "$EMOTION_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EMOTION_CFLAGS=`$PKG_CONFIG --cflags "emotion" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15139,6 +15224,7 @@ if test -n "$EMOTION_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EMOTION_LIBS=`$PKG_CONFIG --libs "emotion" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15158,9 +15244,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EMOTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "emotion" 2>&1`
++	        EMOTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "emotion" 2>&1`
+         else
+-	        EMOTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "emotion" 2>&1`
++	        EMOTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "emotion" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EMOTION_PKG_ERRORS" >&5
+@@ -15218,6 +15304,7 @@ if test -n "$ELEMENTARY_X_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_X_CFLAGS=`$PKG_CONFIG --cflags "ecore-x >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15234,6 +15321,7 @@ if test -n "$ELEMENTARY_X_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_X_LIBS=`$PKG_CONFIG --libs "ecore-x >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15253,9 +15341,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-x >= 1.7.7" 2>&1`
++	        ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-x >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-x >= 1.7.7" 2>&1`
++	        ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-x >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_X_PKG_ERRORS" >&5
+@@ -15312,6 +15400,7 @@ if test -n "$ELEMENTARY_FB_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_FB_CFLAGS=`$PKG_CONFIG --cflags "ecore-fb >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15328,6 +15417,7 @@ if test -n "$ELEMENTARY_FB_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_FB_LIBS=`$PKG_CONFIG --libs "ecore-fb >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15347,9 +15437,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-fb >= 1.7.7" 2>&1`
++	        ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-fb >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-fb >= 1.7.7" 2>&1`
++	        ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-fb >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_FB_PKG_ERRORS" >&5
+@@ -15405,6 +15495,7 @@ if test -n "$ELEMENTARY_PSL1GHT_CFLAGS";
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_PSL1GHT_CFLAGS=`$PKG_CONFIG --cflags "ecore-psl1ght >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15421,6 +15512,7 @@ if test -n "$ELEMENTARY_PSL1GHT_LIBS"; t
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_PSL1GHT_LIBS=`$PKG_CONFIG --libs "ecore-psl1ght >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15440,9 +15532,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-psl1ght >= 1.7.7" 2>&1`
++	        ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-psl1ght >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-psl1ght >= 1.7.7" 2>&1`
++	        ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-psl1ght >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_PSL1GHT_PKG_ERRORS" >&5
+@@ -15498,6 +15590,7 @@ if test -n "$ELEMENTARY_SDL_CFLAGS"; the
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_SDL_CFLAGS=`$PKG_CONFIG --cflags "ecore-sdl >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15514,6 +15607,7 @@ if test -n "$ELEMENTARY_SDL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_SDL_LIBS=`$PKG_CONFIG --libs "ecore-sdl >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15533,9 +15627,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-sdl >= 1.7.7" 2>&1`
++	        ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-sdl >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-sdl >= 1.7.7" 2>&1`
++	        ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-sdl >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_SDL_PKG_ERRORS" >&5
+@@ -15591,6 +15685,7 @@ if test -n "$ELEMENTARY_COCOA_CFLAGS"; t
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_COCOA_CFLAGS=`$PKG_CONFIG --cflags "ecore-cocoa >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15607,6 +15702,7 @@ if test -n "$ELEMENTARY_COCOA_LIBS"; the
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_COCOA_LIBS=`$PKG_CONFIG --libs "ecore-cocoa >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15626,9 +15722,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-cocoa >= 1.7.7" 2>&1`
++	        ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-cocoa >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-cocoa >= 1.7.7" 2>&1`
++	        ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-cocoa >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_COCOA_PKG_ERRORS" >&5
+@@ -15684,6 +15780,7 @@ if test -n "$ELEMENTARY_WIN32_CFLAGS"; t
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_WIN32_CFLAGS=`$PKG_CONFIG --cflags "ecore-win32 >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15700,6 +15797,7 @@ if test -n "$ELEMENTARY_WIN32_LIBS"; the
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_WIN32_LIBS=`$PKG_CONFIG --libs "ecore-win32 >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15719,9 +15817,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-win32 >= 1.7.7" 2>&1`
++	        ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-win32 >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-win32 >= 1.7.7" 2>&1`
++	        ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-win32 >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_WIN32_PKG_ERRORS" >&5
+@@ -15777,6 +15875,7 @@ if test -n "$ELEMENTARY_WINCE_CFLAGS"; t
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_WINCE_CFLAGS=`$PKG_CONFIG --cflags "ecore-wince >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15793,6 +15892,7 @@ if test -n "$ELEMENTARY_WINCE_LIBS"; the
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_WINCE_LIBS=`$PKG_CONFIG --libs "ecore-wince >= 1.7.7" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15812,9 +15912,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-wince >= 1.7.7" 2>&1`
++	        ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-wince >= 1.7.7" 2>&1`
+         else
+-	        ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-wince >= 1.7.7" 2>&1`
++	        ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-wince >= 1.7.7" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_WINCE_PKG_ERRORS" >&5
+@@ -15870,6 +15970,7 @@ if test -n "$ELEMENTARY_WAYLAND_CFLAGS";
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "ecore-wayland" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15886,6 +15987,7 @@ if test -n "$ELEMENTARY_WAYLAND_LIBS"; t
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_ELEMENTARY_WAYLAND_LIBS=`$PKG_CONFIG --libs "ecore-wayland" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15905,9 +16007,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-wayland" 2>&1`
++	        ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-wayland" 2>&1`
+         else
+-	        ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-wayland" 2>&1`
++	        ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-wayland" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ELEMENTARY_WAYLAND_PKG_ERRORS" >&5
+@@ -15970,6 +16072,7 @@ if test -n "$ELEMENTARY_EDBUS_CFLAGS"; t
+   pkg_cv_ELEMENTARY_EDBUS_CFLAGS=`$PKG_CONFIG --cflags "
+         edbus >= 1.7.7
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -15992,6 +16095,7 @@ if test -n "$ELEMENTARY_EDBUS_LIBS"; the
+   pkg_cv_ELEMENTARY_EDBUS_LIBS=`$PKG_CONFIG --libs "
+         edbus >= 1.7.7
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16011,11 +16115,11 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         edbus >= 1.7.7
+        " 2>&1`
+         else
+-	        ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         edbus >= 1.7.7
+        " 2>&1`
+         fi
+@@ -16088,6 +16192,7 @@ if test -n "$ELEMENTARY_EFREET_CFLAGS"; 
+         efreet-mime >= 1.7.7
+         efreet-trash >= 1.7.7
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16116,6 +16221,7 @@ if test -n "$ELEMENTARY_EFREET_LIBS"; th
+         efreet-mime >= 1.7.7
+         efreet-trash >= 1.7.7
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16135,13 +16241,13 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         efreet >= 1.7.7
+         efreet-mime >= 1.7.7
+         efreet-trash >= 1.7.7
+        " 2>&1`
+         else
+-	        ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         efreet >= 1.7.7
+         efreet-mime >= 1.7.7
+         efreet-trash >= 1.7.7
+@@ -16210,6 +16316,7 @@ if test -n "$ELEMENTARY_EWEATHER_CFLAGS"
+   pkg_cv_ELEMENTARY_EWEATHER_CFLAGS=`$PKG_CONFIG --cflags "
+         eweather
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16232,6 +16339,7 @@ if test -n "$ELEMENTARY_EWEATHER_LIBS"; 
+   pkg_cv_ELEMENTARY_EWEATHER_LIBS=`$PKG_CONFIG --libs "
+         eweather
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16251,11 +16359,11 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         eweather
+        " 2>&1`
+         else
+-	        ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         eweather
+        " 2>&1`
+         fi
+@@ -16322,6 +16430,7 @@ if test -n "$ELEMENTARY_EMAP_CFLAGS"; th
+   pkg_cv_ELEMENTARY_EMAP_CFLAGS=`$PKG_CONFIG --cflags "
+         emap
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16344,6 +16453,7 @@ if test -n "$ELEMENTARY_EMAP_LIBS"; then
+   pkg_cv_ELEMENTARY_EMAP_LIBS=`$PKG_CONFIG --libs "
+         emap
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16363,11 +16473,11 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         emap
+        " 2>&1`
+         else
+-	        ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         emap
+        " 2>&1`
+         fi
+@@ -16436,6 +16546,7 @@ if test -n "$ELEMENTARY_ETHUMB_CFLAGS"; 
+   pkg_cv_ELEMENTARY_ETHUMB_CFLAGS=`$PKG_CONFIG --cflags "
+         ethumb_client
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16458,6 +16569,7 @@ if test -n "$ELEMENTARY_ETHUMB_LIBS"; th
+   pkg_cv_ELEMENTARY_ETHUMB_LIBS=`$PKG_CONFIG --libs "
+         ethumb_client
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16477,11 +16589,11 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         ethumb_client
+        " 2>&1`
+         else
+-	        ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         ethumb_client
+        " 2>&1`
+         fi
+@@ -16548,6 +16660,7 @@ if test -n "$ELEMENTARY_WEB_CFLAGS"; the
+   pkg_cv_ELEMENTARY_WEB_CFLAGS=`$PKG_CONFIG --cflags "
+         ewebkit
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16570,6 +16683,7 @@ if test -n "$ELEMENTARY_WEB_LIBS"; then
+   pkg_cv_ELEMENTARY_WEB_LIBS=`$PKG_CONFIG --libs "
+         ewebkit
+        " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -16589,11 +16703,11 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
++	        ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+         ewebkit
+        " 2>&1`
+         else
+-	        ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --print-errors "
++	        ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+         ewebkit
+        " 2>&1`
+         fi
+@@ -16804,7 +16918,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_efl_have_doxygen="yes"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -16853,7 +16967,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_efl_have_doxygen="yes"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -17008,6 +17122,13 @@ fi
+ 
+ 
+ 
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++
++
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+ $as_echo_n "checking whether NLS is requested... " >&6; }
+     # Check whether --enable-nls was given.
+@@ -17115,7 +17236,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -19090,14 +19211,15 @@ extern char **environ;
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ 
+ $as_echo "#define HAVE_ENVIRON 1" >>confdefs.h
+ 
+ 
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -19114,14 +19236,15 @@ clearenv();
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ 
+ $as_echo "#define HAVE_CLEARENV 1" >>confdefs.h
+ 
+ 
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ ac_config_files="$ac_config_files Makefile elementary.spec elementary.pc doc/Makefile doc/Doxyfile doc/widgets/Makefile src/Makefile src/lib/Makefile src/lib/Elementary.h src/bin/Makefile src/modules/Makefile src/modules/access_output/Makefile src/modules/datetime_input_ctxpopup/Makefile src/modules/test_entry/Makefile src/modules/test_map/Makefile src/edje_externals/Makefile src/examples/Makefile data/Makefile data/themes/Makefile data/images/Makefile data/objects/Makefile data/desktop/Makefile data/edje_externals/Makefile config/Makefile config/default/Makefile config/standard/Makefile config/mobile/Makefile $po_makefile_in"
+ 
+@@ -19234,6 +19357,14 @@ LIBOBJS=$ac_libobjs
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
++$as_echo_n "checking that generated files are newer than configure... " >&6; }
++   if test -n "$am_sleep_pid"; then
++     # Hide warnings about reused PIDs.
++     wait $am_sleep_pid 2>/dev/null
++   fi
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
++$as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+@@ -19609,16 +19740,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -19678,28 +19809,16 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -19721,7 +19840,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by elementary $as_me 1.7.7, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -19787,10 +19906,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ elementary config.status 1.7.7
+-configured by $0, generated by GNU Autoconf 2.68,
++configured by $0, generated by GNU Autoconf 2.69,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -19881,7 +20000,7 @@ fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   shift
+   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+   CONFIG_SHELL='$SHELL'
+@@ -20829,7 +20948,7 @@ $as_echo "$as_me: executing $ac_file com
+ 
+   case $ac_file$ac_mode in
+     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
++  # Older Autoconf quotes --file arguments for eval, but not when files
+   # are listed without --file.  Let's play safe and only enable the eval
+   # if we detect the quoting.
+   case $CONFIG_FILES in
+@@ -20842,7 +20961,7 @@ $as_echo "$as_me: executing $ac_file com
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named `Makefile.in', but
++    # We used to match only the files named 'Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -20876,21 +20995,19 @@ $as_echo X"$mf" |
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running `make'.
++    # from the Makefile without running 'make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-    test -z "am__include" && continue
++    test -z "$am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-    # When using ansi2knr, U may be empty or an underscore; expand it
+-    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`$as_dirname -- "$file" ||
diff --git a/x11/enlightenment/DESCR b/x11/enlightenment/DESCR
new file mode 100644
index 00000000000..bb59a35c2bd
--- /dev/null
+++ b/x11/enlightenment/DESCR
@@ -0,0 +1,10 @@
+Enlightenment has grown to be much more than a window manager.
+It has many systems that have grown on their own to support development
+of the next version (0.17) and all the effort is going into solidifying
+these systems to be more than solid to build on.
+This has lead to a lot of code being produced that is useful far
+and beyond a window manager. The idea is to share as much code
+as possible with other programs, and so a small army of shared libraries
+has evolved for Enlightenment. This page attempts to cover some
+of these (especially the more interesting ones) to give a good insight
+into why they exist, what they do, how to use them, and where they are going.
diff --git a/x11/enlightenment/MESSAGE.NetBSD b/x11/enlightenment/MESSAGE.NetBSD
new file mode 100644
index 00000000000..6f8c4fffffc
--- /dev/null
+++ b/x11/enlightenment/MESSAGE.NetBSD
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+Please copy the enlightement file to your /etc/pam.d
+in order to make user authentication work in e17.
+
+===========================================================================
diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile
new file mode 100644
index 00000000000..306d0093a08
--- /dev/null
+++ b/x11/enlightenment/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.27 2013/06/16 18:56:06 sno Exp $
+#
+
+DISTNAME=	enlightenment-0.17.3
+CATEGORIES=	x11
+MASTER_SITES=	http://download.enlightenment.org/releases/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://enlightenment.org/
+COMMENT=	Enlightenment Window Manager, Development Release
+LICENSE=	2-clause-bsd
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS=	gmake pkg-config automake autoconf
+
+PKG_SYSCONFSUBDIR=	enlightenment
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+EGDIR=		${PREFIX}/share/examples/enlightenment
+CONF_FILES=	${EGDIR}/sysactions.conf \
+		${PKG_SYSCONFDIR}/sysactions.conf \
+		${PKG_SYSCONFDIR}/enlightenment/sysactions.conf \
+		${PKG_SYSCONFDIR}/xdg/menus/enlightenment.menu
+
+CONFIGURE_ARGS+=	--disable-mount-hal --disable-mount-udisks \
+			--disable-mount-eeze
+CONFIGURE_ENV+=		MODULE_ARCH="${LOWER_OPSYS}-${MACHINE_ARCH}"
+
+INSTALLATION_DIRS=	${EGDIR}
+
+pre-install:
+	${INSTALL_DATA} ${WRKSRC}/data/etc/sysactions.conf ${DESTDIR}${EGDIR}
+
+PKGCONFIG_OVERRIDE=	enlightenment.pc.in
+
+MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}-ver-pre-svn-08
+PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+
+.include "../../devel/ecore/buildlink3.mk"
+.include "../../devel/eet/buildlink3.mk"
+.include "../../graphics/edje/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/evas-buffer/buildlink3.mk"
+.include "../../graphics/evas-eet/buildlink3.mk"
+.include "../../graphics/evas-jpeg/buildlink3.mk"
+.include "../../graphics/evas-png/buildlink3.mk"
+.include "../../sysutils/edbus/buildlink3.mk"
+.include "../../sysutils/efreet/buildlink3.mk"
+.include "../../devel/eio/buildlink3.mk"
+.include "../../x11/elementary/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/enlightenment/PLIST b/x11/enlightenment/PLIST
new file mode 100644
index 00000000000..3a02c116feb
--- /dev/null
+++ b/x11/enlightenment/PLIST
@@ -0,0 +1,611 @@
+@comment $NetBSD: PLIST,v 1.1 2013/06/16 18:56:06 sno Exp $
+bin/enlightenment
+bin/enlightenment_filemanager
+bin/enlightenment_imc
+bin/enlightenment_open
+bin/enlightenment_remote
+bin/enlightenment_start
+include/enlightenment/e.h
+include/enlightenment/e_about.h
+include/enlightenment/e_acpi.h
+include/enlightenment/e_actions.h
+include/enlightenment/e_alert.h
+include/enlightenment/e_atoms.h
+include/enlightenment/e_backlight.h
+include/enlightenment/e_bg.h
+include/enlightenment/e_bindings.h
+include/enlightenment/e_border.h
+include/enlightenment/e_box.h
+include/enlightenment/e_canvas.h
+include/enlightenment/e_color.h
+include/enlightenment/e_color_class.h
+include/enlightenment/e_color_dialog.h
+include/enlightenment/e_config.h
+include/enlightenment/e_config_data.h
+include/enlightenment/e_config_dialog.h
+include/enlightenment/e_configure.h
+include/enlightenment/e_confirm_dialog.h
+include/enlightenment/e_container.h
+include/enlightenment/e_datastore.h
+include/enlightenment/e_desk.h
+include/enlightenment/e_deskenv.h
+include/enlightenment/e_desklock.h
+include/enlightenment/e_dialog.h
+include/enlightenment/e_dnd.h
+include/enlightenment/e_dpms.h
+include/enlightenment/e_eap_editor.h
+include/enlightenment/e_entry.h
+include/enlightenment/e_entry_dialog.h
+include/enlightenment/e_env.h
+include/enlightenment/e_error.h
+include/enlightenment/e_exec.h
+include/enlightenment/e_exehist.h
+include/enlightenment/e_filereg.h
+include/enlightenment/e_flowlayout.h
+include/enlightenment/e_fm.h
+include/enlightenment/e_fm_custom.h
+include/enlightenment/e_fm_device.h
+include/enlightenment/e_fm_mime.h
+include/enlightenment/e_fm_op.h
+include/enlightenment/e_fm_op_registry.h
+include/enlightenment/e_fm_prop.h
+include/enlightenment/e_fm_shared_codec.h
+include/enlightenment/e_fm_shared_device.h
+include/enlightenment/e_fm_shared_types.h
+include/enlightenment/e_focus.h
+include/enlightenment/e_font.h
+include/enlightenment/e_gadcon.h
+include/enlightenment/e_gadcon_popup.h
+include/enlightenment/e_grab_dialog.h
+include/enlightenment/e_grabinput.h
+include/enlightenment/e_hints.h
+include/enlightenment/e_icon.h
+include/enlightenment/e_ilist.h
+include/enlightenment/e_import_config_dialog.h
+include/enlightenment/e_import_dialog.h
+include/enlightenment/e_includes.h
+include/enlightenment/e_init.h
+include/enlightenment/e_int_border_locks.h
+include/enlightenment/e_int_border_menu.h
+include/enlightenment/e_int_border_prop.h
+include/enlightenment/e_int_border_remember.h
+include/enlightenment/e_int_config_modules.h
+include/enlightenment/e_int_gadcon_config.h
+include/enlightenment/e_int_menus.h
+include/enlightenment/e_int_shelf_config.h
+include/enlightenment/e_int_toolbar_config.h
+include/enlightenment/e_intl.h
+include/enlightenment/e_intl_data.h
+include/enlightenment/e_ipc.h
+include/enlightenment/e_ipc_codec.h
+include/enlightenment/e_layout.h
+include/enlightenment/e_livethumb.h
+include/enlightenment/e_log.h
+include/enlightenment/e_manager.h
+include/enlightenment/e_maximize.h
+include/enlightenment/e_menu.h
+include/enlightenment/e_mmx.h
+include/enlightenment/e_module.h
+include/enlightenment/e_mouse.h
+include/enlightenment/e_moveresize.h
+include/enlightenment/e_msg.h
+include/enlightenment/e_msgbus.h
+include/enlightenment/e_obj_dialog.h
+include/enlightenment/e_object.h
+include/enlightenment/e_order.h
+include/enlightenment/e_pan.h
+include/enlightenment/e_path.h
+include/enlightenment/e_place.h
+include/enlightenment/e_pointer.h
+include/enlightenment/e_popup.h
+include/enlightenment/e_powersave.h
+include/enlightenment/e_prefix.h
+include/enlightenment/e_randr.h
+include/enlightenment/e_remember.h
+include/enlightenment/e_resist.h
+include/enlightenment/e_scale.h
+include/enlightenment/e_screensaver.h
+include/enlightenment/e_scrollframe.h
+include/enlightenment/e_sha1.h
+include/enlightenment/e_shelf.h
+include/enlightenment/e_signals.h
+include/enlightenment/e_slidecore.h
+include/enlightenment/e_slider.h
+include/enlightenment/e_slidesel.h
+include/enlightenment/e_spectrum.h
+include/enlightenment/e_startup.h
+include/enlightenment/e_stolen.h
+include/enlightenment/e_sys.h
+include/enlightenment/e_table.h
+include/enlightenment/e_test.h
+include/enlightenment/e_theme.h
+include/enlightenment/e_theme_about.h
+include/enlightenment/e_thumb.h
+include/enlightenment/e_toolbar.h
+include/enlightenment/e_update.h
+include/enlightenment/e_user.h
+include/enlightenment/e_utils.h
+include/enlightenment/e_widget.h
+include/enlightenment/e_widget_aspect.h
+include/enlightenment/e_widget_button.h
+include/enlightenment/e_widget_check.h
+include/enlightenment/e_widget_color_well.h
+include/enlightenment/e_widget_config_list.h
+include/enlightenment/e_widget_csel.h
+include/enlightenment/e_widget_cslider.h
+include/enlightenment/e_widget_deskpreview.h
+include/enlightenment/e_widget_entry.h
+include/enlightenment/e_widget_filepreview.h
+include/enlightenment/e_widget_flist.h
+include/enlightenment/e_widget_font_preview.h
+include/enlightenment/e_widget_framelist.h
+include/enlightenment/e_widget_frametable.h
+include/enlightenment/e_widget_fsel.h
+include/enlightenment/e_widget_ilist.h
+include/enlightenment/e_widget_image.h
+include/enlightenment/e_widget_label.h
+include/enlightenment/e_widget_list.h
+include/enlightenment/e_widget_preview.h
+include/enlightenment/e_widget_radio.h
+include/enlightenment/e_widget_scrollframe.h
+include/enlightenment/e_widget_slider.h
+include/enlightenment/e_widget_spectrum.h
+include/enlightenment/e_widget_table.h
+include/enlightenment/e_widget_textblock.h
+include/enlightenment/e_widget_toolbar.h
+include/enlightenment/e_widget_toolbook.h
+include/enlightenment/e_win.h
+include/enlightenment/e_xinerama.h
+include/enlightenment/e_xkb.h
+include/enlightenment/e_xsettings.h
+include/enlightenment/e_zone.h
+include/enlightenment/evry_api.h
+include/enlightenment/evry_types.h
+lib/enlightenment/modules/backlight/e-module-backlight.edj
+lib/enlightenment/modules/backlight/module.desktop
+lib/enlightenment/modules/backlight/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/battery/e-module-battery.edj
+lib/enlightenment/modules/battery/module.desktop
+lib/enlightenment/modules/battery/netbsd-${MACHINE_ARCH}-${PKGVERSION}/batget
+lib/enlightenment/modules/battery/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/clock/e-module-clock.edj
+lib/enlightenment/modules/clock/module.desktop
+lib/enlightenment/modules/clock/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/comp/e-module-comp.edj
+lib/enlightenment/modules/comp/module.desktop
+lib/enlightenment/modules/comp/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf/e-module-conf.edj
+lib/enlightenment/modules/conf/module.desktop
+lib/enlightenment/modules/conf/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
+lib/enlightenment/modules/conf_applications/module.desktop
+lib/enlightenment/modules/conf_applications/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
+lib/enlightenment/modules/conf_dialogs/module.desktop
+lib/enlightenment/modules/conf_dialogs/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_display/module.desktop
+lib/enlightenment/modules/conf_display/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_edgebindings/e-module-conf_edgebindings.edj
+lib/enlightenment/modules/conf_edgebindings/module.desktop
+lib/enlightenment/modules/conf_edgebindings/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
+lib/enlightenment/modules/conf_interaction/module.desktop
+lib/enlightenment/modules/conf_interaction/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_intl/module.desktop
+lib/enlightenment/modules/conf_intl/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_keybindings/module.desktop
+lib/enlightenment/modules/conf_keybindings/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
+lib/enlightenment/modules/conf_menus/module.desktop
+lib/enlightenment/modules/conf_menus/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_paths/e-module-conf_paths.edj
+lib/enlightenment/modules/conf_paths/module.desktop
+lib/enlightenment/modules/conf_paths/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_performance/e-module-conf_performance.edj
+lib/enlightenment/modules/conf_performance/module.desktop
+lib/enlightenment/modules/conf_performance/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_randr/e-module-conf_randr.edj
+lib/enlightenment/modules/conf_randr/module.desktop
+lib/enlightenment/modules/conf_randr/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
+lib/enlightenment/modules/conf_shelves/module.desktop
+lib/enlightenment/modules/conf_shelves/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_theme/module.desktop
+lib/enlightenment/modules/conf_theme/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_window_manipulation/module.desktop
+lib/enlightenment/modules/conf_window_manipulation/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_window_remembers/e-module-conf_window_remembers.edj
+lib/enlightenment/modules/conf_window_remembers/module.desktop
+lib/enlightenment/modules/conf_window_remembers/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/connman/e-module-connman.edj
+lib/enlightenment/modules/connman/module.desktop
+lib/enlightenment/modules/connman/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/cpufreq/e-module-cpufreq.edj
+lib/enlightenment/modules/cpufreq/module.desktop
+lib/enlightenment/modules/cpufreq/netbsd-${MACHINE_ARCH}-${PKGVERSION}/freqset
+lib/enlightenment/modules/cpufreq/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/dropshadow/e-module-dropshadow.edj
+lib/enlightenment/modules/dropshadow/module.desktop
+lib/enlightenment/modules/dropshadow/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/everything/e-module-everything-start.edj
+lib/enlightenment/modules/everything/e-module-everything.edj
+lib/enlightenment/modules/everything/module.desktop
+lib/enlightenment/modules/everything/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/fileman/e-module-fileman.edj
+lib/enlightenment/modules/fileman/module.desktop
+lib/enlightenment/modules/fileman/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/fileman_opinfo/e-module-fileman_opinfo.edj
+lib/enlightenment/modules/fileman_opinfo/module.desktop
+lib/enlightenment/modules/fileman_opinfo/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/gadman/e-module-gadman.edj
+lib/enlightenment/modules/gadman/module.desktop
+lib/enlightenment/modules/gadman/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/ibar/e-module-ibar.edj
+lib/enlightenment/modules/ibar/module.desktop
+lib/enlightenment/modules/ibar/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/ibox/e-module-ibox.edj
+lib/enlightenment/modules/ibox/module.desktop
+lib/enlightenment/modules/ibox/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-bluetooth/e-module-illume-bluetooth.edj
+lib/enlightenment/modules/illume-bluetooth/module.desktop
+lib/enlightenment/modules/illume-bluetooth/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-home-toggle/e-module-illume-home-toggle.edj
+lib/enlightenment/modules/illume-home-toggle/module.desktop
+lib/enlightenment/modules/illume-home-toggle/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-home/e-module-illume-home.edj
+lib/enlightenment/modules/illume-home/module.desktop
+lib/enlightenment/modules/illume-home/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-indicator/e-module-illume-indicator.edj
+lib/enlightenment/modules/illume-indicator/module.desktop
+lib/enlightenment/modules/illume-indicator/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-kbd-toggle/e-module-illume-kbd-toggle.edj
+lib/enlightenment/modules/illume-kbd-toggle/module.desktop
+lib/enlightenment/modules/illume-kbd-toggle/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-keyboard/dicts/English_US.dic
+lib/enlightenment/modules/illume-keyboard/dicts/English_US_Small.dic
+lib/enlightenment/modules/illume-keyboard/e-module-illume-keyboard.edj
+lib/enlightenment/modules/illume-keyboard/keyboards/Default.kbd
+lib/enlightenment/modules/illume-keyboard/keyboards/Numbers.kbd
+lib/enlightenment/modules/illume-keyboard/keyboards/Terminal.kbd
+lib/enlightenment/modules/illume-keyboard/keyboards/alpha.png
+lib/enlightenment/modules/illume-keyboard/keyboards/backspace.png
+lib/enlightenment/modules/illume-keyboard/keyboards/down.png
+lib/enlightenment/modules/illume-keyboard/keyboards/enter.png
+lib/enlightenment/modules/illume-keyboard/keyboards/ignore_built_in_keyboards
+lib/enlightenment/modules/illume-keyboard/keyboards/left.png
+lib/enlightenment/modules/illume-keyboard/keyboards/numeric.png
+lib/enlightenment/modules/illume-keyboard/keyboards/qwerty.png
+lib/enlightenment/modules/illume-keyboard/keyboards/right.png
+lib/enlightenment/modules/illume-keyboard/keyboards/shift.png
+lib/enlightenment/modules/illume-keyboard/keyboards/tab.png
+lib/enlightenment/modules/illume-keyboard/keyboards/up.png
+lib/enlightenment/modules/illume-keyboard/module.desktop
+lib/enlightenment/modules/illume-keyboard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj
+lib/enlightenment/modules/illume-mode-toggle/module.desktop
+lib/enlightenment/modules/illume-mode-toggle/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-softkey/e-module-illume-softkey.edj
+lib/enlightenment/modules/illume-softkey/module.desktop
+lib/enlightenment/modules/illume-softkey/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume2/e-module-illume2.edj
+lib/enlightenment/modules/illume2/keyboards/ignore_built_in_keyboards
+lib/enlightenment/modules/illume2/module.desktop
+lib/enlightenment/modules/illume2/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume2/policies/illume.la
+lib/enlightenment/modules/illume2/policies/tablet.la
+lib/enlightenment/modules/mixer/e-module-mixer.edj
+lib/enlightenment/modules/mixer/module.desktop
+lib/enlightenment/modules/mixer/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/msgbus/e-module-msgbus.edj
+lib/enlightenment/modules/msgbus/module.desktop
+lib/enlightenment/modules/msgbus/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/notification/e-module-notification.edj
+lib/enlightenment/modules/notification/module.desktop
+lib/enlightenment/modules/notification/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/pager/e-module-pager.edj
+lib/enlightenment/modules/pager/module.desktop
+lib/enlightenment/modules/pager/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
+lib/enlightenment/modules/quickaccess/module.desktop
+lib/enlightenment/modules/quickaccess/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/shot/e-module-shot.edj
+lib/enlightenment/modules/shot/module.desktop
+lib/enlightenment/modules/shot/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/start/e-module-start.edj
+lib/enlightenment/modules/start/module.desktop
+lib/enlightenment/modules/start/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/syscon/e-module-syscon.edj
+lib/enlightenment/modules/syscon/module.desktop
+lib/enlightenment/modules/syscon/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/systray/e-module-systray.edj
+lib/enlightenment/modules/systray/module.desktop
+lib/enlightenment/modules/systray/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/tasks/e-module-tasks.edj
+lib/enlightenment/modules/tasks/module.desktop
+lib/enlightenment/modules/tasks/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/temperature/e-module-temperature.edj
+lib/enlightenment/modules/temperature/module.desktop
+lib/enlightenment/modules/temperature/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/temperature/netbsd-${MACHINE_ARCH}-${PKGVERSION}/tempget
+lib/enlightenment/modules/tiling/e-module-tiling.edj
+lib/enlightenment/modules/tiling/module.desktop
+lib/enlightenment/modules/tiling/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/winlist/e-module-winlist.edj
+lib/enlightenment/modules/winlist/module.desktop
+lib/enlightenment/modules/winlist/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/wizard/def-ibar.txt
+lib/enlightenment/modules/wizard/desktop/home.desktop
+lib/enlightenment/modules/wizard/desktop/root.desktop
+lib/enlightenment/modules/wizard/desktop/tmp.desktop
+lib/enlightenment/modules/wizard/extra_desktops/mplayer.desktop
+lib/enlightenment/modules/wizard/extra_desktops/xterm.desktop
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_000.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_010.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_011.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_020.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_030.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_040.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_050.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_060.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_070.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_080.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_090.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_100.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_110.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_120.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_130.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_140.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_150.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_160.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_170.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_180.la
+lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_200.la
+lib/enlightenment/modules/xkbswitch/e-module-xkbswitch.edj
+lib/enlightenment/modules/xkbswitch/module.desktop
+lib/enlightenment/modules/xkbswitch/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/utils/enlightenment_alert
+lib/enlightenment/utils/enlightenment_fm
+lib/enlightenment/utils/enlightenment_fm_op
+lib/enlightenment/utils/enlightenment_init
+lib/enlightenment/utils/enlightenment_static_grabber
+lib/enlightenment/utils/enlightenment_sys
+lib/enlightenment/utils/enlightenment_thumb
+lib/pkgconfig/enlightenment.pc
+lib/pkgconfig/everything.pc
+share/applications/enlightenment_filemanager.desktop
+share/enlightenment/AUTHORS
+share/enlightenment/COPYING
+share/enlightenment/data/backgrounds/Brown_Rock_Hi.edj
+share/enlightenment/data/backgrounds/Colorful_Roses.edj
+share/enlightenment/data/backgrounds/Curly_Leaves.edj
+share/enlightenment/data/backgrounds/Dark_Gradient.edj
+share/enlightenment/data/backgrounds/Darkconcrete.edj
+share/enlightenment/data/backgrounds/Flower_Petals.edj
+share/enlightenment/data/backgrounds/Go_Away.edj
+share/enlightenment/data/backgrounds/Grassy.edj
+share/enlightenment/data/backgrounds/Green_Stem.edj
+share/enlightenment/data/backgrounds/Hills.edj
+share/enlightenment/data/backgrounds/Japanesemaple.edj
+share/enlightenment/data/backgrounds/Lakegrass.edj
+share/enlightenment/data/backgrounds/Lantern_Cluster.edj
+share/enlightenment/data/backgrounds/Leafy_Red.edj
+share/enlightenment/data/backgrounds/Light.edj
+share/enlightenment/data/backgrounds/Light_Gradient.edj
+share/enlightenment/data/backgrounds/Mossstring.edj
+share/enlightenment/data/backgrounds/Motleyrock.edj
+share/enlightenment/data/backgrounds/Newgrowth.edj
+share/enlightenment/data/backgrounds/Orange_Roses.edj
+share/enlightenment/data/backgrounds/Pattern_Radial.edj
+share/enlightenment/data/backgrounds/Pattern_Vertical.edj
+share/enlightenment/data/backgrounds/Pattern_Vertical_Hi.edj
+share/enlightenment/data/backgrounds/Pine_Silhouettes.edj
+share/enlightenment/data/backgrounds/Purple_Flower_Bunch.edj
+share/enlightenment/data/backgrounds/Ramen.edj
+share/enlightenment/data/backgrounds/Shady_Leaves.edj
+share/enlightenment/data/backgrounds/Skywall.edj
+share/enlightenment/data/backgrounds/Stringflower.edj
+share/enlightenment/data/backgrounds/Temple.edj
+share/enlightenment/data/backgrounds/Train.edj
+share/enlightenment/data/backgrounds/Wall_Lanterns.edj
+share/enlightenment/data/backgrounds/Wetgrass.edj
+share/enlightenment/data/backgrounds/Wetleaf.edj
+share/enlightenment/data/backgrounds/Whiterock.edj
+share/enlightenment/data/backgrounds/Windy_Palm.edj
+share/enlightenment/data/config/default/e.cfg
+share/enlightenment/data/config/default/enlightenment-default.png
+share/enlightenment/data/config/default/profile.desktop
+share/enlightenment/data/config/mobile/e.cfg
+share/enlightenment/data/config/mobile/enlightenment-mobile.png
+share/enlightenment/data/config/mobile/module.battery.cfg
+share/enlightenment/data/config/mobile/module.conf.cfg
+share/enlightenment/data/config/mobile/module.illume-home.cfg
+share/enlightenment/data/config/mobile/module.illume-indicator.cfg
+share/enlightenment/data/config/mobile/module.illume-keyboard.cfg
+share/enlightenment/data/config/mobile/module.illume-softkey.cfg
+share/enlightenment/data/config/mobile/module.illume2.cfg
+share/enlightenment/data/config/mobile/profile.desktop
+share/enlightenment/data/config/profile.cfg
+share/enlightenment/data/config/standard/e.cfg
+share/enlightenment/data/config/standard/enlightenment-standard.png
+share/enlightenment/data/config/standard/module.battery.cfg
+share/enlightenment/data/config/standard/module.conf.cfg
+share/enlightenment/data/config/standard/module.cpufreq.cfg
+share/enlightenment/data/config/standard/module.dropshadow.cfg
+share/enlightenment/data/config/standard/module.fileman.cfg
+share/enlightenment/data/config/standard/module.ibar.cfg
+share/enlightenment/data/config/standard/module.ibox.cfg
+share/enlightenment/data/config/standard/module.pager.cfg
+share/enlightenment/data/config/standard/module.temperature.cfg
+share/enlightenment/data/config/standard/profile.desktop
+share/enlightenment/data/favorites/.order
+share/enlightenment/data/favorites/desktop.desktop
+share/enlightenment/data/favorites/home.desktop
+share/enlightenment/data/favorites/root.desktop
+share/enlightenment/data/favorites/tmp.desktop
+share/enlightenment/data/flags/ad_flag.png
+share/enlightenment/data/flags/af_flag.png
+share/enlightenment/data/flags/al_flag.png
+share/enlightenment/data/flags/am_flag.png
+share/enlightenment/data/flags/ar_flag.png
+share/enlightenment/data/flags/ara_flag.png
+share/enlightenment/data/flags/at_flag.png
+share/enlightenment/data/flags/az_flag.png
+share/enlightenment/data/flags/ba_flag.png
+share/enlightenment/data/flags/bd_flag.png
+share/enlightenment/data/flags/be_flag.png
+share/enlightenment/data/flags/bg_flag.png
+share/enlightenment/data/flags/br_flag.png
+share/enlightenment/data/flags/brai_flag.png
+share/enlightenment/data/flags/bt_flag.png
+share/enlightenment/data/flags/bw_flag.png
+share/enlightenment/data/flags/by_flag.png
+share/enlightenment/data/flags/ca_flag.png
+share/enlightenment/data/flags/cat_flag.png
+share/enlightenment/data/flags/cd_flag.png
+share/enlightenment/data/flags/ch_flag.png
+share/enlightenment/data/flags/cm_flag.png
+share/enlightenment/data/flags/cn_flag.png
+share/enlightenment/data/flags/cz_flag.png
+share/enlightenment/data/flags/de_flag.png
+share/enlightenment/data/flags/dk_flag.png
+share/enlightenment/data/flags/ee_flag.png
+share/enlightenment/data/flags/epo_flag.png
+share/enlightenment/data/flags/es_flag.png
+share/enlightenment/data/flags/et_flag.png
+share/enlightenment/data/flags/fi_flag.png
+share/enlightenment/data/flags/fo_flag.png
+share/enlightenment/data/flags/fr_flag.png
+share/enlightenment/data/flags/gb_flag.png
+share/enlightenment/data/flags/ge_flag.png
+share/enlightenment/data/flags/gh_flag.png
+share/enlightenment/data/flags/gn_flag.png
+share/enlightenment/data/flags/gr_flag.png
+share/enlightenment/data/flags/hr_flag.png
+share/enlightenment/data/flags/hu_flag.png
+share/enlightenment/data/flags/ie_flag.png
+share/enlightenment/data/flags/il_flag.png
+share/enlightenment/data/flags/in_flag.png
+share/enlightenment/data/flags/iq_flag.png
+share/enlightenment/data/flags/ir_flag.png
+share/enlightenment/data/flags/is_flag.png
+share/enlightenment/data/flags/it_flag.png
+share/enlightenment/data/flags/jp_flag.png
+share/enlightenment/data/flags/ke_flag.png
+share/enlightenment/data/flags/kg_flag.png
+share/enlightenment/data/flags/kh_flag.png
+share/enlightenment/data/flags/kr_flag.png
+share/enlightenment/data/flags/ku_flag.png
+share/enlightenment/data/flags/kz_flag.png
+share/enlightenment/data/flags/la_flag.png
+share/enlightenment/data/flags/lang-system.png
+share/enlightenment/data/flags/latam_flag.png
+share/enlightenment/data/flags/lk_flag.png
+share/enlightenment/data/flags/lt_flag.png
+share/enlightenment/data/flags/lv_flag.png
+share/enlightenment/data/flags/ma_flag.png
+share/enlightenment/data/flags/mao_flag.png
+share/enlightenment/data/flags/me_flag.png
+share/enlightenment/data/flags/mk_flag.png
+share/enlightenment/data/flags/ml_flag.png
+share/enlightenment/data/flags/mm_flag.png
+share/enlightenment/data/flags/mn_flag.png
+share/enlightenment/data/flags/mt_flag.png
+share/enlightenment/data/flags/mv_flag.png
+share/enlightenment/data/flags/my_flag.png
+share/enlightenment/data/flags/ng_flag.png
+share/enlightenment/data/flags/nl_flag.png
+share/enlightenment/data/flags/no_flag.png
+share/enlightenment/data/flags/np_flag.png
+share/enlightenment/data/flags/ph_flag.png
+share/enlightenment/data/flags/pk_flag.png
+share/enlightenment/data/flags/pl_flag.png
+share/enlightenment/data/flags/pt_flag.png
+share/enlightenment/data/flags/ro_flag.png
+share/enlightenment/data/flags/rs_flag.png
+share/enlightenment/data/flags/ru_flag.png
+share/enlightenment/data/flags/se_flag.png
+share/enlightenment/data/flags/si_flag.png
+share/enlightenment/data/flags/sk_flag.png
+share/enlightenment/data/flags/sn_flag.png
+share/enlightenment/data/flags/sy_flag.png
+share/enlightenment/data/flags/th_flag.png
+share/enlightenment/data/flags/tj_flag.png
+share/enlightenment/data/flags/tm_flag.png
+share/enlightenment/data/flags/tr_flag.png
+share/enlightenment/data/flags/tw_flag.png
+share/enlightenment/data/flags/tz_flag.png
+share/enlightenment/data/flags/ua_flag.png
+share/enlightenment/data/flags/unknown_flag.png
+share/enlightenment/data/flags/us_flag.png
+share/enlightenment/data/flags/uz_flag.png
+share/enlightenment/data/flags/vn_flag.png
+share/enlightenment/data/flags/za_flag.png
+share/enlightenment/data/icons/audio_player.png
+share/enlightenment/data/icons/audio_player2.png
+share/enlightenment/data/icons/image_viewer.png
+share/enlightenment/data/icons/mail_client.png
+share/enlightenment/data/icons/text_editor.png
+share/enlightenment/data/icons/video_player.png
+share/enlightenment/data/icons/web_browser.png
+share/enlightenment/data/icons/xterm.png
+share/enlightenment/data/images/enlightenment.png
+share/enlightenment/data/images/test.edj
+share/enlightenment/data/images/test.jpg
+share/enlightenment/data/images/test.png
+share/enlightenment/data/images/test.svg
+share/enlightenment/data/input_methods/fcitx.imc
+share/enlightenment/data/input_methods/gcin.imc
+share/enlightenment/data/input_methods/hime.imc
+share/enlightenment/data/input_methods/ibus.imc
+share/enlightenment/data/input_methods/iiimf.imc
+share/enlightenment/data/input_methods/scim.imc
+share/enlightenment/data/input_methods/uim.imc
+share/enlightenment/data/themes/default.edj
+share/enlightenment/doc/FDO.txt
+share/enlightenment/doc/cache.txt
+share/enlightenment/doc/documentation.html
+share/enlightenment/doc/enlightenment.png
+share/enlightenment/doc/illume2.html
+share/enlightenment/doc/illume2.png
+share/examples/enlightenment/sysactions.conf
+share/locale/ar/LC_MESSAGES/enlightenment.mo
+share/locale/bg/LC_MESSAGES/enlightenment.mo
+share/locale/ca/LC_MESSAGES/enlightenment.mo
+share/locale/cs/LC_MESSAGES/enlightenment.mo
+share/locale/da/LC_MESSAGES/enlightenment.mo
+share/locale/de/LC_MESSAGES/enlightenment.mo
+share/locale/el/LC_MESSAGES/enlightenment.mo
+share/locale/eo/LC_MESSAGES/enlightenment.mo
+share/locale/es/LC_MESSAGES/enlightenment.mo
+share/locale/et/LC_MESSAGES/enlightenment.mo
+share/locale/fi/LC_MESSAGES/enlightenment.mo
+share/locale/fo/LC_MESSAGES/enlightenment.mo
+share/locale/fr/LC_MESSAGES/enlightenment.mo
+share/locale/fr_CH/LC_MESSAGES/enlightenment.mo
+share/locale/gl/LC_MESSAGES/enlightenment.mo
+share/locale/he/LC_MESSAGES/enlightenment.mo
+share/locale/hr/LC_MESSAGES/enlightenment.mo
+share/locale/hu/LC_MESSAGES/enlightenment.mo
+share/locale/it/LC_MESSAGES/enlightenment.mo
+share/locale/ja/LC_MESSAGES/enlightenment.mo
+share/locale/km/LC_MESSAGES/enlightenment.mo
+share/locale/ko/LC_MESSAGES/enlightenment.mo
+share/locale/ku/LC_MESSAGES/enlightenment.mo
+share/locale/lt/LC_MESSAGES/enlightenment.mo
+share/locale/ms/LC_MESSAGES/enlightenment.mo
+share/locale/nb/LC_MESSAGES/enlightenment.mo
+share/locale/nl/LC_MESSAGES/enlightenment.mo
+share/locale/pl/LC_MESSAGES/enlightenment.mo
+share/locale/pt/LC_MESSAGES/enlightenment.mo
+share/locale/pt_BR/LC_MESSAGES/enlightenment.mo
+share/locale/ro/LC_MESSAGES/enlightenment.mo
+share/locale/ru/LC_MESSAGES/enlightenment.mo
+share/locale/sk/LC_MESSAGES/enlightenment.mo
+share/locale/sl/LC_MESSAGES/enlightenment.mo
+share/locale/sv/LC_MESSAGES/enlightenment.mo
+share/locale/tr/LC_MESSAGES/enlightenment.mo
+share/locale/uk/LC_MESSAGES/enlightenment.mo
+share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
+share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
+share/xsessions/enlightenment.desktop
diff --git a/x11/enlightenment/buildlink3.mk b/x11/enlightenment/buildlink3.mk
new file mode 100644
index 00000000000..7b375afc3ab
--- /dev/null
+++ b/x11/enlightenment/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+BUILDLINK_TREE+=	enlightenment
+
+.if !defined(ENLIGHTENMENT_BUILDLINK3_MK)
+ENLIGHTENMENT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.enlightenment+=	enlightenment>=0.17.3
+BUILDLINK_ABI_DEPENDS.enlightenment?=	enlightenment>=0.17.3
+BUILDLINK_PKGSRCDIR.enlightenment?=	../../x11/enlightenment
+
+.include "../../devel/ecore/buildlink3.mk"
+.include "../../devel/eet/buildlink3.mk"
+.include "../../graphics/edje/buildlink3.mk"
+.include "../../graphics/evas/buildlink3.mk"
+.include "../../graphics/evas-buffer/buildlink3.mk"
+.include "../../graphics/evas-eet/buildlink3.mk"
+.include "../../graphics/evas-jpeg/buildlink3.mk"
+.include "../../graphics/evas-png/buildlink3.mk"
+.include "../../sysutils/edbus/buildlink3.mk"
+.include "../../sysutils/efreet/buildlink3.mk"
+.include "../../devel/eio/buildlink3.mk"
+.include "../../x11/elementary/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.endif # ENLIGHTENMENT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-enlightenment
diff --git a/x11/enlightenment/distinfo b/x11/enlightenment/distinfo
new file mode 100644
index 00000000000..ed783c42799
--- /dev/null
+++ b/x11/enlightenment/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/06/16 18:56:06 sno Exp $
+
+SHA1 (enlightenment-0.17.3.tar.bz2) = a0bda02d3dcd0105ffbb33de6411bbc910ba4585
+RMD160 (enlightenment-0.17.3.tar.bz2) = a0997f99a8fb0857cadc9b1f99b6e3217461b5dd
+Size (enlightenment-0.17.3.tar.bz2) = 29332256 bytes
diff --git a/x11/enlightenment/files/enlightenment b/x11/enlightenment/files/enlightenment
new file mode 100644
index 00000000000..fc68033af76
--- /dev/null
+++ b/x11/enlightenment/files/enlightenment
@@ -0,0 +1,13 @@
+# $NetBSD: enlightenment,v 1.1 2013/06/16 18:56:06 sno Exp $
+#
+# PAM configuration for the "enlightenment" service
+#
+
+# auth
+auth            include         display_manager
+
+# account
+account         include         display_manager
+
+# session
+session         include         display_manager
author	sno <sno@pkgsrc.org>	2013-06-16 18:56:04 +0000
committer	sno <sno@pkgsrc.org>	2013-06-16 18:56:04 +0000
commit	1af104312c9949d43ad5c9ee3ab29359b6c675b3 (patch)
tree	623927a32c2936544542f5724e9ca67d4888379f
parent	8652ff692b6b942d70127d395a33c13a16867f2f (diff)
download	pkgsrc-1af104312c9949d43ad5c9ee3ab29359b6c675b3.tar.gz