6 files changed, 18 insertions, 8 deletions

diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index ba7456fdd876..d1997e0d85d9 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -22,5 +22,4 @@ RPMVERSION=	66.fc10
 USE_LDCONFIG=	yes
 PLIST=		${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile
index 458581afd098..882edc5194aa 100644
--- a/x11-toolkits/linux-f10-openmotif/Makefile
+++ b/x11-toolkits/linux-f10-openmotif/Makefile
@@ -23,7 +23,6 @@ USE_LDCONFIG=	yes
 SRC_DISTFILES=
 DISTINFO_FILE=	${MASTERDIR}/distinfo.i386
 
-NO_STAGE=	yes
 post-extract:
 		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \
 			${WRKSRC}/usr/share ${WRKSRC}/usr/lib/X11
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 19a5e2fc773f..a946d9fa2113 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SRC_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
 PKGNAMEPREFIX=	linux-f10-
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	The pango library (Linux Fedora 10)
+COMMENT=	Pango library (Linux Fedora 10)
 
 CONFLICTS=	linux-pango-[0-9]* linux-f8-pango-[0-9]*
 
@@ -26,8 +26,7 @@ USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-NO_STAGE=	yes
 post-install:
-	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i686-pc-linux-gnu/pango.modules
+	@${STAGEDIR}${PREFIX}/usr/bin/pango-querymodules-32 > ${STAGEDIR}${PREFIX}/etc/pango/i686-pc-linux-gnu/pango.modules
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-qt45/Makefile b/x11-toolkits/linux-f10-qt45/Makefile
index 8f5f5a199f29..5bb5766acd38 100644
--- a/x11-toolkits/linux-f10-qt45/Makefile
+++ b/x11-toolkits/linux-f10-qt45/Makefile
@@ -19,5 +19,4 @@ RPMVERSION=	9.fc10
 USE_LDCONFIG=	yes
 PLIST=		${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-qt45/pkg-plist.i386 b/x11-toolkits/linux-f10-qt45/pkg-plist.i386
index 615edf60f9fc..44e9b2c8360b 100644
--- a/x11-toolkits/linux-f10-qt45/pkg-plist.i386
+++ b/x11-toolkits/linux-f10-qt45/pkg-plist.i386
@@ -8,6 +8,22 @@ usr/lib/libQtSql.so.4.5.3
 usr/lib/libQtTest.so.4.5.3
 usr/lib/libQtXml.so.4.5.3
 usr/lib/libQtXmlPatterns.so.4.5.3
+usr/lib/libQtCore.so.4.5
+usr/lib/libQtDBus.so.4.5
+usr/lib/libQtNetwork.so.4.5
+usr/lib/libQtScript.so.4.5
+usr/lib/libQtSql.so.4.5
+usr/lib/libQtTest.so.4.5
+usr/lib/libQtXml.so.4.5
+usr/lib/libQtXmlPatterns.so.4.5
+usr/lib/libQtCore.so.4
+usr/lib/libQtDBus.so.4
+usr/lib/libQtNetwork.so.4
+usr/lib/libQtScript.so.4
+usr/lib/libQtSql.so.4
+usr/lib/libQtTest.so.4
+usr/lib/libQtXml.so.4
+usr/lib/libQtXmlPatterns.so.4
 usr/lib/qt4/bin/qdbus
 usr/lib/qt4/phrasebooks/danish.qph
 usr/lib/qt4/phrasebooks/dutch.qph
diff --git a/x11-toolkits/linux-f10-tk85/Makefile b/x11-toolkits/linux-f10-tk85/Makefile
index c1a2b6bdbeb0..85676b228909 100644
--- a/x11-toolkits/linux-f10-tk85/Makefile
+++ b/x11-toolkits/linux-f10-tk85/Makefile
@@ -22,8 +22,6 @@ RPMVERSION=	5.fc10
 BRANELF_FILES=	usr/bin/wish8.5
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 
-NO_STAGE=	yes
 .include <bsd.port.mk>