8 files changed, 12 insertions, 25 deletions

diff --git a/audio/squeezeboxserver-dynamicplaylist/Makefile b/audio/squeezeboxserver-dynamicplaylist/Makefile
index 0a5ac3432fb4..e2397429736f 100644
--- a/audio/squeezeboxserver-dynamicplaylist/Makefile
+++ b/audio/squeezeboxserver-dynamicplaylist/Makefile
@@ -17,15 +17,15 @@ RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip:infozip
-NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 SLIMDIR?=	squeezeboxserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:
-	${MKDIR} ${PREFIX}/${SLIMDIR}/Plugins/DynamicPlayList
-	${CP} -R ${WRKSRC}/DynamicPlayList/* ${PREFIX}/${SLIMDIR}/Plugins/DynamicPlayList
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/DynamicPlayList
+	${CP} -R ${WRKSRC}/DynamicPlayList/* ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/DynamicPlayList
 
 .include <bsd.port.mk>
diff --git a/audio/squeezeboxserver-dynamicplaylist/pkg-plist b/audio/squeezeboxserver-dynamicplaylist/pkg-plist
index 84bd7e1c776c..81fbd3be95af 100644
--- a/audio/squeezeboxserver-dynamicplaylist/pkg-plist
+++ b/audio/squeezeboxserver-dynamicplaylist/pkg-plist
@@ -79,5 +79,3 @@
 @dirrm %%SLIMDIR%%/Plugins/DynamicPlayList/HTML/Default
 @dirrm %%SLIMDIR%%/Plugins/DynamicPlayList/HTML
 @dirrm %%SLIMDIR%%/Plugins/DynamicPlayList
-@dirrmtry %%SLIMDIR%%/Plugins
-@dirrmtry %%SLIMDIR%%
diff --git a/audio/squeezeboxserver-lazysearch/Makefile b/audio/squeezeboxserver-lazysearch/Makefile
index 6e0e5e8ebfdd..3edb393349d9 100644
--- a/audio/squeezeboxserver-lazysearch/Makefile
+++ b/audio/squeezeboxserver-lazysearch/Makefile
@@ -16,15 +16,15 @@ COMMENT=	Squeezebox Server plugin for performing lazy searches
 RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
 USES=		zip
-NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 SLIMDIR?=	squeezeboxserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:
-	${MKDIR} ${PREFIX}/${SLIMDIR}/Plugins/LazySearch2
-	${CP} -R ${WRKSRC}/LazySearch2/* ${PREFIX}/${SLIMDIR}/Plugins/LazySearch2
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/LazySearch2
+	${CP} -R ${WRKSRC}/LazySearch2/* ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/LazySearch2
 
 .include <bsd.port.mk>
diff --git a/audio/squeezeboxserver-lazysearch/pkg-plist b/audio/squeezeboxserver-lazysearch/pkg-plist
index f0e2fb76564b..66c507a2df49 100644
--- a/audio/squeezeboxserver-lazysearch/pkg-plist
+++ b/audio/squeezeboxserver-lazysearch/pkg-plist
@@ -12,5 +12,3 @@
 @dirrm %%SLIMDIR%%/Plugins/LazySearch2/HTML/EN
 @dirrm %%SLIMDIR%%/Plugins/LazySearch2/HTML
 @dirrm %%SLIMDIR%%/Plugins/LazySearch2
-@dirrmtry %%SLIMDIR%%/Plugins
-@dirrmtry %%SLIMDIR%%
diff --git a/audio/squeezeboxserver-sqlplaylist/Makefile b/audio/squeezeboxserver-sqlplaylist/Makefile
index 35613ef8d4c0..57827c6e828e 100644
--- a/audio/squeezeboxserver-sqlplaylist/Makefile
+++ b/audio/squeezeboxserver-sqlplaylist/Makefile
@@ -18,15 +18,15 @@ RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver \
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip:infozip
-NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 SLIMDIR?=	squeezeboxserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:
-	${MKDIR} ${PREFIX}/${SLIMDIR}/Plugins/SQLPlayList
-	${CP} -R ${WRKSRC}/SQLPlayList/* ${PREFIX}/${SLIMDIR}/Plugins/SQLPlayList
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/SQLPlayList
+	${CP} -R ${WRKSRC}/SQLPlayList/* ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/SQLPlayList
 
 .include <bsd.port.mk>
diff --git a/audio/squeezeboxserver-sqlplaylist/pkg-plist b/audio/squeezeboxserver-sqlplaylist/pkg-plist
index dc5ebf2bb38e..95be4280d0ef 100644
--- a/audio/squeezeboxserver-sqlplaylist/pkg-plist
+++ b/audio/squeezeboxserver-sqlplaylist/pkg-plist
@@ -178,5 +178,3 @@
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/HTML
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList
-@dirrmtry %%SLIMDIR%%/Plugins
-@dirrmtry %%SLIMDIR%%
diff --git a/audio/squeezeboxserver-trackstat/Makefile b/audio/squeezeboxserver-trackstat/Makefile
index dcef32799b58..96fb075a0e81 100644
--- a/audio/squeezeboxserver-trackstat/Makefile
+++ b/audio/squeezeboxserver-trackstat/Makefile
@@ -17,15 +17,15 @@ RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip:infozip
-NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 SLIMDIR?=	squeezeboxserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:
-	${MKDIR} ${PREFIX}/${SLIMDIR}/Plugins/TrackStat
-	${CP} -R ${WRKSRC}/TrackStat/* ${PREFIX}/${SLIMDIR}/Plugins/TrackStat
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/TrackStat
+	${CP} -R ${WRKSRC}/TrackStat/* ${STAGEDIR}${PREFIX}/${SLIMDIR}/Plugins/TrackStat
 
 .include <bsd.port.mk>
diff --git a/audio/squeezeboxserver-trackstat/pkg-plist b/audio/squeezeboxserver-trackstat/pkg-plist
index d3289e9f07f1..1e3f78cf1027 100644
--- a/audio/squeezeboxserver-trackstat/pkg-plist
+++ b/audio/squeezeboxserver-trackstat/pkg-plist
@@ -203,7 +203,6 @@
 %%SLIMDIR%%/Plugins/TrackStat/lib/Time/Stopwatch.pm
 %%SLIMDIR%%/Plugins/TrackStat/strings.txt
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/lib/Time
-@dirrm %%SLIMDIR%%/Plugins/TrackStat/lib/Plugins
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/lib
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/iTunes
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/iPengConfiguration
@@ -225,10 +224,6 @@
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/iPeng/plugins/TrackStat
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/iPeng/plugins
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/iPeng
-@dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770/plugins/TrackStat/html/images
-@dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770/plugins/TrackStat/html
-@dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770/plugins/TrackStat
-@dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770/plugins
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770/html/images
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770/html
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/HTML/Nokia770
@@ -267,5 +262,3 @@
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/Backup
 @dirrm %%SLIMDIR%%/Plugins/TrackStat/Amarok
 @dirrm %%SLIMDIR%%/Plugins/TrackStat
-@dirrmtry %%SLIMDIR%%/Plugins
-@dirrmtry %%SLIMDIR%%