14 files changed, 7 insertions, 23 deletions

diff --git a/x11-themes/kde-icons-black-and-white/Makefile b/x11-themes/kde-icons-black-and-white/Makefile
index 04394c3db4eb..a61f7dcb1e32 100644
--- a/x11-themes/kde-icons-black-and-white/Makefile
+++ b/x11-themes/kde-icons-black-and-white/Makefile
@@ -10,5 +10,4 @@ COMMENT=	KDE Black And White iconset
 
 WRKSRC=		${WRKDIR}/"black and white"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-cezanne/Makefile b/x11-themes/kde-icons-cezanne/Makefile
index 94d3b9ac21d3..2dda143db258 100644
--- a/x11-themes/kde-icons-cezanne/Makefile
+++ b/x11-themes/kde-icons-cezanne/Makefile
@@ -8,12 +8,11 @@ DISTNAME=	Cezanne_packaged
 
 COMMENT=	KDE Cezanne iconset
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 WRKSRC=		${WRKDIR}/Cezanne
 PORT_SHAREDIR?=	"${PORTNAME}-${PORTVERSION}"
 
 PLIST_FILE_PATTERN_EXTRA=	-v "buildset"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-dark-glass/Makefile b/x11-themes/kde-icons-dark-glass/Makefile
index 0c6ab6800247..9fee39a94aba 100644
--- a/x11-themes/kde-icons-dark-glass/Makefile
+++ b/x11-themes/kde-icons-dark-glass/Makefile
@@ -10,5 +10,4 @@ COMMENT=	KDE Dark Glass iconset
 
 PLIST_FILE_PATTERN_EXTRA=	-v "^\./(buildset|README)"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-gartoon-blue-svg/Makefile b/x11-themes/kde-icons-gartoon-blue-svg/Makefile
index 81705f837eb1..8f9661e53a3e 100644
--- a/x11-themes/kde-icons-gartoon-blue-svg/Makefile
+++ b/x11-themes/kde-icons-gartoon-blue-svg/Makefile
@@ -11,10 +11,9 @@ DISTNAME=	ICONS-Gartoon.Blue-SVG-v${PORTVERSION}
 
 COMMENT=	KDE Gartoon Blue SVG iconset
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 WRKSRC=		${WRKDIR}/Gartoon.Blue
 PORT_SHAREDIR?=	"${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-gartoon-svg/Makefile b/x11-themes/kde-icons-gartoon-svg/Makefile
index 28984a4b5fb4..b5caead12231 100644
--- a/x11-themes/kde-icons-gartoon-svg/Makefile
+++ b/x11-themes/kde-icons-gartoon-svg/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ICONS-Gartoon-SVG-v${PORTVERSION}
 
 COMMENT=	KDE Gartoon SVG iconset
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 WRKSRC=		${WRKDIR}/Gartoon
 PORT_SHAREDIR?=	"${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}"
@@ -19,5 +19,4 @@ PORT_SHAREDIR?=	"${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}"
 PLIST_DIR_PATTERN_EXTRA=	-v "extra/work"
 PLIST_FILE_PATTERN_EXTRA=	-v "extra/work"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-graphite-rade8/Makefile b/x11-themes/kde-icons-graphite-rade8/Makefile
index 2130797421dd..7974c4a61927 100644
--- a/x11-themes/kde-icons-graphite-rade8/Makefile
+++ b/x11-themes/kde-icons-graphite-rade8/Makefile
@@ -8,8 +8,7 @@ DISTNAME=	Graphite-Rade8-${PORTVERSION}
 
 COMMENT=	KDE Mac OS X like iconset, most from rad-e8 design
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/${DISTNAME:C|-${PORTVERSION}$||}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-icosx/Makefile b/x11-themes/kde-icons-icosx/Makefile
index ca7566d78ad8..b45d0d4a2fef 100644
--- a/x11-themes/kde-icons-icosx/Makefile
+++ b/x11-themes/kde-icons-icosx/Makefile
@@ -11,5 +11,4 @@ COMMENT=	KDE IcOsX iconset
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORT_SHAREDIR?=	"${PORTNAME}-${PORTVERSION}"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-kool-gorilla/Makefile b/x11-themes/kde-icons-kool-gorilla/Makefile
index f84dcf501219..06364a989629 100644
--- a/x11-themes/kde-icons-kool-gorilla/Makefile
+++ b/x11-themes/kde-icons-kool-gorilla/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	Korilla_Icons-v${PORTVERSION}
 
 COMMENT=	KDE Kool Gorilla iconset
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 WRKSRC=		"${WRKDIR}/Kool.Gorilla"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-lush/Makefile b/x11-themes/kde-icons-lush/Makefile
index 093bfb8b34ef..f145173ce37a 100644
--- a/x11-themes/kde-icons-lush/Makefile
+++ b/x11-themes/kde-icons-lush/Makefile
@@ -11,5 +11,4 @@ COMMENT=	KDE Lush complete iconset
 
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-noia/Makefile b/x11-themes/kde-icons-noia/Makefile
index 45eda1d0659f..e20e44ee0cb7 100644
--- a/x11-themes/kde-icons-noia/Makefile
+++ b/x11-themes/kde-icons-noia/Makefile
@@ -13,5 +13,4 @@ COMMENT=	KDE Noia complete iconset
 WRKSRC=		"${WRKDIR}/noia_kde_${PORTVERSION:C/\.//}"
 PORT_SHAREDIR=	${PORTNAME}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.icons"
