- Update to 0.16.8.15.002

- Remove local patches, committed upstreams
- Enable all X features

12 files changed, 80 insertions, 204 deletions

diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index f6ea59b5aa43..535e552d644b 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	enlightenment
-DISTVERSION=	0.16.8.15-${E16_SNAPSHOT}
+DISTVERSION=	0.16.8.15.${E16_SNAPSHOT}
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTNAME=	e16-${DISTVERSION}
@@ -15,9 +15,11 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
 DATADIR=	${PREFIX}/share/e16
-E16_SNAPSHOT=	0.01
+DOCSDIR=	${PREFIX}/share/doc/e16
+E16_SNAPSHOT=	002
 
-USE_XORG=	xbitmaps xft x11
+USE_XORG=	compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
+		xext xfixes xft xinerama xrandr xrender xxf86vm
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_EFL=	imlib2
@@ -43,4 +45,11 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
+CONFIGURE_ARGS+=--enable-docs=yes
+.else
+CONFIGURE_ARGS+=--enable-docs=no
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-wm/e16/distinfo b/x11-wm/e16/distinfo
index 4500d1f4a8eb..449ce7715929 100644
--- a/x11-wm/e16/distinfo
+++ b/x11-wm/e16/distinfo
@@ -1,3 +1,3 @@
-MD5 (e16-0.16.8.15-0.01.tar.gz) = 9354e4e83019b718f1d29705ba244a22
-SHA256 (e16-0.16.8.15-0.01.tar.gz) = bc970036df149a6929e0d30f00d9d248c35e8c675be2b376c86a650a45614aa7
-SIZE (e16-0.16.8.15-0.01.tar.gz) = 1830506
+MD5 (e16-0.16.8.15.002.tar.gz) = f4de5f7b18065a601083e723db40d6bf
+SHA256 (e16-0.16.8.15.002.tar.gz) = 36f9b724f58b2fde462ffb0ebc8e92ddb7decd217d4de5e4fc8590c971c00fd0
+SIZE (e16-0.16.8.15.002.tar.gz) = 1951326
diff --git a/x11-wm/e16/files/patch-src_borders.c b/x11-wm/e16/files/patch-src_borders.c
deleted file mode 100644
index 4ae8c349fd2b..000000000000
--- a/x11-wm/e16/files/patch-src_borders.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/borders.c.orig	2008-12-04 18:27:27.000000000 +0100
-+++ src/borders.c	2008-12-04 18:31:16.000000000 +0100
-@@ -45,7 +45,7 @@
- 
- static Ecore_List  *border_list = NULL;
- 
--static void         BorderDestroy(Border * b);
-+static void         BorderDestroy(const Border * b);
- static void         BorderWinpartHandleEvents(Win win, XEvent * ev, void *prm);
- static void         BorderFrameHandleEvents(Win win, XEvent * ev, void *prm);
- static Border      *BorderGetFallback(void);
-@@ -628,7 +628,7 @@
- }
- 
- static void
--BorderDestroy(Border * b)
-+BorderDestroy(const Border * b)
- {
-    int                 i;
- 
-@@ -641,7 +641,7 @@
- 	return;
-      }
- 
--   ecore_list_node_remove(border_list, b);
-+   ecore_list_node_remove(border_list, (Border *)b);
- 
-    for (i = 0; i < b->num_winparts; i++)
-      {
diff --git a/x11-wm/e16/files/patch-src_lang.c b/x11-wm/e16/files/patch-src_lang.c
deleted file mode 100644
index af4f7b3377d7..000000000000
--- a/x11-wm/e16/files/patch-src_lang.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/lang.c.orig	2007-10-06 15:16:39.000000000 +0800
-+++ src/lang.c	2007-12-12 11:37:30.309489868 +0800
-@@ -53,10 +53,11 @@
- Eiconv(iconv_t icd, const char *txt, size_t len)
- {
-    char                buf[4096];
--   char               *pi, *po;
-+   const char         *pi;
-+   char               *po;
-    size_t              err, ni, no;
- 
--   pi = (char *)txt;
-+   pi = txt;
-    po = buf;
-    ni = (len > 0) ? len : strlen(txt);
-    if (!icd)
-@@ -202,11 +203,12 @@
- EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
- {
- #if HAVE_ICONV
--   char               *pi, *po;
-+   const char         *pi;
-+   char               *po;
-    size_t              ni, no, rc;
-    char                buf[4096];
- 
--   pi = (char *)str;
-+   pi = str;
-    ni = len;
- 
-    if (!wcs)
-@@ -242,10 +244,10 @@
- EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
- {
- #if HAVE_ICONV
--   char               *pi;
-+   const char         *pi;
-    size_t              ni, no, rc;
- 
--   pi = (char *)wcs;
-+   pi = (const char *)wcs;
-    ni = wcl * sizeof(wchar_t);
-    no = len;
-    rc = iconv(iconv_cd_wcs2str, &pi, &ni, &str, &no);
diff --git a/x11-wm/e16/files/patch-src_misc.c b/x11-wm/e16/files/patch-src_misc.c
deleted file mode 100644
index c8b1fed44994..000000000000
--- a/x11-wm/e16/files/patch-src_misc.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/misc.c.orig	2008-12-04 18:24:18.000000000 +0100
-+++ src/misc.c	2008-12-04 18:25:48.000000000 +0100
-@@ -227,11 +227,12 @@
- 
- 	nreq = (disp) ? NextRequest(disp) : 0;
- 	fprintf(stdout, "[%d] %#8lx %4ld.%06ld [%3ld.%06ld]: ", getpid(),
--		nreq, tv1.tv_sec, tv1.tv_usec, tvd.tv_sec, tvd.tv_usec);
-+		nreq, (unsigned long)tv1.tv_sec, tv1.tv_usec,
-+		(unsigned long)tvd.tv_sec, tvd.tv_usec);
-      }
-    else
-      {
--	fprintf(stdout, "[%d] %4ld.%06ld: ", getpid(), tv.tv_sec, tv.tv_usec);
-+	fprintf(stdout, "[%d] %4ld.%06ld: ", getpid(), (unsigned long)tv.tv_sec, tv.tv_usec);
-      }
- 
-    va_start(args, fmt);
diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist
index 746245adc126..c4140a767186 100644
--- a/x11-wm/e16/pkg-plist
+++ b/x11-wm/e16/pkg-plist
@@ -21,6 +21,8 @@ bin/starte16
 %%NLS%%share/locale/ru/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/e16.mo
+%%DATADIR%%/E-docs/bg.png
 %%DATADIR%%/E-docs/exit1.png
 %%DATADIR%%/E-docs/exit2.png
 %%DATADIR%%/E-docs/next1.png
@@ -98,6 +100,7 @@ bin/starte16
 %%DATADIR%%/config/pix/wait8.png
 %%DATADIR%%/config/pix/wait9.png
 %%DATADIR%%/config/pix/world.png
+%%DATADIR%%/misc/e16.desktop-app
 %%DATADIR%%/misc/e16.desktop
 %%DATADIR%%/misc/e16.png
 %%DATADIR%%/misc/e16-gnome.desktop
@@ -395,12 +398,28 @@ bin/starte16
 %%DATADIR%%/themes/winter/tooltips/images/clear.png
 %%DATADIR%%/themes/winter/tooltips/images/tooltipbg.png
 %%DATADIR%%/themes/winter/tooltips/tooltips.cfg
-%%DATADIR%%/themes/winter/ttfonts/COPYRIGHT.Vera
-%%DATADIR%%/themes/winter/ttfonts/Vera.ttf
-%%DATADIR%%/themes/winter/ttfonts/VeraBd.ttf
+%%DATADIR%%/fonts/Vera.ttf
+%%DATADIR%%/fonts/VeraBd.ttf
+%%DATADIR%%/fonts/COPYRIGHT.Vera
+%%DATADIR%%/fonts/normal.ttf
+%%DATADIR%%/fonts/bold.ttf
+share/applications/e16.desktop
 share/xsessions/e16.desktop
 share/xsessions/e16-gnome.desktop
 share/xsessions/e16-kde.desktop
+%%PORTDOCS%%%%DOCSDIR%%/README-0.16.8.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s11.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s10.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s09.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s08.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s07.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s06.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s05.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s04.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s03.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s02.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s12.html
+@dirrm lib/e16
 @dirrm %%DATADIR%%/E-docs
 @dirrm %%DATADIR%%/config/menus
 @dirrm %%DATADIR%%/config/pix
@@ -460,13 +479,13 @@ share/xsessions/e16-kde.desktop
 @dirrm %%DATADIR%%/themes/winter/sound
 @dirrm %%DATADIR%%/themes/winter/tooltips/images
 @dirrm %%DATADIR%%/themes/winter/tooltips
-@dirrm %%DATADIR%%/themes/winter/ttfonts
 @dirrm %%DATADIR%%/themes/winter
 @dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
+@dirrm %%DATADIR%%/fonts
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
-@dirrm lib/e16
 @dirrmtry etc/X11/dm/Sessions
 @dirrmtry etc/X11/dm
 @dirrmtry etc/X11
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index f6ea59b5aa43..535e552d644b 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	enlightenment
-DISTVERSION=	0.16.8.15-${E16_SNAPSHOT}
+DISTVERSION=	0.16.8.15.${E16_SNAPSHOT}
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTNAME=	e16-${DISTVERSION}
@@ -15,9 +15,11 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
 DATADIR=	${PREFIX}/share/e16
-E16_SNAPSHOT=	0.01
+DOCSDIR=	${PREFIX}/share/doc/e16
+E16_SNAPSHOT=	002
 
-USE_XORG=	xbitmaps xft x11
+USE_XORG=	compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
+		xext xfixes xft xinerama xrandr xrender xxf86vm
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_EFL=	imlib2
@@ -43,4 +45,11 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
+CONFIGURE_ARGS+=--enable-docs=yes
+.else
+CONFIGURE_ARGS+=--enable-docs=no
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-wm/enlightenment/distinfo b/x11-wm/enlightenment/distinfo
index 4500d1f4a8eb..449ce7715929 100644
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@@ -1,3 +1,3 @@
-MD5 (e16-0.16.8.15-0.01.tar.gz) = 9354e4e83019b718f1d29705ba244a22
-SHA256 (e16-0.16.8.15-0.01.tar.gz) = bc970036df149a6929e0d30f00d9d248c35e8c675be2b376c86a650a45614aa7
-SIZE (e16-0.16.8.15-0.01.tar.gz) = 1830506
+MD5 (e16-0.16.8.15.002.tar.gz) = f4de5f7b18065a601083e723db40d6bf
+SHA256 (e16-0.16.8.15.002.tar.gz) = 36f9b724f58b2fde462ffb0ebc8e92ddb7decd217d4de5e4fc8590c971c00fd0
+SIZE (e16-0.16.8.15.002.tar.gz) = 1951326
diff --git a/x11-wm/enlightenment/files/patch-src_borders.c b/x11-wm/enlightenment/files/patch-src_borders.c
deleted file mode 100644
index 4ae8c349fd2b..000000000000
--- a/x11-wm/enlightenment/files/patch-src_borders.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/borders.c.orig	2008-12-04 18:27:27.000000000 +0100
-+++ src/borders.c	2008-12-04 18:31:16.000000000 +0100
-@@ -45,7 +45,7 @@
- 
- static Ecore_List  *border_list = NULL;
- 
--static void         BorderDestroy(Border * b);
-+static void         BorderDestroy(const Border * b);
- static void         BorderWinpartHandleEvents(Win win, XEvent * ev, void *prm);
- static void         BorderFrameHandleEvents(Win win, XEvent * ev, void *prm);
- static Border      *BorderGetFallback(void);
-@@ -628,7 +628,7 @@
- }
- 
- static void
--BorderDestroy(Border * b)
-+BorderDestroy(const Border * b)
- {
-    int                 i;
- 
-@@ -641,7 +641,7 @@
- 	return;
-      }
- 
--   ecore_list_node_remove(border_list, b);
-+   ecore_list_node_remove(border_list, (Border *)b);
- 
-    for (i = 0; i < b->num_winparts; i++)
-      {
diff --git a/x11-wm/enlightenment/files/patch-src_lang.c b/x11-wm/enlightenment/files/patch-src_lang.c
deleted file mode 100644
index af4f7b3377d7..000000000000
--- a/x11-wm/enlightenment/files/patch-src_lang.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/lang.c.orig	2007-10-06 15:16:39.000000000 +0800
-+++ src/lang.c	2007-12-12 11:37:30.309489868 +0800
-@@ -53,10 +53,11 @@
- Eiconv(iconv_t icd, const char *txt, size_t len)
- {
-    char                buf[4096];
--   char               *pi, *po;
-+   const char         *pi;
-+   char               *po;
-    size_t              err, ni, no;
- 
--   pi = (char *)txt;
-+   pi = txt;
-    po = buf;
-    ni = (len > 0) ? len : strlen(txt);
-    if (!icd)
-@@ -202,11 +203,12 @@
- EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
- {
- #if HAVE_ICONV
--   char               *pi, *po;
-+   const char         *pi;
-+   char               *po;
-    size_t              ni, no, rc;
-    char                buf[4096];
- 
--   pi = (char *)str;
-+   pi = str;
-    ni = len;
- 
-    if (!wcs)
-@@ -242,10 +244,10 @@
- EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
- {
- #if HAVE_ICONV
--   char               *pi;
-+   const char         *pi;
-    size_t              ni, no, rc;
- 
--   pi = (char *)wcs;
-+   pi = (const char *)wcs;
-    ni = wcl * sizeof(wchar_t);
-    no = len;
-    rc = iconv(iconv_cd_wcs2str, &pi, &ni, &str, &no);
diff --git a/x11-wm/enlightenment/files/patch-src_misc.c b/x11-wm/enlightenment/files/patch-src_misc.c
deleted file mode 100644
index c8b1fed44994..000000000000
--- a/x11-wm/enlightenment/files/patch-src_misc.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/misc.c.orig	2008-12-04 18:24:18.000000000 +0100
-+++ src/misc.c	2008-12-04 18:25:48.000000000 +0100
-@@ -227,11 +227,12 @@
- 
- 	nreq = (disp) ? NextRequest(disp) : 0;
- 	fprintf(stdout, "[%d] %#8lx %4ld.%06ld [%3ld.%06ld]: ", getpid(),
--		nreq, tv1.tv_sec, tv1.tv_usec, tvd.tv_sec, tvd.tv_usec);
-+		nreq, (unsigned long)tv1.tv_sec, tv1.tv_usec,
-+		(unsigned long)tvd.tv_sec, tvd.tv_usec);
-      }
-    else
-      {
--	fprintf(stdout, "[%d] %4ld.%06ld: ", getpid(), tv.tv_sec, tv.tv_usec);
-+	fprintf(stdout, "[%d] %4ld.%06ld: ", getpid(), (unsigned long)tv.tv_sec, tv.tv_usec);
-      }
- 
-    va_start(args, fmt);
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index 746245adc126..c4140a767186 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -21,6 +21,8 @@ bin/starte16
 %%NLS%%share/locale/ru/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/e16.mo
+%%DATADIR%%/E-docs/bg.png
 %%DATADIR%%/E-docs/exit1.png
 %%DATADIR%%/E-docs/exit2.png
 %%DATADIR%%/E-docs/next1.png
@@ -98,6 +100,7 @@ bin/starte16
 %%DATADIR%%/config/pix/wait8.png
 %%DATADIR%%/config/pix/wait9.png
 %%DATADIR%%/config/pix/world.png
+%%DATADIR%%/misc/e16.desktop-app
 %%DATADIR%%/misc/e16.desktop
 %%DATADIR%%/misc/e16.png
 %%DATADIR%%/misc/e16-gnome.desktop
@@ -395,12 +398,28 @@ bin/starte16
 %%DATADIR%%/themes/winter/tooltips/images/clear.png
 %%DATADIR%%/themes/winter/tooltips/images/tooltipbg.png
 %%DATADIR%%/themes/winter/tooltips/tooltips.cfg
-%%DATADIR%%/themes/winter/ttfonts/COPYRIGHT.Vera
-%%DATADIR%%/themes/winter/ttfonts/Vera.ttf
-%%DATADIR%%/themes/winter/ttfonts/VeraBd.ttf
+%%DATADIR%%/fonts/Vera.ttf
+%%DATADIR%%/fonts/VeraBd.ttf
+%%DATADIR%%/fonts/COPYRIGHT.Vera
+%%DATADIR%%/fonts/normal.ttf
+%%DATADIR%%/fonts/bold.ttf
+share/applications/e16.desktop
 share/xsessions/e16.desktop
 share/xsessions/e16-gnome.desktop
 share/xsessions/e16-kde.desktop
+%%PORTDOCS%%%%DOCSDIR%%/README-0.16.8.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s11.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s10.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s09.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s08.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s07.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s06.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s05.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s04.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s03.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s02.html
+%%PORTDOCS%%%%DOCSDIR%%/ar01s12.html
+@dirrm lib/e16
 @dirrm %%DATADIR%%/E-docs
 @dirrm %%DATADIR%%/config/menus
 @dirrm %%DATADIR%%/config/pix
@@ -460,13 +479,13 @@ share/xsessions/e16-kde.desktop
 @dirrm %%DATADIR%%/themes/winter/sound
 @dirrm %%DATADIR%%/themes/winter/tooltips/images
 @dirrm %%DATADIR%%/themes/winter/tooltips
-@dirrm %%DATADIR%%/themes/winter/ttfonts
 @dirrm %%DATADIR%%/themes/winter
 @dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
+@dirrm %%DATADIR%%/fonts
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
-@dirrm lib/e16
 @dirrmtry etc/X11/dm/Sessions
 @dirrmtry etc/X11/dm
 @dirrmtry etc/X11