diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 6b5f40751623..fb583e8bee85 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -1,52 +1,54 @@
 # ex:ts=8
 # New ports collection makefile for:	libdbi
 # Date created:			Nov 4, 2001
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libdbi
 PORTVERSION=	0.6.7
+PORTREVISION=	1
 CATEGORIES=	databases devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://linux.ucla.edu/~dap24/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	seanc@FreeBSD.org
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--with-mysql \
 			--with-mysql-incdir=${LOCALBASE}/include \
 			--with-mysql-libdir=${LOCALBASE}/lib/mysql
 PLIST_SUB+=	MYSQL=""
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
-LIB_DEPENDS+=	pq:${PORTSDIR}/databases/postgresql7
+POSTGRESQL_PORT?=	databases/postgresql7
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=	PGSQL=""
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf \
 		${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/driver-guide
 	${INSTALL_DATA} ${WRKSRC}/doc/driver-guide/*.html \
 		${DOCSDIR}/driver-guide
 	@${MKDIR} ${DOCSDIR}/programmers-guide
 	${INSTALL_DATA} ${WRKSRC}/doc/programmers-guide/*.html \
 		${DOCSDIR}/programmers-guide
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index de2d944be166..e11317c87e4c 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -1,65 +1,67 @@
 # New ports collection makefile for:    apache mod_auth_pgsql
 # Date created:		2000/11/10
 # Whom:			Mikhail Teterin <mi@aldan.algebra.com>
 #
 # $FreeBSD$
 
 PORTNAME=	mod_auth_pgsql
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	seanc@FreeBSD.org
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT}
-LIB_DEPENDS=	pq.3:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 
 .include <bsd.port.pre.mk>
 
 APXS?=		${LOCALBASE}/sbin/apxs
 AP_PORT?=	apache13
 APACHE_PORT?=	${PORTSDIR}/www/${AP_PORT}
+POSTGRESQL_PORT?=	databases/postgresql7
 
 .if exists(${APXS})
 APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || echo no
 .endif
 .if exists(${APXS}) && ${APXS_WORKS} != no
 AP_TARGET!=	${APXS} -q TARGET
 AP_SYSCONF!=	${APXS} -q SYSCONFDIR
 AP_INCLUDE!=	${APXS} -q INCLUDEDIR
 AP_LIBEXEC!=	${APXS} -q LIBEXECDIR
 CFLAGS:=	`${APXS} -q CFLAGS` ${CFLAGS}
 .else
 AP_TARGET?=	httpd
 AP_SYSCONF?=	${PREFIX}/etc/apache
 AP_INCLUDE?=	${PREFIX}/include/apache
 AP_LIBEXEC?=	${PREFIX}/libexec/apache
 .endif
 
 AUTH_PGSQL_DOCS=	apache/manual/mod/mod_auth_pgsql
 
 PLIST_SUB+=	AUTH_PGSQL_DOCS="${AUTH_PGSQL_DOCS}"
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pgsql=${PREFIX} \
 		--with-apxs=${APXS}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}/
 	${TR} -d \\015 < ${WRKSRC}/mod_auth_pgsql.html \
 		> ${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}/index.html
 	${CHMOD} ${SHAREMODE} \
 		${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}/index.html
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} \
 		${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}/index.html
 	${LN} -sf ${AUTH_PGSQL_DOCS} ${PREFIX}/share/doc/
 .endif
 	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>