3 files changed, 101 insertions, 1 deletions

diff --git a/www/eyeos-themes/Makefile b/www/eyeos-themes/Makefile
index 99725e7b57ba..62783c3d06e7 100644
--- a/www/eyeos-themes/Makefile
+++ b/www/eyeos-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	themes
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.eyelook.org/themes/ \
 		http://bsd1.csme.ru/myports/${DIST_SUBDIR}/ \
@@ -14,7 +15,7 @@ MASTER_SITES=	http://www.eyelook.org/themes/ \
 		http://bsd3.csme.ru/myports/${DIST_SUBDIR}/
 PKGNAMEPREFIX=	eyeOS-
 DISTFILES=	${EYETHEMES:S/$/.zip/}
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	nivit@email.it
 COMMENT=	A themes collection for eyeOS
@@ -37,6 +38,7 @@ OPTIONS+=	Mini_THEME "with mall icons based on Nuvola icon set" On
 OPTIONS+=	NuoveXT_THEME "based on 'NuoveXT' Open Source icons" On
 OPTIONS+=	Nuvola_THEME "inspired in the great icons Nuvola" On
 OPTIONS+=	WaterSide_THEME "inspired in countryside of Saskatchewan" On
+OPTIONS+=	fromX_THEME "based on Tango Icons" On
 
 .include <bsd.port.pre.mk>
 
@@ -53,6 +55,9 @@ PLIST_SUB+=	D${theme:U}="@comment "
 
 PLIST_SUB+=	EYEDIR=${EYEDIR:S,^${PREFIX}/,,}
 
+post-extract:
+	@${FIND} ${WRKSRC} -name \*~ -delete
+
 do-install:
 	${CP} -Rp ${EYETHEMES:S,^,${WRKDIR}/,} ${THEMESDIR}/
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${THEMESDIR}
@@ -60,4 +65,18 @@ do-install:
 	${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} %D/${THEMESDIR:S,^${PREFIX}/,,} >> ${TMPPLIST}
 	${ECHO_CMD} @exec ${CHMOD} -R go-w %D/${THEMESDIR:S,^${PREFIX}/,,} >> ${TMPPLIST}
 
