8 files changed, 10 insertions, 18 deletions

diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index f6bd4a7f64cc..911cbc9df26f 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -20,7 +20,7 @@ DB=		ibase
 
 USE_FIREBIRD=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	moc sql
+QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
 
 #USE_BZIP2=	yes
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index bf47e4f102ba..7f503ca202db 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Qt MySQL database plugin
 DB=		mysql
 
 USE_QT_VER=	4
-QT_COMPONENTS=	moc sql
+QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
 
 USE_MYSQL=	yes
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 477a9ced62d7..b802deb94f46 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -21,7 +21,7 @@ DB=		odbc
 LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 
 USE_QT_VER=	4
-QT_COMPONENTS=	moc sql
+QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
 
 #USE_BZIP2=	yes
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index da73df1ec065..b076f0e88ba5 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Qt PostgreSQL database plugin
 DB=		psql
 
 USE_QT_VER=	4
-QT_COMPONENTS=	moc sql
+QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
 
 USE_PGSQL=	yes
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index e410c73b442a..bc98f436c464 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQL library
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc corelib
+QT_COMPONENTS=	qmake_build moc_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -45,15 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../
 
-.include <bsd.port.pre.mk>
-
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-debug" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-debug
-.endif
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-static" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-static
-.endif
-
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -65,10 +56,10 @@ pre-configure:
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		-e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+		-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
 		${WRKSRC}/../../lib/pkgconfig/*Qt*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index 14c2bdc1da3c..8c219e9760dc 100644
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@@ -75,5 +75,6 @@ lib/libQtSql.so
 lib/libQtSql.so.4
 lib/libQtSql.so.4.3
 lib/libQtSql.so.4.3.0
+%%DEBUG%%lib/libQtSql.so.4.3.0.debug
 libdata/pkgconfig/QtSql.pc
 @dirrm include/QtSql
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 30f74fbb76ba..b01286f87c75 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -21,7 +21,7 @@ DB=		sqlite2
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
 
 USE_QT_VER=	4
-QT_COMPONENTS=  moc sql
+QT_COMPONENTS=  moc_build sql
 QT_NONSTANDARD=	yes
 
 #USE_BZIP2=	yes
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index 7ead82825396..ee53635c6e77 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -21,7 +21,7 @@ DB=		sqlite
 LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 
 USE_QT_VER=	4
-QT_COMPONENTS=	moc sql
+QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
 
 #USE_BZIP2=	yes