7 files changed, 23 insertions, 54 deletions

diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile
index 004e81b63960..79e7cc35dfee 100644
--- a/mail/opensmtpd-devel/Makefile
+++ b/mail/opensmtpd-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	201307121003
+PORTVERSION=	201307221453
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
diff --git a/mail/opensmtpd-devel/distinfo b/mail/opensmtpd-devel/distinfo
index 50a394fd610c..e734b2393d7f 100644
--- a/mail/opensmtpd-devel/distinfo
+++ b/mail/opensmtpd-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-201307121003p1.tar.gz) = 8f9ee9fb3949af2639cda3b77cc884acd8154c501035b40fe93b7cc1f49d0dcb
-SIZE (opensmtpd-201307121003p1.tar.gz) = 763766
+SHA256 (opensmtpd-201307221453p1.tar.gz) = 430fcafa880c34a26a1a17da15490fb8fbae8501f5e2dc127a71db46b4fec8e3
+SIZE (opensmtpd-201307221453p1.tar.gz) = 776221
diff --git a/mail/opensmtpd-devel/files/patch-smtpd_backends_table__mysql.c b/mail/opensmtpd-devel/files/patch-smtpd_backends_table__mysql.c
deleted file mode 100644
index 58c253dbbe7f..000000000000
--- a/mail/opensmtpd-devel/files/patch-smtpd_backends_table__mysql.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- smtpd/backends/table_mysql.c.orig
-+++ smtpd/backends/table_mysql.c
-@@ -22,6 +22,7 @@
- 
- #include <ctype.h>
- #include <fcntl.h>
-+#include <getopt.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/mail/opensmtpd-devel/files/patch-smtpd_backends_table__postgres.c b/mail/opensmtpd-devel/files/patch-smtpd_backends_table__postgres.c
deleted file mode 100644
index 83802263c28e..000000000000
--- a/mail/opensmtpd-devel/files/patch-smtpd_backends_table__postgres.c
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- smtpd/backends/table_postgres.c.orig
-+++ smtpd/backends/table_postgres.c
-@@ -22,12 +22,13 @@
- 
- #include <ctype.h>
- #include <fcntl.h>
-+#include <getopt.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
- 
--#include <postgresql/libpq-fe.h>
-+#include <libpq-fe.h>
- 
- #include "smtpd-defines.h"
- #include "smtpd-api.h"
diff --git a/mail/opensmtpd-devel/files/patch-smtpd_backends_table__sqlite.c b/mail/opensmtpd-devel/files/patch-smtpd_backends_table__sqlite.c
deleted file mode 100644
index 24a2ec4c3c62..000000000000
--- a/mail/opensmtpd-devel/files/patch-smtpd_backends_table__sqlite.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- smtpd/backends/table_sqlite.c.orig
-+++ smtpd/backends/table_sqlite.c
-@@ -22,6 +22,7 @@
- 
- #include <ctype.h>
- #include <fcntl.h>
-+#include <getopt.h>
- #include <sqlite3.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/mail/opensmtpd-devel/files/patch-smtpd_table__postgres.c b/mail/opensmtpd-devel/files/patch-smtpd_table__postgres.c
new file mode 100644
index 000000000000..1ec16cd2690f
--- /dev/null
+++ b/mail/opensmtpd-devel/files/patch-smtpd_table__postgres.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- smtpd/table_postgres.c.orig
++++ smtpd/table_postgres.c
+@@ -28,7 +28,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+ 
+ #include "smtpd-defines.h"
+ #include "smtpd-api.h"
diff --git a/mail/opensmtpd-devel/pkg-plist b/mail/opensmtpd-devel/pkg-plist
index a764b2ccbd59..83c5d09fafc6 100644
--- a/mail/opensmtpd-devel/pkg-plist
+++ b/mail/opensmtpd-devel/pkg-plist
@@ -6,11 +6,12 @@ libexec/opensmtpd/makemap
 libexec/opensmtpd/backend-queue-null
 libexec/opensmtpd/backend-queue-ram
 libexec/opensmtpd/backend-queue-stub
-libexec/opensmtpd/backend-table-stub
-%%MYSQL%%libexec/opensmtpd/backend-table-mysql
-%%SQLITE%%libexec/opensmtpd/backend-table-sqlite
-%%LDAP%%libexec/opensmtpd/backend-table-ldap
-%%PGSQL%%libexec/opensmtpd/backend-table-postgres
+libexec/opensmtpd/table-stub
+libexec/opensmtpd/table-passwd
+%%MYSQL%%libexec/opensmtpd/table-mysql
+%%SQLITE%%libexec/opensmtpd/table-sqlite
+%%LDAP%%libexec/opensmtpd/table-ldap
+%%PGSQL%%libexec/opensmtpd/table-postgres
 libexec/opensmtpd/backend-scheduler-ram
 libexec/opensmtpd/backend-scheduler-stub
 libexec/opensmtpd/filter-dnsbl