[Midnightbsd-cvs] mports: x11-wm/enlightenment: Update to 0.16.8.11, remove /usr/X11R6

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 0.16.8.11, remove /usr/X11R6 references

Modified Files:
--------------
    mports/x11-wm/enlightenment:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Added Files:
-----------
    mports/x11-wm/enlightenment/files:
        patch-src_lang.c (r1.1)

Removed Files:
-------------
    mports/x11-wm/enlightenment/files:
        patch-e_gen_menu

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-wm/enlightenment/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-wm/enlightenment/pkg-plist -L x11-wm/enlightenment/pkg-plist -u -r1.1 -r1.2
--- x11-wm/enlightenment/pkg-plist
+++ x11-wm/enlightenment/pkg-plist
@@ -446,6 +446,7 @@
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
+ at dirrm lib/e16
 @dirrmtry etc/X11/dm/Sessions
 @dirrmtry etc/X11/dm
 @dirrmtry etc/X11
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/enlightenment/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-wm/enlightenment/Makefile -L x11-wm/enlightenment/Makefile -u -r1.1 -r1.2
--- x11-wm/enlightenment/Makefile
+++ x11-wm/enlightenment/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.16.8.10
+PORTVERSION=	0.16.8.11
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	e16-${PORTVERSION}
+DISTNAME=	e16-${PORTVERSION}-0.01
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A very artistic X window manager
@@ -29,8 +29,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --disable-esdtest --disable-dependency-tracking \
 		--disable-rpath
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITHOUT_ESOUND)
 USE_GNOME=	esound
@@ -63,7 +63,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+	@${REINPLACE_CMD}  \
 		-e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/scripts/e_gen_menu
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-wm/enlightenment/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-wm/enlightenment/distinfo -L x11-wm/enlightenment/distinfo -u -r1.1 -r1.2
--- x11-wm/enlightenment/distinfo
+++ x11-wm/enlightenment/distinfo
@@ -1,3 +1,3 @@
-MD5 (e16-0.16.8.10.tar.gz) = 1966ac5e5447c7994714695763a1ac9c
-SHA256 (e16-0.16.8.10.tar.gz) = 8a7bfd1e505fd70554a7d316c7db8b560a70c955199138125cbd0da032acd684
-SIZE (e16-0.16.8.10.tar.gz) = 1941157
+MD5 (e16-0.16.8.11-0.01.tar.gz) = f27227e1d9216b7c80f2d34a243f43ec
+SHA256 (e16-0.16.8.11-0.01.tar.gz) = 1f601781788eaaa1a53bfce85fc0ed9d9ee732b588889419305e4121578ea849
+SIZE (e16-0.16.8.11-0.01.tar.gz) = 1955291
--- /dev/null
+++ x11-wm/enlightenment/files/patch-src_lang.c
@@ -0,0 +1,44 @@
+--- 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);
--- x11-wm/enlightenment/files/patch-e_gen_menu
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/e_gen_menu.orig	Sat Jan 13 20:34:49 2007
-+++ scripts/e_gen_menu	Sun Mar 11 11:26:16 2007
-@@ -25,7 +25,7 @@
- ##############################################################################
- 
- # Likely  prefixes
--$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
-+$Prefixes = "/usr/local:%%X11BASE%%:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
- $Prefixes = "$Prefixes:/opt/kde3:/opt/gnome";	# SUSE
- $Prefixes = RemoveDuplcates($Prefixes);
-