Enable multibyte support by default, and add knobs to disable it or set the

default encoding.

Still the "default" default encoding is singlebyte, so this shouldn't hurt
anything but a little code increase.

Approved by:	andreas (the maintainer)

14 files changed, 532 insertions, 56 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch:
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 0d4f2a236977..2c799c1b647f 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -41,6 +41,23 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 CONFIGURE_TCL=	--with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
 .endif
 
+# if you want to disable the multibyte support, type:
+#   make -DWITHOUT_MULTIBYTE
+#
+# if you want to set the default encoding for the multibyte support, type:
+#   make DEFAULT_ENCODING=<encoding>
+# where <encoding> is one of these:
+#   SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5
+#   EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8
+#   UNICODE     MULE_INTERNAL           WIN         ALT
+.if defined(WITHOUT_MULTIBYTE)
+CONFIGURE_MULTIBYTE=	# none
+.elif defined(DEFAULT_ENCODING)
+CONFIGURE_MULTIBYTE=	--enable-multibyte="${DEFAULT_ENCODING}"
+.else
+CONFIGURE_MULTIBYTE=	--enable-multibyte
+.endif
+
 # if you want jdbc, type make -DWITH_JDBC
 # Honors JAVA_HOME if you have it set, and don't want the dependency.
 .if defined(WITH_JDBC)
@@ -60,6 +77,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/pgsql \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
 		${CONFIGURE_TCL} \
+		${CONFIGURE_MULTIBYTE} \
 		--with-libraries=${PREFIX}/lib
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
@@ -88,18 +106,34 @@ MANPREFIX=	${PREFIX}/pgsql
 
 pre-fetch:
 	@${ECHO_MSG} "To install and run postgresql you need to compile kernel with:"
-	@${ECHO_MSG} "        options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
+	@${ECHO_MSG} "    options    \"SYSVSHM, SYSVSEM, SYSVMSG\""
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
 	@${ECHO_MSG} "    make -DWITH_TCL"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
+.if !defined(WITHOUT_MULTIBYTE)
+	@${ECHO_MSG} "To disable multibyte support, type:"
+	@${ECHO_MSG} "    make -DWITHOUT_MULTIBYTE"
+.if !defined(DEFAULT_ENCODING)
+	@${ECHO_MSG} "To set the default encoding for the multibyte support, type:"
+	@${ECHO_MSG} "    make DEFAULT_ENCODING=<encoding>"
+	@${ECHO_MSG} "where <encoding> is one of these:"
+	@${ECHO_MSG} "    SQL_ASCII   LATIN1      LATIN2      LATIN3      LATIN4      LATIN5"
+	@${ECHO_MSG} "    EUC_JP      EUC_CN      EUC_KR      EUC_TW      KOI8"
+	@${ECHO_MSG} "    UNICODE     MULE_INTERNAL           WIN         ALT"
+.else
+	@${ECHO_MSG} "The default encoding is '${DEFAULT_ENCODING}'."
+.endif
+.else
+	@${ECHO_MSG} "Building PostgreSQL without multibyte support."
+.endif
 .if !defined(WITH_JDBC)
-	@ ${ECHO_MSG} "To build Java (JDBC) support, type:"
-	@ ${ECHO_MSG} "   make -DWITH_JDBC"
+	@${ECHO_MSG} "To build Java (JDBC) support, type:"
+	@${ECHO_MSG} "    make -DWITH_JDBC"
 .else
-	@ ${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
+	@${ECHO_MSG} "Building PostgreSQL with \"postgresql.jar\"."
 .endif
 
 post-patch: