pl/Perl and ODBC support

Submitted by:	Nadav Eiron <nadav@cs.technion.ac.il>

28 files changed, 462 insertions, 0 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql-devel-server/pkg-plist.odbc b/databases/postgresql-devel-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql-devel-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql-devel/pkg-plist.odbc b/databases/postgresql-devel/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql-devel/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql7/pkg-plist.odbc b/databases/postgresql7/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql7/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql73-server/pkg-plist.odbc b/databases/postgresql73-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql73-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql73/pkg-plist.odbc b/databases/postgresql73/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql73/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql74-server/pkg-plist.odbc b/databases/postgresql74-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql74-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql80-server/pkg-plist.odbc b/databases/postgresql80-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql80-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql81-server/pkg-plist.odbc b/databases/postgresql81-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql81-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql82-server/pkg-plist.odbc b/databases/postgresql82-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql82-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql83-server/pkg-plist.odbc b/databases/postgresql83-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql83-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql84-server/pkg-plist.odbc b/databases/postgresql84-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql84-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql90-server/pkg-plist.odbc b/databases/postgresql90-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql90-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql91-server/pkg-plist.odbc b/databases/postgresql91-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql91-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 08452acf5910..e81f47392378 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -55,6 +55,12 @@ CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
 .else
 CONFIGURE_MULTIBYTE=	--enable-multibyte
 .endif
+.if defined(WITH_PERL)
+CONFIGURE_PERL=		--with-perl
+.endif
+.if defined(WITH_ODBC)
+CONFIGURE_ODBC=		--with-odbc
+.endif
 
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
@@ -76,6 +82,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
 		${CONFIGURE_MULTIBYTE} \
+		${CONFIGURE_PERL} \
+		${CONFIGURE_ODBC} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -133,6 +141,18 @@ pre-fetch:
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
+.if !defined(WITH_PERL)
+	@${ECHO_MSG} "To build Perl interface and pl/Perl interpreter:"
+	@${ECHO_MSG} "    make -DWITH_PERL"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with \"pl/Perl\"."
+.endif
+.if !defined(WITH_ODBC)
+	@${ECHO_MSG} "To build the ODBC driver package:"
+	@${ECHO_MSG} "    make -DWITH_ODBC"
+.else
+	@${ECHO_MSG} "Building PostgreSQL with ODBC Drivers."
+.endif
 
 post-patch:
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
@@ -211,6 +231,11 @@ post-install:
 	@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
 	@${RM} ${TMPPLIST}.notcl
 .endif
+.if defined(WITH_ODBC)
+	@${CP} ${TMPPLIST} ${TMPPLIST}.noodbc
+	@${CAT} ${PKGDIR}/PLIST.odbc ${TMPPLIST}.noodbc > ${TMPPLIST}
+	@${RM} ${TMPPLIST}.noodbc
+.endif
 .if defined(WITH_JDBC)
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
 	@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
diff --git a/databases/postgresql92-server/pkg-plist.odbc b/databases/postgresql92-server/pkg-plist.odbc
new file mode 100644
index 000000000000..c849e26dbc88
--- /dev/null
+++ b/databases/postgresql92-server/pkg-plist.odbc
@@ -0,0 +1,8 @@
+pgsql/include/iodbc/iodbc.h
+pgsql/include/iodbc/isql.h
+pgsql/include/iodbc/isqlext.h
+pgsql/lib/libpsqlodbc.a
+pgsql/lib/libpsqlodbc.so
+pgsql/lib/libpsqlodbc.so.0
+pgsql/odbcinst.ini
+@dirrm pgsql/include/iodbc