16 files changed, 17 insertions, 26 deletions
diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile
index fb1974fbd67d..01c7df2d77b9 100644
--- a/x11-themes/gnome-icons-aqua-fusion/Makefile
+++ b/x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -18,7 +18,7 @@ COMMENT=	AquaFusion Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=	tar:bzip2
-WRKSRC=		"${WRKDIR}/AquaFusion"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-crystal/Makefile b/x11-themes/gnome-icons-crystal/Makefile
index d816c25dd97a..61aba255e525 100644
--- a/x11-themes/gnome-icons-crystal/Makefile
+++ b/x11-themes/gnome-icons-crystal/Makefile
@@ -19,10 +19,10 @@ COMMENT=	Crystal SVG Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=		tar:bzip2
-WRKSRC=		${WRKDIR}/CfG-Crystal-SVG-${PORTVERSION}
+NO_WRKSUBDIR=	yes
 
 post-patch:
-	@${REINPLACE_CMD} 's|\(^Directories=.*\),,|\1,|' ${WRKSRC}/index.theme
+	@${REINPLACE_CMD} 's|\(^Directories=.*\),,|\1,|' ${WRKSRC}/CfG-Crystal-SVG-${PORTVERSION}/index.theme
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-dropline-neu/Makefile b/x11-themes/gnome-icons-dropline-neu/Makefile
index e6af48d21776..463717f44c24 100644
--- a/x11-themes/gnome-icons-dropline-neu/Makefile
+++ b/x11-themes/gnome-icons-dropline-neu/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Dropline Neu Icons for Gnome
 
 USES=		tar:bzip2
-WRKSRC=		"${WRKDIR}/Neu"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-dropline-nou/Makefile b/x11-themes/gnome-icons-dropline-nou/Makefile
index 014aac1526b1..1981991f07ed 100644
--- a/x11-themes/gnome-icons-dropline-nou/Makefile
+++ b/x11-themes/gnome-icons-dropline-nou/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Dropline Nou Icons for Gnome
 
 USES=		tar:bzip2
-WRKSRC=		"${WRKDIR}/Nou"
+NO_WRKSUBDIR=	yes
 
 post-extract:
 	@${RM} ${WRKSRC}/.icon-theme.cache
diff --git a/x11-themes/gnome-icons-elementary/Makefile b/x11-themes/gnome-icons-elementary/Makefile
index 05c26fb58ed7..dede197a394f 100644
--- a/x11-themes/gnome-icons-elementary/Makefile
+++ b/x11-themes/gnome-icons-elementary/Makefile
@@ -20,7 +20,7 @@ INSTALLS_ICONS=	yes
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/elementary/ \
-		"! -name 'plist' ! -name '*.bak' ! -name '${LICENSE}' ! -path 'stage/*' "
+		"! -name '*.bak' ! -name '${LICENSE}'"
 	${FIND} ${STAGEDIR}${PREFIX}/share/icons/elementary/ -depth 2 \
 		-type d -empty | \
 		${XARGS} ${RMDIR}
diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile
index 6438628ee00d..39c07991bea9 100644
--- a/x11-themes/gnome-icons-gentoo-test/Makefile
+++ b/x11-themes/gnome-icons-gentoo-test/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Gentoo-Test Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=	tar:bzip2
-WRKSRC=		"${WRKDIR}/Gentoo-test"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-gion/Makefile b/x11-themes/gnome-icons-gion/Makefile
index 98ae7e7680f9..e3ee92461940 100644
--- a/x11-themes/gnome-icons-gion/Makefile
+++ b/x11-themes/gnome-icons-gion/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Gion Icons for Gnome
 
 USES=		tar:bzip2
-WRKSRC=		"${WRKDIR}/Gion"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile
index 8b2834d13431..9881f21593c0 100644
--- a/x11-themes/gnome-icons-iris/Makefile
+++ b/x11-themes/gnome-icons-iris/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Iris SVG Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=	tar:bzip2
-WRKSRC=		"${WRKDIR}/Iris"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-noia-full/Makefile b/x11-themes/gnome-icons-noia-full/Makefile
index 85c1d3822262..722d03a6b4a0 100644
--- a/x11-themes/gnome-icons-noia-full/Makefile
+++ b/x11-themes/gnome-icons-noia-full/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Noia Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=	tar:bzip2
-WRKSRC=		"${WRKDIR}/Noia"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile
index ab8d53c93c07..e5fe1f477c1d 100644
--- a/x11-themes/gnome-icons-noia-warm/Makefile
+++ b/x11-themes/gnome-icons-noia-warm/Makefile
@@ -18,7 +18,7 @@ COMMENT=	NoiaWarm Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=	tar:bzip2
-WRKSRC=		"${WRKDIR}/NoiaWarm"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile
index 100a4809967e..05e023eb8814 100644
--- a/x11-themes/gnome-icons-refined/Makefile
+++ b/x11-themes/gnome-icons-refined/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Refined Icons for Gnome
 
 RESTRICTED=	${REASON}
 
-WRKSRC=		"${WRKDIR}/gnome-rh8"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile
index 7a5778630bf7..e9b0ad34d1d6 100644
--- a/x11-themes/gnome-icons-slick/Makefile
+++ b/x11-themes/gnome-icons-slick/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Slick Icons for Gnome
 RESTRICTED=	${REASON}
 
 USES=	tar:bzip2
-WRKSRC=		"${WRKDIR}/Slick"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile
index 120a3ed0fadc..5af03a12a6bd 100644
--- a/x11-themes/gnome-icons-snow-apple/Makefile
+++ b/x11-themes/gnome-icons-snow-apple/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Snow-Apple Icons for Gnome
 
 RESTRICTED=	${REASON}
 
-WRKSRC=		"${WRKDIR}/Snow-Apple"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile
index b820c540d2a6..7ee9bf6a47ca 100644
--- a/x11-themes/gnome-icons-stylish/Makefile
+++ b/x11-themes/gnome-icons-stylish/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Stylish Icons for Gnome
 
 RESTRICTED=	${REASON}
 
-WRKSRC=		"${WRKDIR}/${PORTNAME}"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile
index ea0a4ac7df0c..b0e6694dfb17 100644
--- a/x11-themes/gnome-icons-ximian-south/Makefile
+++ b/x11-themes/gnome-icons-ximian-south/Makefile
@@ -16,8 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ximian-South Icons for Gnome
 
 RESTRICTED=	${REASON}
-
-WRKSRC=		"${WRKDIR}/${PORTNAME}"
+NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons/bsd.gnome-icons.mk b/x11-themes/gnome-icons/bsd.gnome-icons.mk
index e91c95823a96..2de5212c2c12 100644
--- a/x11-themes/gnome-icons/bsd.gnome-icons.mk
+++ b/x11-themes/gnome-icons/bsd.gnome-icons.mk
@@ -14,12 +14,4 @@ INSTALLS_ICONS=	yes
 do-install: icon-do-install
 
 icon-do-install:
-	cd ${WRKDIR} && ${FIND} * -type d ! -empty \
-		! -path 'stage*' \
-		-exec ${MKDIR} -m 0755 \
-		${STAGEDIR}${PREFIX}/share/icons/"{}" \;
-	cd ${WRKDIR} && ${FIND} * ! -type d ! -name 'plist' ! -name '*.bak' \
-		! -name '${LICENSE}' \
-		! -path 'stage/*' \
-		-exec ${INSTALL_DATA} ${WRKDIR}/"{}" \
-		${STAGEDIR}${PREFIX}/share/icons/"{}" \;
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/