21 files changed, 77 insertions, 68 deletions

diff --git a/x11-themes/e17-splash-takara/Makefile b/x11-themes/e17-splash-takara/Makefile
index 9a273e13f799..9972260f63b5 100644
--- a/x11-themes/e17-splash-takara/Makefile
+++ b/x11-themes/e17-splash-takara/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	takara
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
diff --git a/x11-themes/e17-splash-takara/distinfo b/x11-themes/e17-splash-takara/distinfo
index 933e3f101b9a..bf45b3b3e574 100644
--- a/x11-themes/e17-splash-takara/distinfo
+++ b/x11-themes/e17-splash-takara/distinfo
@@ -1,3 +1,3 @@
-MD5 (init_takara_v1.0.4.edj) = ac8bf79e06fdb87ae19fb7e0ebc08ace
-SHA256 (init_takara_v1.0.4.edj) = a86d2f2d9426dfdd7a8819965cf628949a9e07a449d1126a083d4a3998372dbc
-SIZE (init_takara_v1.0.4.edj) = 183530
+MD5 (init_takara_v1.0.5.edj) = 196308a11622903de33abdeee96f538a
+SHA256 (init_takara_v1.0.5.edj) = 0b89648ee5985e98aab32b8e066bc50cbe2c570c4610ed0fabdb2a3135803195
+SIZE (init_takara_v1.0.5.edj) = 180934
diff --git a/x11-themes/e17-theme-blue_eyed/Makefile b/x11-themes/e17-theme-blue_eyed/Makefile
index d9940da0aa58..06a81503eacb 100644
--- a/x11-themes/e17-theme-blue_eyed/Makefile
+++ b/x11-themes/e17-theme-blue_eyed/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	blue_eyed
-PORTVERSION=	0.6.5.6
-PORTREVISION=	1
+PORTVERSION=	0.6.5.7
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	blue_eyed_0.6.5.g_l
+DISTNAME=	blue_eyed_0.6.5.g_ma
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-blue_eyed/distinfo b/x11-themes/e17-theme-blue_eyed/distinfo
index 8f5ca9db381b..8f5e7d7eb953 100644
--- a/x11-themes/e17-theme-blue_eyed/distinfo
+++ b/x11-themes/e17-theme-blue_eyed/distinfo
@@ -1,3 +1,3 @@
-MD5 (blue_eyed_0.6.5.g_l.edj) = b410d12dd557da981fa0ab4c799636ec
-SHA256 (blue_eyed_0.6.5.g_l.edj) = d924a7f94c2767b3edf5276dad9976af487ad638aa8afaf443d2106cdcf07897
-SIZE (blue_eyed_0.6.5.g_l.edj) = 2024157
+MD5 (blue_eyed_0.6.5.g_ma.edj) = 5280eb184a9ad60a7537a5ea790128d6
+SHA256 (blue_eyed_0.6.5.g_ma.edj) = a9ce13cd92523a24570a49e806541643c30ca2a827d693d2c5d2a943f8ec48e3
+SIZE (blue_eyed_0.6.5.g_ma.edj) = 2370930
diff --git a/x11-themes/e17-theme-cthulhain/Makefile b/x11-themes/e17-theme-cthulhain/Makefile
index d145badde6ee..9c202c241286 100644
--- a/x11-themes/e17-theme-cthulhain/Makefile
+++ b/x11-themes/e17-theme-cthulhain/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	cthulhain
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.4.1
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	cthulhain-0.3pre9
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-cthulhain/distinfo b/x11-themes/e17-theme-cthulhain/distinfo
index 50c0af7350fd..17306384bb18 100644
--- a/x11-themes/e17-theme-cthulhain/distinfo
+++ b/x11-themes/e17-theme-cthulhain/distinfo
@@ -1,3 +1,3 @@
-MD5 (cthulhain-0.3pre9.edj) = 6f8cf81342027864a6ebc4f00c438048
-SHA256 (cthulhain-0.3pre9.edj) = 794dda4e3d40d006d0b5b80f5283bb3c8357de4565d3e86c36d0b0e353c9f1e1
-SIZE (cthulhain-0.3pre9.edj) = 2195862
+MD5 (cthulhain-0.4.1.edj) = c371dae5a58ee089afbf545b36da4e7c
+SHA256 (cthulhain-0.4.1.edj) = 8a7f55bf0ae8e3de83b9e7aa8efcacc2e6378f77f8492d40a108a9dbc2e705fc
+SIZE (cthulhain-0.4.1.edj) = 2329966
diff --git a/x11-themes/e17-theme-dali/Makefile b/x11-themes/e17-theme-dali/Makefile
index d8dfd51a084b..09679d1a6025 100644
--- a/x11-themes/e17-theme-dali/Makefile
+++ b/x11-themes/e17-theme-dali/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	dali
-PORTVERSION=	0.1
-PORTREVISION=	1
+PORTVERSION=	4.1b
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}${PORTVERSION:S,.,,}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-dali/distinfo b/x11-themes/e17-theme-dali/distinfo
index 1f5ad7b58f66..fb048d7bc4b2 100644
--- a/x11-themes/e17-theme-dali/distinfo
+++ b/x11-themes/e17-theme-dali/distinfo
@@ -1,3 +1,3 @@
-MD5 (dali.edj) = 6ce13072052dc1b896e0478f940ac964
-SHA256 (dali.edj) = ad45c6ec1bc6e1cd5c79fa73ef7893642e5e0970b48ed2e97e2bcef6f22d5e21
-SIZE (dali.edj) = 4489367
+MD5 (dali41b.edj) = 71511291a186c2710e8d85f45f5d4696
+SHA256 (dali41b.edj) = 2d317331312800bf324ed0475e2bb4c7bdd7c831a25e3f7eaf45a1fa9023216c
+SIZE (dali41b.edj) = 5151238
diff --git a/x11-themes/e17-theme-darkness/Makefile b/x11-themes/e17-theme-darkness/Makefile
index 8e7a97178a31..a20fb2bcf07e 100644
--- a/x11-themes/e17-theme-darkness/Makefile
+++ b/x11-themes/e17-theme-darkness/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	darkness
-PORTVERSION=	0.99.037.3
-PORTREVISION=	1
+PORTVERSION=	0.99.037.4
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}_by_saturn_vk
 EXTRACT_SUFX=	.edj