+# Maintainer section
+create-plist: build
+	: > ${PLIST}
+.for theme in ${OPTIONS:M*_THEME:S/_THEME//:O}
+	${FIND} -s ${WRKSRC}/${theme} -type f -or -type l | \
+		${SED} -e 's#^${WRKSRC}/${theme}#%%${theme:U}%%#' >> ${PLIST}
+.endfor
+.for theme in ${OPTIONS:M*_THEME:S/_THEME//:O}
+	${FIND} -ds ${WRKSRC}/${theme} -type d | \
+		${SED} -e 's#^${WRKSRC}/${theme}#%%D${theme:U}%%#' >> ${PLIST}
+.endfor
+	${ECHO_CMD} @dirrmtry %%EYEDIR%%/system/themes >> ${PLIST}
+	${ECHO_CMD} @dirrmtry %%EYEDIR%%/system >> ${PLIST}
+
 .include <bsd.port.post.mk>
diff --git a/www/eyeos-themes/distinfo b/www/eyeos-themes/distinfo
index 0d6ecb1f47f4..a76fedf449df 100644
--- a/www/eyeos-themes/distinfo
+++ b/www/eyeos-themes/distinfo
@@ -25,3 +25,6 @@ SIZE (eyeOS-themes-1.2/Nuvola.zip) = 300021
 MD5 (eyeOS-themes-1.2/WaterSide.zip) = ffe6b4fa564145e1f8357195a29f1f1c
 SHA256 (eyeOS-themes-1.2/WaterSide.zip) = b17fc3ada93193118b26c861b8c4bb1ce90a3b6c21b1411111823b9103eeae5f
 SIZE (eyeOS-themes-1.2/WaterSide.zip) = 435858
+MD5 (eyeOS-themes-1.2/fromX.zip) = 25774782bd1c3c85ff2e807dad857c3f
+SHA256 (eyeOS-themes-1.2/fromX.zip) = dfe0223f2d3bdc9720f1d6870ee35a0a175710ac9bf6c4287c378734aa0ad997
+SIZE (eyeOS-themes-1.2/fromX.zip) = 139299
diff --git a/www/eyeos-themes/pkg-plist b/www/eyeos-themes/pkg-plist
index f7955e3f5db9..635786fec0bd 100644
--- a/www/eyeos-themes/pkg-plist
+++ b/www/eyeos-themes/pkg-plist
@@ -610,6 +610,65 @@
 %%WATERSIDE%%/gfxwin/min.png
 %%WATERSIDE%%/gfxwin/resize.png
 %%WATERSIDE%%/thumb.png
+%%FROMX%%/IE/1.png
+%%FROMX%%/IE/3.png
+%%FROMX%%/IE/5.png
+%%FROMX%%/IE/close.png
+%%FROMX%%/IE/default.css
+%%FROMX%%/IE/exit.png
+%%FROMX%%/IE/max.png
+%%FROMX%%/IE/panel.png
+%%FROMX%%/INFO
+%%FROMX%%/apps/eyeApps.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeApps.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeBoard.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeBoard.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeCalc.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeCalc.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeCalendar.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeCalendar.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeEdit.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeEdit.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeHome.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeHome.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeInfo.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeInfo.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeMessages.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeMessages.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeNav.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeNav.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeOptions.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeOptions.eyeapp/ico_c.png
+%%FROMX%%/apps/eyePhones.eyeapp/ico_b.png
+%%FROMX%%/apps/eyePhones.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeRSS.eyeapp/ico_b.png
+%%FROMX%%/apps/eyeRSS.eyeapp/ico_c.png
+%%FROMX%%/apps/eyeTrash.eyeapp/empty.png
+%%FROMX%%/apps/eyeTrash.eyeapp/full.png
+%%FROMX%%/default.css
+%%FROMX%%/desktop/exit.png
+%%FROMX%%/desktop/exit2.png
+%%FROMX%%/desktop/panel.png
+%%FROMX%%/eyeos.jpg
+%%FROMX%%/gfxwin/1.png
+%%FROMX%%/gfxwin/2.png
+%%FROMX%%/gfxwin/3.png
+%%FROMX%%/gfxwin/4.png
+%%FROMX%%/gfxwin/5.png
+%%FROMX%%/gfxwin/6.png
+%%FROMX%%/gfxwin/7.png
+%%FROMX%%/gfxwin/barc.png
+%%FROMX%%/gfxwin/barl.png
+%%FROMX%%/gfxwin/barr.png
+%%FROMX%%/gfxwin/bubbles/background.png
+%%FROMX%%/gfxwin/bubbles/botl.png
+%%FROMX%%/gfxwin/bubbles/botr.png
+%%FROMX%%/gfxwin/bubbles/out.png
+%%FROMX%%/gfxwin/bubbles/topl.png
+%%FROMX%%/gfxwin/bubbles/topr.png
+%%FROMX%%/gfxwin/close.png
+%%FROMX%%/gfxwin/max.png
+%%FROMX%%/thumb.png
 %%DCRYSTAL%%/IE
 %%DCRYSTAL%%/apps/eyeApps.eyeapp
 %%DCRYSTAL%%/apps/eyeBoard.eyeapp
@@ -744,5 +803,24 @@
 %%DWATERSIDE%%/gfxwin/bubbles
 %%DWATERSIDE%%/gfxwin
 %%DWATERSIDE%%
+%%DFROMX%%/IE
+%%DFROMX%%/apps/eyeApps.eyeapp
+%%DFROMX%%/apps/eyeBoard.eyeapp
+%%DFROMX%%/apps/eyeCalc.eyeapp
+%%DFROMX%%/apps/eyeCalendar.eyeapp
+%%DFROMX%%/apps/eyeEdit.eyeapp
+%%DFROMX%%/apps/eyeHome.eyeapp
+%%DFROMX%%/apps/eyeInfo.eyeapp
+%%DFROMX%%/apps/eyeMessages.eyeapp
+%%DFROMX%%/apps/eyeNav.eyeapp
+%%DFROMX%%/apps/eyeOptions.eyeapp
+%%DFROMX%%/apps/eyePhones.eyeapp
+%%DFROMX%%/apps/eyeRSS.eyeapp
+%%DFROMX%%/apps/eyeTrash.eyeapp
+%%DFROMX%%/apps
+%%DFROMX%%/desktop
+%%DFROMX%%/gfxwin/bubbles
+%%DFROMX%%/gfxwin
+%%DFROMX%%
 @dirrmtry %%EYEDIR%%/system/themes
 @dirrmtry %%EYEDIR%%/system