>Number:         21666
>Category:       pkg
>Synopsis:       various fixes to wm/enlightenment
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 25 02:35:01 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
pkgsrc as of 05/24/2003.
>Description:
Update MASTER_SITES to something that actually exists, list myself as
maintainer, add a more descriptive comment, USE_X11BASE -> USE_X11,
NONBINMODE -> SHAREMODE, sh(1) fixes to e_cache_clean and e_cache_query.

Note that there is a newer version of enlightenment, but it's not worth
bothering with. 0.16.6 is due some time soonish, and it will have many
useful changes, so I'll send an update at that time.
>How-To-Repeat:
>Fix:
Apply:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/enlightenment/Makefile,v
retrieving revision 1.13
diff -b -u -r1.13 Makefile
--- Makefile	2003/05/05 16:54:24	1.13
+++ Makefile	2003/05/25 02:23:57
@@ -1,16 +1,16 @@
 # $NetBSD: Makefile,v 1.13 2003/05/05 16:54:24 jmmv Exp $
 
 DISTNAME=		enlightenment-0.16.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome wm
-MASTER_SITES=		ftp://ftp.enlightenment.org/pub/e/enlightenment/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		soren@blef.org
 HOMEPAGE=		http://www.enlightenment.org/
-COMMENT=		Window manager for X
+COMMENT=		Highly themeable and configurable window manager
 
 USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
+USE_X11=		yes
 USE_PKGLOCALEDIR=	yes
 
 GNU_CONFIGURE=		yes
@@ -24,7 +24,7 @@
 	${FIND} ${PREFIX}/share/enlightenment/themes -type d | \
 	${XARGS} ${CHMOD} ${BINMODE}
 	${FIND} ${PREFIX}/share/enlightenment/themes -type f | \
-	${XARGS} ${CHMOD} ${NONBINMODE}
+	${XARGS} ${CHMOD} ${SHAREMODE}
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../graphics/imlib/buildlink2.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/enlightenment/distinfo,v
retrieving revision 1.3
diff -b -u -r1.3 distinfo
--- distinfo	2001/08/29 22:41:23	1.3
+++ distinfo	2003/05/25 02:23:57
@@ -6,3 +6,5 @@
 SHA1 (patch-ab) = c7982927d2870fa2eb04903f467d61f8984315c1
 SHA1 (patch-ac) = 9f3b794c818be0471ae6679d67fd79d79cc28216
 SHA1 (patch-ad) = fd1054a21481cf00468f9a72eff7ab0699d7ef75
+SHA1 (patch-ae) = 4bd0c1ebbd664c14435c29b127bdbcdae92d8c91
+SHA1 (patch-af) = 0f546c4f34f6404fcf21b65338b7285c97bbfc63

Add patch-ae:
$NetBSD$

--- scripts/e_cache_clean.orig	Sat May 24 08:35:12 2003
+++ scripts/e_cache_clean	Sat May 24 08:37:42 2003
@@ -34,33 +34,33 @@
 fi
 
 if [ $1 = "all" ]; then
-  rm -rf $ECACHEDIR/cached/bgsel/* >& /dev/null
-  rm -rf $ECACHEDIR/cached/bgsel/.* >& /dev/null
-  rm -rf $ECACHEDIR/cached/cfg/* >& /dev/null
-  rm -rf $ECACHEDIR/cached/cfg/.* >& /dev/null
-  rm -rf $ECACHEDIR/cached/pager/* >& /dev/null
-  rm -rf $ECACHEDIR/cached/pager/.* >& /dev/null
+  rm -rf $ECACHEDIR/cached/bgsel/* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/bgsel/.* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/cfg/* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/cfg/.* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/pager/* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/pager/.* >/dev/null 2>&1
   eesh -e "dialog_ok All caches purged."
   exit
 fi
 
 if [ $1 = "pager" ]; then
-  rm -rf $ECACHEDIR/cached/pager/* >& /dev/null
-  rm -rf $ECACHEDIR/cached/pager/.* >& /dev/null
+  rm -rf $ECACHEDIR/cached/pager/* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/pager/.* >/dev/null 2>&1
   eesh -e "dialog_ok Pager background cache purged."
   exit
 fi
 
 if [ $1 = "config" ]; then
-  rm -rf $ECACHEDIR/cached/cfg/* >& /dev/null
-  rm -rf $ECACHEDIR/cached/cfg/.* >& /dev/null
+  rm -rf $ECACHEDIR/cached/cfg/* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/cfg/.* >/dev/null 2>&1
   eesh -e "dialog_ok Config file cache purged."
   exit
 fi
 
 if [ $1 = "bgsel" ]; then
-  rm -rf $ECACHEDIR/cached/bgsel/* >& /dev/null
-  rm -rf $ECACHEDIR/cached/bgsel/.* >& /dev/null
+  rm -rf $ECACHEDIR/cached/bgsel/* >/dev/null 2>&1
+  rm -rf $ECACHEDIR/cached/bgsel/.* >/dev/null 2>&1
   eesh -e "dialog_ok Background selector cache purged."
   exit
 fi


Add patch-af:
$NetBSD$

--- scripts/e_cache_query.orig	Sat May 24 08:38:52 2003
+++ scripts/e_cache_query	Sat May 24 08:40:11 2003
@@ -37,7 +37,7 @@
   VAL=`du -s $ECACHEDIR/cached/pager $ECACHEDIR/cached/bgsel $ECACHEDIR/cached/cfg | awk '{printf("%s ", $1);}'`
   TOT=0
   for I in $VAL; do
-    TOT=$[ $TOT + $I ];
+    TOT=$(( $TOT + $I ));
   done
   eesh -e "dialog_ok Your caches are using $TOT Kb of disk space."
   exit
>Release-Note:
>Audit-Trail:
>Unformatted: