upgrade to 1.2.9

Submitted by:	forth@zbwei.net

20 files changed, 45 insertions, 210 deletions

diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
index b802813a4a07..586abe59846d 100644
--- a/mail/dbmail-devel/Makefile
+++ b/mail/dbmail-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.8b
+PORTVERSION=	1.2.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
diff --git a/mail/dbmail-devel/distinfo b/mail/dbmail-devel/distinfo
index f9d80626b341..32fa40ea5272 100644
--- a/mail/dbmail-devel/distinfo
+++ b/mail/dbmail-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbmail-1.2.8b.tgz) = bbc7efd3bd85e5bb67b6e60a0fddfd50
-SIZE (dbmail-1.2.8b.tgz) = 245653
+MD5 (dbmail-1.2.9.tgz) = f97492c74e64ecabff77eb87f34a2ea5
+SIZE (dbmail-1.2.9.tgz) = 247577
diff --git a/mail/dbmail-devel/files/patch-configure b/mail/dbmail-devel/files/patch-configure
deleted file mode 100644
index a194e745cb1b..000000000000
--- a/mail/dbmail-devel/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Wed Oct 15 12:21:51 2003
-+++ configure	Wed Oct 15 12:23:53 2003
-@@ -1679,23 +1679,25 @@
- 
- mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \
--               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME"
-+               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME\
-+               $LOCALBASE/lib $PREFIX/lib $LOCALBASE/lib/mysql $PREFIX/lib/mysql "
- 
- mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \
-                   /usr/local/include /usr/freeware/include/mysql \
-                   /usr/freeware/include $HOME/include $HOME/mysql/include \
--                  $HOME"
-+                  $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql"
- 
- pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \
-                /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \
-                /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \
--               $HOME/postgresql/lib $HOME"
-+               $HOME/postgresql/lib $HOME $LOCALBASE/lib $PREFIX/lib"
- 
- pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \
-                   /usr/local/include /usr/freeware/include/pgsql \
-                   /usr/freeware/include $HOME/include $HOME/pgsql/include \
--		  /usr/local/pgsql/include /usr/include/postgresql $HOME"
-+		  /usr/local/pgsql/include /usr/include/postgresql $HOME\
-+                  $LOCALBASE/include/pgsql $PREFIX/include/pgsql"
- 
- 
- # Check whether --with-mysql or --without-mysql was given.
diff --git a/mail/dbmail-devel/pkg-plist b/mail/dbmail-devel/pkg-plist
index 881f384995e5..ad4d35b22245 100644
--- a/mail/dbmail-devel/pkg-plist
+++ b/mail/dbmail-devel/pkg-plist
@@ -1,12 +1,11 @@
-@comment $FreeBSD$
-bin/dbmail-smtp
-bin/dbmail-pop3d
+bin/dbmail-adduser
 bin/dbmail-imapd
 bin/dbmail-maintenance
-bin/dbmail-adduser
+bin/dbmail-mini-injector
+bin/dbmail-pop3d
 bin/dbmail-readvut
+bin/dbmail-smtp
 bin/raw-convertor
-bin/dbmail-mini-injector
 etc/dbmail.conf-dist
 %%MYSQL%%lib/libmysqldbmail.a
 %%PGSQL%%lib/libpgsqldbmail.a
@@ -29,10 +28,10 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
+%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
+%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index b802813a4a07..586abe59846d 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.8b
+PORTVERSION=	1.2.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index f9d80626b341..32fa40ea5272 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbmail-1.2.8b.tgz) = bbc7efd3bd85e5bb67b6e60a0fddfd50
-SIZE (dbmail-1.2.8b.tgz) = 245653
+MD5 (dbmail-1.2.9.tgz) = f97492c74e64ecabff77eb87f34a2ea5
+SIZE (dbmail-1.2.9.tgz) = 247577
diff --git a/mail/dbmail/files/patch-configure b/mail/dbmail/files/patch-configure
deleted file mode 100644
index a194e745cb1b..000000000000
--- a/mail/dbmail/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Wed Oct 15 12:21:51 2003
-+++ configure	Wed Oct 15 12:23:53 2003
-@@ -1679,23 +1679,25 @@
- 
- mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \
--               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME"
-+               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME\
-+               $LOCALBASE/lib $PREFIX/lib $LOCALBASE/lib/mysql $PREFIX/lib/mysql "
- 
- mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \
-                   /usr/local/include /usr/freeware/include/mysql \
-                   /usr/freeware/include $HOME/include $HOME/mysql/include \
--                  $HOME"
-+                  $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql"
- 
- pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \
-                /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \
-                /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \
--               $HOME/postgresql/lib $HOME"
-+               $HOME/postgresql/lib $HOME $LOCALBASE/lib $PREFIX/lib"
- 
- pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \
-                   /usr/local/include /usr/freeware/include/pgsql \
-                   /usr/freeware/include $HOME/include $HOME/pgsql/include \
--		  /usr/local/pgsql/include /usr/include/postgresql $HOME"
-+		  /usr/local/pgsql/include /usr/include/postgresql $HOME\
-+                  $LOCALBASE/include/pgsql $PREFIX/include/pgsql"
- 
- 
- # Check whether --with-mysql or --without-mysql was given.
diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist
index 881f384995e5..ad4d35b22245 100644
--- a/mail/dbmail/pkg-plist
+++ b/mail/dbmail/pkg-plist
@@ -1,12 +1,11 @@
-@comment $FreeBSD$
-bin/dbmail-smtp
-bin/dbmail-pop3d
+bin/dbmail-adduser
 bin/dbmail-imapd
 bin/dbmail-maintenance
-bin/dbmail-adduser
+bin/dbmail-mini-injector
+bin/dbmail-pop3d
 bin/dbmail-readvut
+bin/dbmail-smtp
 bin/raw-convertor
-bin/dbmail-mini-injector
 etc/dbmail.conf-dist
 %%MYSQL%%lib/libmysqldbmail.a
 %%PGSQL%%lib/libpgsqldbmail.a
@@ -29,10 +28,10 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
+%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
+%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
index b802813a4a07..586abe59846d 100644
--- a/mail/dbmail20/Makefile
+++ b/mail/dbmail20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.8b
+PORTVERSION=	1.2.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
diff --git a/mail/dbmail20/distinfo b/mail/dbmail20/distinfo
index f9d80626b341..32fa40ea5272 100644
--- a/mail/dbmail20/distinfo
+++ b/mail/dbmail20/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbmail-1.2.8b.tgz) = bbc7efd3bd85e5bb67b6e60a0fddfd50
-SIZE (dbmail-1.2.8b.tgz) = 245653
+MD5 (dbmail-1.2.9.tgz) = f97492c74e64ecabff77eb87f34a2ea5
+SIZE (dbmail-1.2.9.tgz) = 247577
diff --git a/mail/dbmail20/files/patch-configure b/mail/dbmail20/files/patch-configure
deleted file mode 100644
index a194e745cb1b..000000000000
--- a/mail/dbmail20/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Wed Oct 15 12:21:51 2003
-+++ configure	Wed Oct 15 12:23:53 2003
-@@ -1679,23 +1679,25 @@
- 
- mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \
--               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME"
-+               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME\
-+               $LOCALBASE/lib $PREFIX/lib $LOCALBASE/lib/mysql $PREFIX/lib/mysql "
- 
- mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \
-                   /usr/local/include /usr/freeware/include/mysql \
-                   /usr/freeware/include $HOME/include $HOME/mysql/include \
--                  $HOME"
-+                  $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql"
- 
- pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \
-                /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \
-                /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \
--               $HOME/postgresql/lib $HOME"
-+               $HOME/postgresql/lib $HOME $LOCALBASE/lib $PREFIX/lib"
- 
- pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \
-                   /usr/local/include /usr/freeware/include/pgsql \
-                   /usr/freeware/include $HOME/include $HOME/pgsql/include \
--		  /usr/local/pgsql/include /usr/include/postgresql $HOME"
-+		  /usr/local/pgsql/include /usr/include/postgresql $HOME\
-+                  $LOCALBASE/include/pgsql $PREFIX/include/pgsql"
- 
- 
- # Check whether --with-mysql or --without-mysql was given.
diff --git a/mail/dbmail20/pkg-plist b/mail/dbmail20/pkg-plist
index 881f384995e5..ad4d35b22245 100644
--- a/mail/dbmail20/pkg-plist
+++ b/mail/dbmail20/pkg-plist
@@ -1,12 +1,11 @@
-@comment $FreeBSD$
-bin/dbmail-smtp
-bin/dbmail-pop3d
+bin/dbmail-adduser
 bin/dbmail-imapd
 bin/dbmail-maintenance
-bin/dbmail-adduser
+bin/dbmail-mini-injector
+bin/dbmail-pop3d
 bin/dbmail-readvut
+bin/dbmail-smtp
 bin/raw-convertor
-bin/dbmail-mini-injector
 etc/dbmail.conf-dist
 %%MYSQL%%lib/libmysqldbmail.a
 %%PGSQL%%lib/libpgsqldbmail.a
