- Update to 1.0.1

PR:		148385
Submitted by:	Eygene Ryabinkin <rea-fbsd@codelabs.ru> (maintainer)
Feature safe:	yes

3 files changed, 50 insertions, 22 deletions

diff --git a/x11-themes/slim-themes/Makefile b/x11-themes/slim-themes/Makefile
index 6f7e361f16ba..79f982805fb8 100644
--- a/x11-themes/slim-themes/Makefile
+++ b/x11-themes/slim-themes/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	slim-themes
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	${MASTER_SITE_BERLIOS:S/$/:old_themes/g} \
+		http://slim.berlios.de/themes/:new_themes
 MASTER_SITE_SUBDIR=	slim
 DISTFILES=
 
@@ -26,27 +26,30 @@ THEMEDIR_REL=	share/slim/themes
 THEMEDIR=	${PREFIX}/${THEMEDIR_REL}
 PLIST_SUB+=	THEMEDIR=${THEMEDIR_REL}
 
-# Format is 'variable name%description%archive name%unpacked dir%dest dir'
+# Format is 'variable name%description%archive name%unpacked dir%dest
+# dir%master site tag'
 # I am substituting ' ' -> '+' because make in 6.x isn't able to properly
 # catch quoted strings with spaces.  7.x and 8.x are fine with this, so
 # once 6.x will be deorbited, we could switch just to spaces.
-THEMELIST=	GENTOO_SIMPLE%"Gentoo+simple+theme"%slim-gentoo-simple.tar.bz2%slim-gentoo-simple%gentoo-simple \
-		ARCHLINUX_SIMPLE%"ArchLinux+simple+theme"%slim-archlinux-simple.tar.gz%slim-archlinux-simple%archlinux-simple \
-		DEBIAN_MOREBLUE%"Debian+moreblue+theme"%slim-debian-moreblue.tar.bz2%debian-moreblue%debian-moreblue \
-		FINGERPRINT%"Fingerprint+theme"%slim-fingerprint.tar.gz%fingerprint%fingerprint \
-		FLAT%"Flat+theme"%slim-flat.tar.gz%flat%flat \
-		LAKE%"Lake+theme"%slim-lake.tar.gz%lake%lake \
-		RAINBOW%"Rainbow+theme"%slim-rainbow.tar.gz%rainbow%rainbow \
-		REAR_WINDOW%"Rear+Window+theme"%slim-rear-window.tar.gz%rear-window%rear-window \
-		SCOTLAND_ROAD%"Scotland+Road+theme"%slim-scotland-road.tar.gz%scotland-road%scotland-road \
-		SUBWAY%"Subway+theme"%slim-subway.tar.gz%subway%subway \
-		WAVE%"Wave+theme"%slim-wave.tar.gz%wave%wave \
-		LUNAR_LINUX%"Lunar+Linux+theme"%slim-lunar-0.4.tar.bz2%slim-lunar-0.4%lunar \
-		ZENWALK%"Zenwalk+theme"%slim-zenwalk.tar.gz%Zenwalk%zenwalk \
-		PARALLEL_DIMS%"Parallel+Dimensions+theme"%slim-parallel-dimensions.tar.gz%parallel-dimensions%parallel-dimensions \
-		CAPERNOITED%"Capernoited+theme"%slim-capernoited.tar.gz%capernoited%capernoited \
-		MINDLOCK%"Mindlock+theme"%slim-mindlock.tar.gz%mindlock%mindlock \
-		FLOWER2%"Flower2+theme"%slim-flower2.tar.gz%flower2%flower2
+THEMELIST=	GENTOO_SIMPLE%"Gentoo+simple+theme"%slim-gentoo-simple.tar.bz2%slim-gentoo-simple%gentoo-simple%old_themes \
+		ARCHLINUX_SIMPLE%"ArchLinux+simple+theme"%slim-archlinux-simple.tar.gz%slim-archlinux-simple%archlinux-simple%old_themes \
+		DEBIAN_MOREBLUE%"Debian+moreblue+theme"%slim-debian-moreblue.tar.bz2%debian-moreblue%debian-moreblue%old_themes \
+		FINGERPRINT%"Fingerprint+theme"%slim-fingerprint.tar.gz%fingerprint%fingerprint%old_themes \
+		FLAT%"Flat+theme"%slim-flat.tar.gz%flat%flat%old_themes \
+		LAKE%"Lake+theme"%slim-lake.tar.gz%lake%lake%old_themes \
+		RAINBOW%"Rainbow+theme"%slim-rainbow.tar.gz%rainbow%rainbow%old_themes \
+		REAR_WINDOW%"Rear+Window+theme"%slim-rear-window.tar.gz%rear-window%rear-window%old_themes \
+		SCOTLAND_ROAD%"Scotland+Road+theme"%slim-scotland-road.tar.gz%scotland-road%scotland-road%old_themes \
+		SUBWAY%"Subway+theme"%slim-subway.tar.gz%subway%subway%old_themes \
+		WAVE%"Wave+theme"%slim-wave.tar.gz%wave%wave%old_themes \
+		LUNAR_LINUX%"Lunar+Linux+theme"%slim-lunar-0.4.tar.bz2%slim-lunar-0.4%lunar%old_themes \
+		ZENWALK%"Zenwalk+theme"%slim-zenwalk.tar.gz%Zenwalk%zenwalk%old_themes \
+		PARALLEL_DIMS%"Parallel+Dimensions+theme"%slim-parallel-dimensions.tar.gz%parallel-dimensions%parallel-dimensions%old_themes \
+		CAPERNOITED%"Capernoited+theme"%slim-capernoited.tar.gz%capernoited%capernoited%old_themes \
+		MINDLOCK%"Mindlock+theme"%slim-mindlock.tar.gz%mindlock%mindlock%old_themes \
+		FLOWER2%"Flower2+theme"%slim-flower2.tar.gz%flower2%flower2%old_themes \
+		FREEBSD%"FreeBSD+theme"%fbsd-slim-theme.tar.bz2%fbsd%fbsd%new_themes \
+		GNEWSENSE%"gNewSense+theme"%slim-gnewsense-1.1.tar.bz2%slim-gnewsense-1.1%gnewsense%new_themes
 
 # Pollute OPTIONS and DISTFILES.  Cool magic ;))
 # We're using immediate assignment and two variables, because there is
