12 files changed, 5 insertions, 17 deletions

diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index 16f6c4133954..66ce363f15bb 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -16,7 +16,6 @@ CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 LINUX_DIST_VER=	10
 RPMVERSION=	2.fc10
 BRANDELF_FILES=	usr/bin/aserver
diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile
index f5adba0c7dc8..42667f0ca85e 100644
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -15,7 +15,6 @@ CONFLICTS=		linux-arts-[0-9]* linux-f8-arts-[0-9]*
 
 ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX_RPM=		yes
-NO_STAGE=	yes
 LINUX_DIST_VER=		10
 RPMVERSION=		1.fc10
 BRANDELF_DIRS=		usr/bin
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 0da04b66cf40..57e16cc1d288 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -14,7 +14,6 @@ COMMENT=	RPM of esound (Linux Fedora 10)
 CONFLICTS=	linux-esound-[0-9]* linux-f8-esound-[0-9]*
 
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 USE_LINUX_APPS=	libaudiofile
 LINUX_NAME=	${PORTNAME}-libs
 LINUX_DIST_VER=	10
diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile
index 564f03c64efd..4940c66d2aaa 100644
--- a/audio/linux-f10-freealut/Makefile
+++ b/audio/linux-f10-freealut/Makefile
@@ -9,12 +9,11 @@ PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	A free implementation of OpenAL's ALUT standard (Linux Fedora 10)
+COMMENT=	Free implementation of OpenAL's ALUT standard (Linux Fedora 10)
 
 CONFLICTS=	linux-freealut-[0-9]* linux-f8-freealut-[0-9]*
 
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 USE_LINUX_APPS=	openal
 LINUX_DIST_VER=	10
 RPMVERSION=	6.fc9
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index dd7966b13489..e58ef22da3df 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -9,12 +9,11 @@ PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	An implementation of the Audio File Library from SGI (Linux Fedora 10)
+COMMENT=	Implementation of the Audio File Library from SGI (Linux Fedora 10)
 
 CONTFLICTS=	linux-libaudiofile-[0-9]* linux-f8-libaudiofile-[0-9]*
 
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 LINUX_NAME=	audiofile
 LINUX_DIST_VER=	10
 RPMVERSION=	9.fc10
diff --git a/audio/linux-f10-libogg/Makefile b/audio/linux-f10-libogg/Makefile
index 01a805a76580..2093d28ce531 100644
--- a/audio/linux-f10-libogg/Makefile
+++ b/audio/linux-f10-libogg/Makefile
@@ -15,7 +15,6 @@ CONFLICTS=	linux-libogg-[0-9]* linux-f8-libogg-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 LINUX_DIST_VER=	10
 RPMVERSION=	9.fc9
 USE_LDCONFIG=	yes
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index a78b74628b6d..4ae5df3cda1e 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -15,7 +15,6 @@ CONFLICTS=	linux-libvorbis-[0-9]* linux-f8-libvorbis-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 USE_LINUX_APPS=	libogg
 LINUX_DIST_VER=	10
 RPMVERSION=	5.fc10
diff --git a/audio/linux-f10-mikmod/Makefile b/audio/linux-f10-mikmod/Makefile
index 63db8d63744b..2403a4748705 100644
--- a/audio/linux-f10-mikmod/Makefile
+++ b/audio/linux-f10-mikmod/Makefile
@@ -15,7 +15,6 @@ CONFLICTS=	linux-mikmod-[0-9]* linux-f8-mikmod-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 LINUX_DIST_VER=	10
 RPMVERSION=	3.beta2.fc9
 LINUX_NAME=	lib${PORTNAME}
diff --git a/audio/linux-f10-nas-libs/Makefile b/audio/linux-f10-nas-libs/Makefile
index 6c5530fe0708..eef0daa9bbfd 100644
--- a/audio/linux-f10-nas-libs/Makefile
+++ b/audio/linux-f10-nas-libs/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Runtime libraries for NAS (Linux Fedora 10)
 
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 USE_LINUX_APPS=	xorglibs
 LINUX_DIST_VER=	10
 RPMVERSION=	4.fc9
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 3850af4645ff..5d5b423393da 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -9,13 +9,12 @@ PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	A 3D positional spatialized sound library (Linux Fedora 10)
+COMMENT=	3D positional spatialized sound library (Linux Fedora 10)
 
 CONFLICTS=	linux-openal-[0-9]* linux-f8-openal-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
 LINUX_DIST_VER=	10
 RPMVERSION=	0.15.20060204cvs.fc9
diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile
index 045f9c2292e0..c86824ac60de 100644
--- a/audio/linux-f10-pulseaudio-libs/Makefile
+++ b/audio/linux-f10-pulseaudio-libs/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Libraries for PulseAudio clients
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 LINUX_DIST_VER=	10
 RPMVERSION=	4.fc10
 SRC_DISTFILES=	${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
@@ -29,7 +28,7 @@ post-patch:
 
 post-install:
 	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
-		${CP} -p ${PREFIX}/${CONF_FILE}-dist ${PREFIX}/${CONF_FILE} ; \
+		${CP} -p ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE} ; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/audio/linux-f10-sdl_mixer/Makefile b/audio/linux-f10-sdl_mixer/Makefile
index 1d331bc5b38c..8f4ff9e012d3 100644
--- a/audio/linux-f10-sdl_mixer/Makefile
+++ b/audio/linux-f10-sdl_mixer/Makefile
@@ -10,13 +10,12 @@ PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	A sample multi-channel audio mixer library (Linux Fedora 10)
+COMMENT=	Sample multi-channel audio mixer library (Linux Fedora 10)
 
 CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-NO_STAGE=	yes
 USE_LINUX_APPS=	sdl12 mikmod
 LINUX_NAME=	SDL_mixer
 LINUX_DIST_VER=	10