PKGREVISION++

- USE_X11BASE -> USE_X11
- new MASTER_SITES
- NOBINMODE -> SHAREMODE
- sh(1) fixes to e_cache_clean and e_cache_query
- better COMMENT
From Soren Jacobsen via PR pkg/21666.

- DESCR has 80 columns
- remove imlib buildlink2 file, it's pulled in by fnlib
- ln -> ${LN}, rm -> ${RM} in PLIST, sort

6 files changed, 90 insertions, 26 deletions

diff --git a/wm/enlightenment/DESCR b/wm/enlightenment/DESCR
index 4655042cf43..f9ad5168694 100644
--- a/wm/enlightenment/DESCR
+++ b/wm/enlightenment/DESCR
@@ -1,9 +1,8 @@
-Enlightenment is a window manager for the X Window System that
-is designed to be powerful, extensible, configurable and
-pretty darned good looking! It is one of the more graphically
-intense window managers.
+Enlightenment is a window manager for the X Window System that is designed to
+be powerful, extensible, configurable and pretty darned good looking!  It is
+one of the more graphically intense window managers.
 
-Enlightenment goes beyond managing windows by providing a useful
-and appealing graphical shell from which to work. It is open
-in design and instead of dictating a policy, allows the user to
-define their own policy, down to every last detail.
+Enlightenment goes beyond managing windows by providing a useful and appealing
+graphical shell from which to work.  It is open in design and instead of
+dictating a policy, allows the user to define their own policy, down to every
+last detail.
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 01ca8a447eb..0925eed0a5a 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,33 +1,33 @@
-# $NetBSD: Makefile,v 1.13 2003/05/05 16:54:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/25 09:50:52 salo 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
 HOMEPAGE=		http://www.enlightenment.org/
-COMMENT=		Window manager for X
+COMMENT=		Highly themeable and configurable window manager
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
-USE_PKGLOCALEDIR=	yes
+USE_BUILDLINK2=		YES
+USE_X11=		YES
+USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
 
-GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-fsstd
 MAKE_ENV+=		USER=${SHAREOWN}:${SHAREGRP}
 
 post-install:
 	for FILE in `${GREP} "\.directory$$" ${PKGDIR}/PLIST`; do \
-	  ${TOUCH} ${PREFIX}/$${FILE}; \
+		${TOUCH} ${PREFIX}/$${FILE}; \
 	done
 	${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"
 .include "../../graphics/fnlib/buildlink2.mk"
 .include "../../graphics/freetype-lib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
diff --git a/wm/enlightenment/PLIST b/wm/enlightenment/PLIST
index 97085600ef7..a3b75f8f52b 100644
--- a/wm/enlightenment/PLIST
+++ b/wm/enlightenment/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/04/27 14:57:55 cjep Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/25 09:50:52 salo Exp $
 bin/dox
 bin/e_cache_clean
 bin/e_cache_query
@@ -2680,6 +2680,8 @@ share/enlightenment/themes/ShinyMetal/ttfonts/rothwell.ttf
 share/enlightenment/themes/ShinyMetal/ttfonts/zirkle.ttf
 share/enlightenment/themes/ShinyMetal/windowmatches.cfg
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/enlightenment.mo
+${PKGLOCALEDIR}/locale/dk/LC_MESSAGES/enlightenment.mo
+${PKGLOCALEDIR}/locale/en_US/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/enlightenment.mo
@@ -2687,14 +2689,12 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/enlightenment.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/enlightenment.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/enlightenment.mo
-${PKGLOCALEDIR}/locale/dk/LC_MESSAGES/enlightenment.mo
-${PKGLOCALEDIR}/locale/en_US/LC_MESSAGES/enlightenment.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/enlightenment.mo
-@exec	ln -sf BrushedMetal-Tigert %D/share/enlightenment/themes/DEFAULT
-@unexec	rm -f %D/share/enlightenment/themes/DEFAULT
+@exec	${LN} -sf BrushedMetal-Tigert %D/share/enlightenment/themes/DEFAULT
+@unexec ${RM} -f %D/share/enlightenment/themes/DEFAULT
 @dirrm share/enlightenment/themes/ShinyMetal/ttfonts
 @dirrm share/enlightenment/themes/ShinyMetal/tooltips/images
 @dirrm share/enlightenment/themes/ShinyMetal/tooltips
diff --git a/wm/enlightenment/distinfo b/wm/enlightenment/distinfo
index 1909628f5d3..b37ab23c062 100644
--- a/wm/enlightenment/distinfo
+++ b/wm/enlightenment/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/08/29 22:41:23 jlam Exp $
+$NetBSD: distinfo,v 1.4 2003/05/25 09:50:53 salo Exp $
 
 SHA1 (enlightenment-0.16.4.tar.gz) = 89e4b120a19c16a9f48de1eda0800837e26fdc92
 Size (enlightenment-0.16.4.tar.gz) = 11377994 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = 7db0ef85e946225f770f0f65505656d341182a6e
 SHA1 (patch-ab) = c7982927d2870fa2eb04903f467d61f8984315c1
 SHA1 (patch-ac) = 9f3b794c818be0471ae6679d67fd79d79cc28216
 SHA1 (patch-ad) = fd1054a21481cf00468f9a72eff7ab0699d7ef75
+SHA1 (patch-ae) = 4bd0c1ebbd664c14435c29b127bdbcdae92d8c91
+SHA1 (patch-af) = 0f546c4f34f6404fcf21b65338b7285c97bbfc63
diff --git a/wm/enlightenment/patches/patch-ae b/wm/enlightenment/patches/patch-ae
new file mode 100644
index 00000000000..629911b8b5c
--- /dev/null
+++ b/wm/enlightenment/patches/patch-ae
@@ -0,0 +1,50 @@
+$NetBSD: patch-ae,v 1.1 2003/05/25 09:50:53 salo Exp $
+
+--- 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
diff --git a/wm/enlightenment/patches/patch-af b/wm/enlightenment/patches/patch-af
new file mode 100644
index 00000000000..ec99de903be
--- /dev/null
+++ b/wm/enlightenment/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/05/25 09:50:54 salo Exp $
+
+--- 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