diff --git a/x11-themes/kde-icons-noia/Makefile.icons b/x11-themes/kde-icons-noia/Makefile.icons
index b55f72804422..0e63a529c5fe 100644
--- a/x11-themes/kde-icons-noia/Makefile.icons
+++ b/x11-themes/kde-icons-noia/Makefile.icons
@@ -64,12 +64,12 @@ generate-install-scripts:
 # annotate dirs
 	@${CAT} ${WRKDIR}/dirs.list \
 		| ${SED} -E \
-			-e 's|^\.(.+)$$|${MKDIR} -m 755 ${PREFIX:Q}/share/icons/${PORT_SHAREDIR:S/"//g:Q}/\"\1\"|' \
+			-e 's|^\.(.+)$$|${MKDIR} -m 755 ${STAGEDIR}${PREFIX:Q}/share/icons/${PORT_SHAREDIR:S/"//g:Q}/\"\1\"|' \
 			> ${WRKDIR}/dirs.sh
 # annotate files
 	@${CAT} ${WRKDIR}/files.list \
 		| ${SED} -E \
-			-e 's|^\./(.+)$$|${INSTALL_DATA} ${WRKSRC:Q}/\"\1\" ${PREFIX:Q}/share/icons/${PORT_SHAREDIR:S/"//g:Q}/\"\1\"|' \
+			-e 's|^\./(.+)$$|${INSTALL_DATA} ${WRKSRC:Q}/\"\1\" ${STAGEDIR}${PREFIX:Q}/share/icons/${PORT_SHAREDIR:S/"//g:Q}/\"\1\"|' \
 			> ${WRKDIR}/files.sh
 
 # generate on the fly packaging lists based on aforementioned annotations
@@ -97,9 +97,6 @@ install-run-scripts:
 
 do-install: annotate-install generate-install-scripts generate-tmpplist install-run-scripts
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc" && ${PORTNAME} == "crystal-project"
diff --git a/x11-themes/kde-icons-nuvola/Makefile b/x11-themes/kde-icons-nuvola/Makefile
index b29a58f79853..a89a49371274 100644
--- a/x11-themes/kde-icons-nuvola/Makefile
+++ b/x11-themes/kde-icons-nuvola/Makefile
@@ -13,5 +13,4 @@ COMMENT=	KDE Nuvola iconset, SVG evolution of SKY
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORT_SHAREDIR?=	"${PORTNAME}-${PORTVERSION}"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-sky/Makefile b/x11-themes/kde-icons-sky/Makefile
index 480bd28052e8..40221de43590 100644
--- a/x11-themes/kde-icons-sky/Makefile
+++ b/x11-themes/kde-icons-sky/Makefile
@@ -11,5 +11,4 @@ COMMENT=	KDE SKY iconset
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-umicons/Makefile b/x11-themes/kde-icons-umicons/Makefile
index 07d43edb5deb..53b9f638dcde 100644
--- a/x11-themes/kde-icons-umicons/Makefile
+++ b/x11-themes/kde-icons-umicons/Makefile
@@ -12,5 +12,4 @@ COMMENT=	KDE Umicons iconset
 WRKSRC=		${WRKDIR}/Umicons_${PORTVERSION}
 PORT_SHAREDIR?=	"${PORTNAME}-${PORTVERSION}"
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"