@@ -57,9 +60,14 @@ n=	${t:C/^([^%]*)%.*$/\\1/1}
 d=	${t:C/^[^%]*%[^%]*%([^%]*)%.*$/\\1/1}
 desc=	${t:C/^[^%]*%([^%]*)%.*$/\\1/1:C/\+/ /g}
 sdir=	${t:C/^[^%]*%[^%]*%[^%]*%([^%]*)%.*$/\\1/1}
-ddir=	${t:C/^[^%]*%[^%]*%[^%]*%[^%]*%([^%]*)$/\\1/1}
+ddir=	${t:C/^[^%]*%[^%]*%[^%]*%[^%]*%([^%]*)%.*$/\\1/1}
+mtag=	${t:C/^[^%]*%[^%]*%[^%]*%[^%]*%[^%]*%([^%]*)$/\\1/1}
 ${n}_NAME:=	${n}
+.if ${mtag} == ""
 ${n}_DIST:=	${d}
+.else
+${n}_DIST:=	${d}:${mtag}
+.endif
 ${n}_SDIR:=	${sdir}
 ${n}_DDIR:=	${ddir}
 NEWOPTS:=	${OPTIONS}	${n} ${desc} off
diff --git a/x11-themes/slim-themes/distinfo b/x11-themes/slim-themes/distinfo
index 861d3eee7cee..b0bdc2e40946 100644
--- a/x11-themes/slim-themes/distinfo
+++ b/x11-themes/slim-themes/distinfo
@@ -49,3 +49,9 @@ SIZE (slim-mindlock.tar.gz) = 324396
 MD5 (slim-flower2.tar.gz) = 7975b6a41f4dddc2390dd46d09393f86
 SHA256 (slim-flower2.tar.gz) = 840faf6459ffd6c2c363160c85cb98000717f9a425102976336f5d8f68ed95ee
 SIZE (slim-flower2.tar.gz) = 206352
+MD5 (fbsd-slim-theme.tar.bz2) = 0c592aa9547b7014ab1c147f69d64031
+SHA256 (fbsd-slim-theme.tar.bz2) = 4168cdb6e869b045a1511c54bf6b4b3993d183d5eb14cd50a62b72c52bebbb0a
+SIZE (fbsd-slim-theme.tar.bz2) = 80048
+MD5 (slim-gnewsense-1.1.tar.bz2) = 0abb8b29afb65955101094fae77e215f
+SHA256 (slim-gnewsense-1.1.tar.bz2) = aebe481043b400d0b8e5235d2d539a31b794d578f854b9d124eef455aa3c17dc
+SIZE (slim-gnewsense-1.1.tar.bz2) = 100201
diff --git a/x11-themes/slim-themes/pkg-plist b/x11-themes/slim-themes/pkg-plist
index 122041be26c4..955aa02cb42a 100644
--- a/x11-themes/slim-themes/pkg-plist
+++ b/x11-themes/slim-themes/pkg-plist
@@ -81,5 +81,19 @@
 %%FLOWER2%%%%THEMEDIR%%/flower2/background.jpg
 %%FLOWER2%%%%THEMEDIR%%/flower2/slim.theme
 %%FLOWER2%%@dirrmtry %%THEMEDIR%%/flower2
+%%FREEBSD%%%%THEMEDIR%%/fbsd/background.png
+%%FREEBSD%%%%THEMEDIR%%/fbsd/preview.png
+%%FREEBSD%%%%THEMEDIR%%/fbsd/panel.png
+%%FREEBSD%%%%THEMEDIR%%/fbsd/slim.theme
+%%FREEBSD%%@dirrmtry %%THEMEDIR%%/fbsd
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/COPYRIGHT.panel
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/README
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/slim.theme
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/background.png
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/LICENSE
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/screenshot.png
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/COPYRIGHT.background
+%%GNEWSENSE%%%%THEMEDIR%%/gnewsense/panel.png
+%%FREEBSD%%@dirrmtry %%THEMEDIR%%/gnewsense
 @dirrmtry share/slim/themes
 @dirrmtry share/slim