4 files changed, 76 insertions, 69 deletions

diff --git a/x11-themes/lila-xfwm4/Makefile b/x11-themes/lila-xfwm4/Makefile
index b81a8afec32f..d6f1096f352f 100644
--- a/x11-themes/lila-xfwm4/Makefile
+++ b/x11-themes/lila-xfwm4/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	Lila-xfwm4
-PORTVERSION=	0.3.1
-PORTREVISION=	7
+PORTVERSION=	0.3.2
 CATEGORIES=	x11-themes xfce
-MASTER_SITES=	http://stief.tnux.net/Lila/
+MASTER_SITES=	SF/lila-theme/lila-xfwm/${PORTVERSION}
+DISTNAME=	lila-xfwm-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,15 +17,17 @@ COMMENT=	XFce 4 Lila window decoration theme for xfwm4
 
 RUN_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
+NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
+USE_BZIP2=	yes
+
 do-install:
-	@${MKDIR} -p  ${PREFIX}/share/themes/Lila/xfwm4
-	@${MKDIR} -p  ${PREFIX}/share/themes/Lila-light/xfwm4
-	@${CP} -R ${WRKDIR}/Lila/ ${PREFIX}/share/themes/Lila/xfwm4
-	@${CP} -R ${WRKDIR}/Lila-light/ ${PREFIX}/share/themes/Lila-light/xfwm4
+	@${MKDIR} ${PREFIX}/share/themes/Lila/xfwm4
+	@cd ${WRKSRC}/lila-xfwm/Lila \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/Lila/xfwm4
+	@${MKDIR} ${PREFIX}/share/themes/Lila-light/xfwm4
+	@cd ${WRKSRC}/lila-xfwm/Lila-light \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/Lila-light/xfwm4
 
 .include <bsd.port.mk>
diff --git a/x11-themes/lila-xfwm4/distinfo b/x11-themes/lila-xfwm4/distinfo
index 35dac2ceb557..2889852a189b 100644
--- a/x11-themes/lila-xfwm4/distinfo
+++ b/x11-themes/lila-xfwm4/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/Lila-xfwm4-0.3.1.tar.gz) = 011978361914ad147df7950dd897fa65
-SHA256 (xfce4/Lila-xfwm4-0.3.1.tar.gz) = 1794fde61f9112e28782ea9472ac5b2cd9abd6e1756ced4b229f0853643f6928
-SIZE (xfce4/Lila-xfwm4-0.3.1.tar.gz) = 23020
+SHA256 (xfce4/lila-xfwm-0.3.2.tar.bz2) = 3cddb6f80067d9d922172beb2a7931e32056243eba9779b8dff6a68aedad0fa7
+SIZE (xfce4/lila-xfwm-0.3.2.tar.bz2) = 25330
diff --git a/x11-themes/lila-xfwm4/pkg-descr b/x11-themes/lila-xfwm4/pkg-descr
index a998ac19042d..86dd3174bb8d 100644
--- a/x11-themes/lila-xfwm4/pkg-descr
+++ b/x11-themes/lila-xfwm4/pkg-descr
@@ -1 +1,3 @@
 Lila theme for xfwm4 window manager.
+
+WWW: http://lila-center.info/
diff --git a/x11-themes/lila-xfwm4/pkg-plist b/x11-themes/lila-xfwm4/pkg-plist
index b536136647c9..5f352064a516 100644
--- a/x11-themes/lila-xfwm4/pkg-plist
+++ b/x11-themes/lila-xfwm4/pkg-plist
@@ -1,78 +1,82 @@
-share/themes/Lila/xfwm4/menu-pressed.xpm
-share/themes/Lila/xfwm4/title-2-active.xpm
-share/themes/Lila/xfwm4/right-active.xpm
 share/themes/Lila/xfwm4/bottom-active.xpm
-share/themes/Lila/xfwm4/hide-inactive.xpm
-share/themes/Lila/xfwm4/close-pressed.xpm
-share/themes/Lila/xfwm4/title-1-active.xpm
-share/themes/Lila/xfwm4/left-active.xpm
-share/themes/Lila/xfwm4/top-left-active.xpm
-share/themes/Lila/xfwm4/title-4-inactive.xpm
-share/themes/Lila/xfwm4/menu-inactive.xpm
-share/themes/Lila/xfwm4/bottom-right-active.xpm
-share/themes/Lila/xfwm4/hide-pressed.xpm
 share/themes/Lila/xfwm4/bottom-inactive.xpm