diff --git a/x11-themes/e17-theme-darkness/distinfo b/x11-themes/e17-theme-darkness/distinfo
index c0736d2f68ef..1a07673341a3 100644
--- a/x11-themes/e17-theme-darkness/distinfo
+++ b/x11-themes/e17-theme-darkness/distinfo
@@ -1,3 +1,3 @@
-MD5 (darkness_by_saturn_vk.edj) = 97b7308808e60b86fe437147bad51144
-SHA256 (darkness_by_saturn_vk.edj) = 0c17f7de7b5f807e1eef6bc853ca6230fbf5cac3051cbefe43219a4d9c8b8c59
-SIZE (darkness_by_saturn_vk.edj) = 4012687
+MD5 (darkness_by_saturn_vk.edj) = 84f9376108e04cf3bddcfaa160a5edd7
+SHA256 (darkness_by_saturn_vk.edj) = 7c0ae93268abd6212165a8f270cb557ee864bb62f46162ac853edb27f2733099
+SIZE (darkness_by_saturn_vk.edj) = 5401434
diff --git a/x11-themes/e17-theme-gant/Makefile b/x11-themes/e17-theme-gant/Makefile
index 0e0462a28b3e..de13f93bbd9b 100644
--- a/x11-themes/e17-theme-gant/Makefile
+++ b/x11-themes/e17-theme-gant/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gant
-PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTVERSION=	0.0.9
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}-e17_${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-gant/distinfo b/x11-themes/e17-theme-gant/distinfo
index f2609d454c71..2042890606b5 100644
--- a/x11-themes/e17-theme-gant/distinfo
+++ b/x11-themes/e17-theme-gant/distinfo
@@ -1,3 +1,3 @@
-MD5 (gant.edj) = 82a6bfbd3dc61c7bb312ffadfc230ff8
-SHA256 (gant.edj) = 3dd193bedfe44f670a4f80e5c18788ad3e94cad999e931a03f973c24801cda70
-SIZE (gant.edj) = 2928734
+MD5 (gant-e17_0.0.9.edj) = 574bf6e34bae053ab56404d1cb29d14e
+SHA256 (gant-e17_0.0.9.edj) = 9891296e0651ca60a6d1111802ef9d7a0bd292cecd1a38dad153a4b5ae056678
+SIZE (gant-e17_0.0.9.edj) = 4145125
diff --git a/x11-themes/e17-theme-japan2007/Makefile b/x11-themes/e17-theme-japan2007/Makefile
index 730c4ffc0cd2..383cbcaf1743 100644
--- a/x11-themes/e17-theme-japan2007/Makefile
+++ b/x11-themes/e17-theme-japan2007/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	japan2007
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	0.9.7
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.edj
diff --git a/x11-themes/e17-theme-japan2007/distinfo b/x11-themes/e17-theme-japan2007/distinfo
index f5b3bb3446d1..2c5b4d603d22 100644
--- a/x11-themes/e17-theme-japan2007/distinfo
+++ b/x11-themes/e17-theme-japan2007/distinfo
@@ -1,3 +1,3 @@
-MD5 (japan2007.edj) = 821285130431957bd6029723e38ffde6
-SHA256 (japan2007.edj) = 025d8741b1ca65bf3c16a54082883db3688f203d05cdc3ca8b9f14c56c518691
-SIZE (japan2007.edj) = 1600130
+MD5 (japan2007.edj) = 676124a0105ddacf6b2efa8e8f87e474
+SHA256 (japan2007.edj) = 09e802e49f3c9e01303b45a980d59ea24628331287a150e093df25c67e250edd
+SIZE (japan2007.edj) = 1686515
diff --git a/x11-themes/e17-theme-kor/Makefile b/x11-themes/e17-theme-kor/Makefile
index 1569911ee6bd..f959daf96876 100644
--- a/x11-themes/e17-theme-kor/Makefile
+++ b/x11-themes/e17-theme-kor/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	kor
-PORTVERSION=	0.0.4.3
-PORTREVISION=	1
+PORTVERSION=	0.0.6
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}_0_0_4c
+DISTNAME=	${PORTNAME}_${PORTVERSION:S,.,_,g}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-kor/distinfo b/x11-themes/e17-theme-kor/distinfo
index 72633b9d5cbe..2ac22f2bcb0c 100644
--- a/x11-themes/e17-theme-kor/distinfo
+++ b/x11-themes/e17-theme-kor/distinfo
@@ -1,3 +1,3 @@
-MD5 (kor_0_0_4c.edj) = 19848bf3a9f96944507f9a7c9c1c4a20
-SHA256 (kor_0_0_4c.edj) = 4f097eb054b64b4b2e7e5a2e320f683cb04eeeeb727626f2b8b625eaae6af688
-SIZE (kor_0_0_4c.edj) = 2499628
+MD5 (kor_0_0_6.edj) = 56cc8e1684c28c9d44fedb58be4a6e05
+SHA256 (kor_0_0_6.edj) = 945554e2fd00255b63e9073b4b2bbe840763d2c2efe7675aab48f8f86c400457
+SIZE (kor_0_0_6.edj) = 2690997
diff --git a/x11-themes/e17-theme-milky/Makefile b/x11-themes/e17-theme-milky/Makefile
index ef5568b05f8f..01599188451f 100644
--- a/x11-themes/e17-theme-milky/Makefile
+++ b/x11-themes/e17-theme-milky/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	milky
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	Milky
 EXTRACT_SUFX=	.edj
