Renamed qt[34]-psql to qt[34]-pgsql

7 files changed, 3 insertions, 68 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 385a356f82f..7a24d5cd05d 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.438 2006/06/12 02:16:40 joerg Exp $
+# $NetBSD: Makefile,v 1.439 2006/06/14 15:53:43 adam Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -213,13 +213,13 @@ SUBDIR+=	qt3
 SUBDIR+=	qt3-docs
 SUBDIR+=	qt3-libs
 SUBDIR+=	qt3-mysql
-SUBDIR+=	qt3-psql
+SUBDIR+=	qt3-pgsql
 SUBDIR+=	qt3-qscintilla
 SUBDIR+=	qt3-tools
 SUBDIR+=	qt4
 SUBDIR+=	qt4-docs
 SUBDIR+=	qt4-libs
-SUBDIR+=	qt4-psql
+SUBDIR+=	qt4-pgsql
 SUBDIR+=	qt4-tools
 SUBDIR+=	qtarch
 SUBDIR+=	qwspritefield
diff --git a/x11/qt3-psql/DESCR b/x11/qt3-psql/DESCR
deleted file mode 100644
index bd34b63b2ae..00000000000
--- a/x11/qt3-psql/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-QT postgresql driver
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
deleted file mode 100644
index 6a55c9987ae..00000000000
--- a/x11/qt3-psql/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2006/04/17 13:47:00 wiz Exp $
-
-.include "../../x11/qt3-libs/Makefile.common"
-
-PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		1
-COMMENT=		QT postgresql driver
-
-CONFIGURE_ARGS+=	-I${QTDIR}/include \
-			-I${PGSQL_PREFIX}/include/postgresql/server \
-			-L${QTDIR}/lib
-
-BUILD_QT3=		yes
-
-do-build:
-	(cd ${WRKSRC}/plugins/src/sqldrivers/psql; \
-		${SETENV} ${MAKE_ENV} ${GMAKE})
-
-SQLDRVDIR=	${QTPREFIX}/plugins/sqldrivers
-
-do-install:
-	${INSTALL_DATA_DIR} ${SQLDRVDIR}
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
-		${SQLDRVDIR}
-
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../mk/pgsql.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt3-psql/PLIST b/x11/qt3-psql/PLIST
deleted file mode 100644
index 6548335348e..00000000000
--- a/x11/qt3-psql/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:10:07 jlam Exp $
-qt3/plugins/sqldrivers/libqsqlpsql.la
-@unexec ${RMDIR} %D/qt3/plugins/sqldrivers 2>/dev/null || ${TRUE}
diff --git a/x11/qt4-psql/DESCR b/x11/qt4-psql/DESCR
deleted file mode 100644
index bd34b63b2ae..00000000000
--- a/x11/qt4-psql/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-QT postgresql driver
diff --git a/x11/qt4-psql/Makefile b/x11/qt4-psql/Makefile
deleted file mode 100644
index c7a175bea52..00000000000
--- a/x11/qt4-psql/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/31 19:22:13 adam Exp $
-
-.include "../../x11/qt4-libs/Makefile.common"
-
-PKGNAME=	qt4-psql-${QTVERSION}
-COMMENT=	QT postgresql driver
-
-CONFIGURE_ARGS+=	-I${QTDIR}/include
-CONFIGURE_ARGS+=	-I${PGSQL_PREFIX}/include/postgresql/server
-CONFIGURE_ARGS+=	-L${QTDIR}/lib
-
-BUILD_QT4=		yes
-
-do-build:
-	cd ${WRKSRC}/src/tools/moc && ${SETENV} ${MAKE_ENV} ${GMAKE}
-	cd ${WRKSRC}/src/plugins/sqldrivers/psql && \
-		${SETENV} ${MAKE_ENV} ${GMAKE}
-
-SQLDRVDIR=	${QTPREFIX}/plugins/sqldrivers
-
-do-install:
-	${INSTALL_DATA_DIR} ${SQLDRVDIR}
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
-		${SQLDRVDIR}
-
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../mk/pgsql.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-psql/PLIST b/x11/qt4-psql/PLIST
deleted file mode 100644
index 2f800a19eb5..00000000000
--- a/x11/qt4-psql/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/31 19:22:13 adam Exp $
-qt4/plugins/sqldrivers/libqsqlpsql.la
-@unexec ${RMDIR} %D/qt4/plugins/sqldrivers 2>/dev/null || ${TRUE}