-share/themes/Lila/xfwm4/bottom-right-inactive.xpm
-share/themes/Lila/xfwm4/hide-active.xpm
-share/themes/Lila/xfwm4/themerc
-share/themes/Lila/xfwm4/title-1-inactive.xpm
-share/themes/Lila/xfwm4/top-right-inactive.xpm
-share/themes/Lila/xfwm4/top-left-inactive.xpm
-share/themes/Lila/xfwm4/title-5-inactive.xpm
-share/themes/Lila/xfwm4/maximize-inactive.xpm
-share/themes/Lila/xfwm4/bottom-left-inactive.xpm
-share/themes/Lila/xfwm4/left-inactive.xpm
 share/themes/Lila/xfwm4/bottom-left-active.xpm
-share/themes/Lila/xfwm4/title-5-active.xpm
-share/themes/Lila/xfwm4/maximize-pressed.xpm
-share/themes/Lila/xfwm4/title-2-inactive.xpm
-share/themes/Lila/xfwm4/right-inactive.xpm
-share/themes/Lila/xfwm4/title-4-active.xpm
+share/themes/Lila/xfwm4/bottom-left-inactive.xpm
+share/themes/Lila/xfwm4/bottom-right-active.xpm
+share/themes/Lila/xfwm4/bottom-right-inactive.xpm
 share/themes/Lila/xfwm4/close-active.xpm
 share/themes/Lila/xfwm4/close-inactive.xpm
-share/themes/Lila/xfwm4/top-right-active.xpm
+share/themes/Lila/xfwm4/close-pressed.xpm
+share/themes/Lila/xfwm4/hide-active.xpm
+share/themes/Lila/xfwm4/hide-inactive.xpm
+share/themes/Lila/xfwm4/hide-pressed.xpm
+share/themes/Lila/xfwm4/left-active.xpm
+share/themes/Lila/xfwm4/left-inactive.xpm
 share/themes/Lila/xfwm4/maximize-active.xpm
+share/themes/Lila/xfwm4/maximize-inactive.xpm
+share/themes/Lila/xfwm4/maximize-pressed.xpm
 share/themes/Lila/xfwm4/menu-active.xpm
+share/themes/Lila/xfwm4/menu-inactive.xpm
+share/themes/Lila/xfwm4/menu-pressed.xpm
+share/themes/Lila/xfwm4/right-active.xpm
+share/themes/Lila/xfwm4/right-inactive.xpm
+share/themes/Lila/xfwm4/themerc
+share/themes/Lila/xfwm4/title-1-active.xpm
+share/themes/Lila/xfwm4/title-1-inactive.xpm
+share/themes/Lila/xfwm4/title-2-active.xpm
+share/themes/Lila/xfwm4/title-2-inactive.xpm
 share/themes/Lila/xfwm4/title-3-active.xpm
 share/themes/Lila/xfwm4/title-3-inactive.xpm
-share/themes/Lila-light/xfwm4/menu-pressed.xpm
-share/themes/Lila-light/xfwm4/right-active.xpm
+share/themes/Lila/xfwm4/title-4-active.xpm
+share/themes/Lila/xfwm4/title-4-inactive.xpm
+share/themes/Lila/xfwm4/title-5-active.xpm
+share/themes/Lila/xfwm4/title-5-inactive.xpm
+share/themes/Lila/xfwm4/top-left-active.xpm
+share/themes/Lila/xfwm4/top-left-inactive.xpm
+share/themes/Lila/xfwm4/top-right-active.xpm
+share/themes/Lila/xfwm4/top-right-inactive.xpm
 share/themes/Lila-light/xfwm4/bottom-active.xpm
-share/themes/Lila-light/xfwm4/hide-inactive.xpm
-share/themes/Lila-light/xfwm4/close-pressed.xpm
-share/themes/Lila-light/xfwm4/title-1-active.xpm
-share/themes/Lila-light/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Lila-light/xfwm4/left-active.xpm
-share/themes/Lila-light/xfwm4/top-left-active.xpm
-share/themes/Lila-light/xfwm4/menu-inactive.xpm
-share/themes/Lila-light/xfwm4/bottom-right-active.xpm
-share/themes/Lila-light/xfwm4/hide-pressed.xpm
 share/themes/Lila-light/xfwm4/bottom-inactive.xpm
