Convert to USES=pgsql

With hat:	portmgr

7 files changed, 13 insertions, 23 deletions

diff --git a/benchmarks/super-smack/Makefile b/benchmarks/super-smack/Makefile
index 7669dc9..53ee03b 100644
--- a/benchmarks/super-smack/Makefile
+++ b/benchmarks/super-smack/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--with-mysql \
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 CONFIGURE_ARGS+=--with-pgsql \
 		--with-pgsql-include=${LOCALBASE}/include \
 		--with-pgsql-lib=${LOCALBASE}/lib
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 6c2eb92..70bfaea 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -26,14 +26,12 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
-		pkgconfig shared-mime-info
+		pgsql pkgconfig shared-mime-info tar:bzip2
 USE_GNOME=	gnomedocutils gnomeprefix pygnomeextras
 USE_LDCONFIG=	yes
-USE_PGSQL=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -41,8 +39,8 @@ CONFIGURE_ARGS=	--with-postgres-utils=${LOCALBASE}/bin
 INSTALLS_ICONS=	yes
 
 # Note: USE_PGSQL has already been set above.
-BUILD_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-RUN_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+BUILD_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
+RUN_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libglom-1.12.so.0.0.0
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index e189566..8d58eed 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -29,6 +29,9 @@ MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 CPPFLAGS+=	-I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
 
+PGSQL_USES=	pgsql
+PGSQL_CONFIGURE_WITH=	postgresql
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAVAHI}
@@ -45,12 +48,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-.else
-CONFIGURE_ARGS+=	--without-postgresql
-.endif
-
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
 .else
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index f4c1d9b..d02b965 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
 LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
-USES=	pkgconfig gettext iconv
-USE_BZIP2=	yes
+USES=	pkgconfig gettext iconv tar:bzip2
 USE_PYTHON=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
@@ -65,7 +64,7 @@ PLIST_SUB+=	DBASE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGRESQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 CONFIGURE_ARGS+=	--with-postgres-incdir=${LOCALBASE}/include/ \
 			--with-postgres-libdir=${LOCALBASE}/lib
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
diff --git a/databases/jasperserver/Makefile b/databases/jasperserver/Makefile
index e05f124..4d3d249 100644
--- a/databases/jasperserver/Makefile
+++ b/databases/jasperserver/Makefile
@@ -68,7 +68,6 @@ PLIST_SUB=	DATABASE=${DATABASE} \
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHEADLESS}
@@ -91,9 +90,8 @@ PLIST_SUB+=	JDBC="mysql-connector-java.jar"
 
 #use version 90, application is certified w/ pg90
 .if ${PORT_OPTIONS:MPGSQL}
-WANT_PGSQL_VER=	90+
 JDBC=	postgresql-9.2-1002.jdbc4.jar
-USE_PGSQL=	yes
+USES+=	pgsql:90+
 DBUSER?=	pgsql
 DBPASS?=	pgsql
 DATABASE=	postgresql
@@ -148,13 +146,11 @@ post-patch:
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 	@${REINPLACE_CMD} -e 's|--DROP|-- DROP|' ${SQLSRC}/mysql/quartz.ddl
-
-post-patch-script:
 	@${ECHO_MSG} -n ">> Removing unneeded patched files..."
 	@${FIND} ${WRKDIR} -type f \( -name '*.orig' \) -delete
 	@${ECHO_MSG} " [ DONE ]"
 
-pre-build: extract patch
+pre-build:
 	@${MKDIR} ${JSREPO}/org/codehaus/mojo/cobertura-maven-plugin/2.5-Jaspersoft
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/cobertura-* ${JSREPO}/org/codehaus/mojo/cobertura-maven-plugin/2.5-Jaspersoft
 
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 0970c1c..b25116b 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 .if ${LIBGDA4_SLAVE}=="postgresql"
-USE_PGSQL=		yes
+USES+=			pgsql
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-postgres
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 5b9a02d..bdde71d 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 .if ${LIBGDA5_SLAVE}==postgresql
-USE_PGSQL=		yes
+USES+=			pgsql
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-postgres