diff --git a/x11-themes/e17-theme-night_bling/Makefile b/x11-themes/e17-theme-night_bling/Makefile
index 72031ed90765..8f22a301141e 100644
--- a/x11-themes/e17-theme-night_bling/Makefile
+++ b/x11-themes/e17-theme-night_bling/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	night_bling
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}2
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-night_bling/distinfo b/x11-themes/e17-theme-night_bling/distinfo
index a525fb210211..8d07f807eb9f 100644
--- a/x11-themes/e17-theme-night_bling/distinfo
+++ b/x11-themes/e17-theme-night_bling/distinfo
@@ -1,3 +1,3 @@
-MD5 (night_bling.edj) = 8953ce85dfb6e91686fb862450b57e4c
-SHA256 (night_bling.edj) = f2843f994aa836f3709475b86f43084cef51bdd77f636d790964c55b24a0c6e5
-SIZE (night_bling.edj) = 2496365
+MD5 (night_bling2.edj) = e2ae2a92bfd29c53f87b4e3c114815fd
+SHA256 (night_bling2.edj) = fde811453fc0b02435345ae372c4d6d3de76a67160190bf3bec375b0b3731429
+SIZE (night_bling2.edj) = 2522855
diff --git a/x11-themes/e17-theme-simply_white/Makefile b/x11-themes/e17-theme-simply_white/Makefile
index 8faa30cd84df..4099d80f6444 100644
--- a/x11-themes/e17-theme-simply_white/Makefile
+++ b/x11-themes/e17-theme-simply_white/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	simply_white
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.8.5
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	simply-white
+DISTNAME=	simply-white-${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-simply_white/distinfo b/x11-themes/e17-theme-simply_white/distinfo
index bcfb994bd1ab..731a07862c8f 100644
--- a/x11-themes/e17-theme-simply_white/distinfo
+++ b/x11-themes/e17-theme-simply_white/distinfo
@@ -1,3 +1,3 @@
-MD5 (simply-white.edj) = 74746edd8d84c9ce6bb5d9969f27c616
-SHA256 (simply-white.edj) = 7294f2ae2e535397cc3df061a9c538400d0b36e7bbd514d706a18d0e3d0b90c6
-SIZE (simply-white.edj) = 1978867
+MD5 (simply-white-0.8.5.edj) = 1cc881f310362e57f3f113fe1362c698
+SHA256 (simply-white-0.8.5.edj) = 23c8f020ad9eb3e10a7fdc1f3ce042e8b1a4d14624c449495e5e2afcb0302f73
+SIZE (simply-white-0.8.5.edj) = 2829718