+share/themes/Lila-light/xfwm4/bottom-left-active.xpm
+share/themes/Lila-light/xfwm4/bottom-left-inactive.xpm
+share/themes/Lila-light/xfwm4/bottom-right-active.xpm
 share/themes/Lila-light/xfwm4/bottom-right-inactive.xpm
+share/themes/Lila-light/xfwm4/close-active.xpm
+share/themes/Lila-light/xfwm4/close-inactive.xpm
+share/themes/Lila-light/xfwm4/close-pressed.xpm
 share/themes/Lila-light/xfwm4/hide-active.xpm
-share/themes/Lila-light/xfwm4/title-1-inactive.xpm
-share/themes/Lila-light/xfwm4/themerc
-share/themes/Lila-light/xfwm4/top-right-inactive.xpm
-share/themes/Lila-light/xfwm4/top-left-inactive.xpm
+share/themes/Lila-light/xfwm4/hide-inactive.xpm
+share/themes/Lila-light/xfwm4/hide-pressed.xpm
+share/themes/Lila-light/xfwm4/left-active.xpm
+share/themes/Lila-light/xfwm4/left-inactive.xpm
+share/themes/Lila-light/xfwm4/maximize-active.xpm
 share/themes/Lila-light/xfwm4/maximize-inactive.xpm
+share/themes/Lila-light/xfwm4/maximize-pressed.xpm
 share/themes/Lila-light/xfwm4/maximize-toggled-active.xpm
-share/themes/Lila-light/xfwm4/bottom-left-inactive.xpm
-share/themes/Lila-light/xfwm4/left-inactive.xpm
-share/themes/Lila-light/xfwm4/bottom-left-active.xpm
+share/themes/Lila-light/xfwm4/maximize-toggled-inactive.xpm
 share/themes/Lila-light/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Lila-light/xfwm4/title-5-active.xpm
-share/themes/Lila-light/xfwm4/maximize-pressed.xpm
+share/themes/Lila-light/xfwm4/menu-active.xpm
+share/themes/Lila-light/xfwm4/menu-inactive.xpm
+share/themes/Lila-light/xfwm4/menu-pressed.xpm
+share/themes/Lila-light/xfwm4/right-active.xpm
 share/themes/Lila-light/xfwm4/right-inactive.xpm
+share/themes/Lila-light/xfwm4/themerc
+share/themes/Lila-light/xfwm4/title-1-active.xpm
+share/themes/Lila-light/xfwm4/title-1-inactive.xpm
+share/themes/Lila-light/xfwm4/title-2-active.xpm
+share/themes/Lila-light/xfwm4/title-2-inactive.xpm
+share/themes/Lila-light/xfwm4/title-3-active.xpm
+share/themes/Lila-light/xfwm4/title-3-inactive.xpm
 share/themes/Lila-light/xfwm4/title-4-active.xpm
-share/themes/Lila-light/xfwm4/close-active.xpm
-share/themes/Lila-light/xfwm4/close-inactive.xpm
+share/themes/Lila-light/xfwm4/title-4-inactive.xpm
+share/themes/Lila-light/xfwm4/title-5-active.xpm
+share/themes/Lila-light/xfwm4/title-5-inactive.xpm
+share/themes/Lila-light/xfwm4/top-left-active.xpm
+share/themes/Lila-light/xfwm4/top-left-inactive.xpm
 share/themes/Lila-light/xfwm4/top-right-active.xpm
-share/themes/Lila-light/xfwm4/maximize-active.xpm
-share/themes/Lila-light/xfwm4/menu-active.xpm
-share/themes/Lila-light/xfwm4/title-3-active.xpm
-share/themes/Lila-light/xfwm4/title-2-active.xpm
+share/themes/Lila-light/xfwm4/top-right-inactive.xpm
 @dirrm share/themes/Lila-light/xfwm4
+@dirrmtry share/themes/Lila-light
 @dirrm share/themes/Lila/xfwm4
-@dirrm share/themes/Lila-light
-@dirrm share/themes/Lila
+@dirrmtry share/themes/Lila
 @dirrmtry share/themes