@@ -29,10 +28,10 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
+%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
+%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index b802813a4a07..586abe59846d 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.8b
+PORTVERSION=	1.2.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
diff --git a/mail/dbmail21/distinfo b/mail/dbmail21/distinfo
index f9d80626b341..32fa40ea5272 100644
--- a/mail/dbmail21/distinfo
+++ b/mail/dbmail21/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbmail-1.2.8b.tgz) = bbc7efd3bd85e5bb67b6e60a0fddfd50
-SIZE (dbmail-1.2.8b.tgz) = 245653
+MD5 (dbmail-1.2.9.tgz) = f97492c74e64ecabff77eb87f34a2ea5
+SIZE (dbmail-1.2.9.tgz) = 247577
diff --git a/mail/dbmail21/files/patch-configure b/mail/dbmail21/files/patch-configure
deleted file mode 100644
index a194e745cb1b..000000000000
--- a/mail/dbmail21/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Wed Oct 15 12:21:51 2003
-+++ configure	Wed Oct 15 12:23:53 2003
-@@ -1679,23 +1679,25 @@
- 
- mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \
--               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME"
-+               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME\
-+               $LOCALBASE/lib $PREFIX/lib $LOCALBASE/lib/mysql $PREFIX/lib/mysql "
- 
- mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \
-                   /usr/local/include /usr/freeware/include/mysql \
-                   /usr/freeware/include $HOME/include $HOME/mysql/include \
--                  $HOME"
-+                  $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql"
- 
- pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \
-                /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \
-                /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \
--               $HOME/postgresql/lib $HOME"
-+               $HOME/postgresql/lib $HOME $LOCALBASE/lib $PREFIX/lib"
- 
- pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \
-                   /usr/local/include /usr/freeware/include/pgsql \
-                   /usr/freeware/include $HOME/include $HOME/pgsql/include \
--		  /usr/local/pgsql/include /usr/include/postgresql $HOME"
-+		  /usr/local/pgsql/include /usr/include/postgresql $HOME\
-+                  $LOCALBASE/include/pgsql $PREFIX/include/pgsql"
- 
- 
- # Check whether --with-mysql or --without-mysql was given.
diff --git a/mail/dbmail21/pkg-plist b/mail/dbmail21/pkg-plist
index 881f384995e5..ad4d35b22245 100644
--- a/mail/dbmail21/pkg-plist
+++ b/mail/dbmail21/pkg-plist
@@ -1,12 +1,11 @@
-@comment $FreeBSD$
-bin/dbmail-smtp
-bin/dbmail-pop3d
+bin/dbmail-adduser
 bin/dbmail-imapd
 bin/dbmail-maintenance
-bin/dbmail-adduser
+bin/dbmail-mini-injector
+bin/dbmail-pop3d
 bin/dbmail-readvut
+bin/dbmail-smtp
 bin/raw-convertor
-bin/dbmail-mini-injector
 etc/dbmail.conf-dist
 %%MYSQL%%lib/libmysqldbmail.a
 %%PGSQL%%lib/libpgsqldbmail.a
@@ -29,10 +28,10 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
+%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
+%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index b802813a4a07..586abe59846d 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2.8b
+PORTVERSION=	1.2.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo
index f9d80626b341..32fa40ea5272 100644
--- a/mail/dbmail22/distinfo
+++ b/mail/dbmail22/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbmail-1.2.8b.tgz) = bbc7efd3bd85e5bb67b6e60a0fddfd50
-SIZE (dbmail-1.2.8b.tgz) = 245653
+MD5 (dbmail-1.2.9.tgz) = f97492c74e64ecabff77eb87f34a2ea5
+SIZE (dbmail-1.2.9.tgz) = 247577
diff --git a/mail/dbmail22/files/patch-configure b/mail/dbmail22/files/patch-configure
deleted file mode 100644
index a194e745cb1b..000000000000
--- a/mail/dbmail22/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Wed Oct 15 12:21:51 2003
-+++ configure	Wed Oct 15 12:23:53 2003
-@@ -1679,23 +1679,25 @@
- 
- mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \
--               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME"
-+               /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME\
-+               $LOCALBASE/lib $PREFIX/lib $LOCALBASE/lib/mysql $PREFIX/lib/mysql "
- 
- mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \
-                   /usr/local/include /usr/freeware/include/mysql \
-                   /usr/freeware/include $HOME/include $HOME/mysql/include \
--                  $HOME"
-+                  $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql"
- 
- pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
-                /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \
-                /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \
-                /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \
--               $HOME/postgresql/lib $HOME"
-+               $HOME/postgresql/lib $HOME $LOCALBASE/lib $PREFIX/lib"
- 
- pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \
-                   /usr/local/include /usr/freeware/include/pgsql \
-                   /usr/freeware/include $HOME/include $HOME/pgsql/include \
--		  /usr/local/pgsql/include /usr/include/postgresql $HOME"
-+		  /usr/local/pgsql/include /usr/include/postgresql $HOME\
-+                  $LOCALBASE/include/pgsql $PREFIX/include/pgsql"
- 
- 
- # Check whether --with-mysql or --without-mysql was given.
diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist
index 881f384995e5..ad4d35b22245 100644
--- a/mail/dbmail22/pkg-plist
+++ b/mail/dbmail22/pkg-plist
@@ -1,12 +1,11 @@
-@comment $FreeBSD$
-bin/dbmail-smtp
-bin/dbmail-pop3d
+bin/dbmail-adduser
 bin/dbmail-imapd
 bin/dbmail-maintenance
-bin/dbmail-adduser
+bin/dbmail-mini-injector
+bin/dbmail-pop3d
 bin/dbmail-readvut
+bin/dbmail-smtp
 bin/raw-convertor
-bin/dbmail-mini-injector
 etc/dbmail.conf-dist
 %%MYSQL%%lib/libmysqldbmail.a
 %%PGSQL%%lib/libpgsqldbmail.a
@@ -29,10 +28,10 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql
 %%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
-%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql
 %%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql
+%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
+%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%