4 files changed, 49 insertions, 39 deletions

diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 6dc95df75797..e1ca7b58c8b6 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/tgz/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -19,23 +19,26 @@ USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	YES
+USE_OPENSSL=	YES
 
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql-client
 DATABASE=		postgresql
 PLIST_SUB+=		PGSQL=""
 PLIST_SUB+=		MYSQL="@comment "
+LDFLAGS+=		-L${LOCALBASE}/lib/
 .else
 USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-mysql
 DATABASE=		mysql
 PLIST_SUB+=		MYSQL=""
 PLIST_SUB+=		PGSQL="@comment "
+CFLAGS+=		-I${LOCALBASE}/include/mysql
+LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
-CFLAGS+=		-I${LOCALBASE}/include/mysql
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib/ -L${LOCALBASE}/lib/${DATABASE}"
+CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 FILES_TO_PATCH=		imapd.c main.c maintenance.c pop3d.c user.c
 DOCS=			INSTALL README
 
diff --git a/mail/dbmail21/distinfo b/mail/dbmail21/distinfo
index 231e69a12a41..29cf30e9fecd 100644
--- a/mail/dbmail21/distinfo
+++ b/mail/dbmail21/distinfo
@@ -1 +1 @@
-MD5 (dbmail-1.1.tgz) = e6d7be3eff38b69ab82ae6d47e3c83e2
+MD5 (dbmail-1.2.tgz) = c12f64a94acbe362a3bcd5fc563d091d
diff --git a/mail/dbmail21/files/patch-configure b/mail/dbmail21/files/patch-configure
index 87954b042761..d3cd1aaa9429 100644
--- a/mail/dbmail21/files/patch-configure
+++ b/mail/dbmail21/files/patch-configure
@@ -1,12 +1,14 @@
---- configure.orig	Mon Oct  6 18:12:06 2003
-+++ configure	Mon Oct  6 18:13:28 2003
-@@ -842,19 +842,22 @@
- 
+--- configure.orig	Mon Mar 17 17:04:08 2003
++++ configure	Mon Oct 13 17:06:33 2003
+@@ -846,23 +846,26 @@
  
  mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
--               /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME"
-+               /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME \
-+               $LOCALBASE/lib $PREFIX/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 \
@@ -14,15 +16,17 @@
 +                  $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql"
  
  pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
--               /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME"
-+               /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME \
-+	       $LOCALBASE/lib $PREFIX/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 $HOME"
-+		  /usr/local/pgsql/include $HOME \
+-		  /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 c8cd99e48129..88c7b286d496 100644
--- a/mail/dbmail21/pkg-plist
+++ b/mail/dbmail21/pkg-plist
@@ -10,28 +10,31 @@ bin/install-dbmail.sh
 etc/dbmail.conf-dist
 %%MYSQL%%lib/libmysqldbmail.a
 %%PGSQL%%lib/libpgsqldbmail.a
-%%MYSQL%%share/dbmail/sql/add-lastlogin.mysql
-%%MYSQL%%share/dbmail/sql/add_auto_notification.mysql
-%%MYSQL%%share/dbmail/sql/add_auto_reply.mysql
-%%MYSQL%%share/dbmail/sql/add_rfcsize.mysql
-%%MYSQL%%share/dbmail/sql/create_tables.mysql
-%%MYSQL%%share/dbmail/sql/create_tables_innoDB.mysql
-%%MYSQL%%share/dbmail/sql/newnames.mysql
-%%MYSQL%%share/dbmail/sql/pop_before_smtp.mysql
-%%MYSQL%%share/dbmail/sql/update_encryption.mysql
-%%MYSQL%%share/dbmail/sql/update_mailbox_subscribed_folders.mysql
-%%MYSQL%%share/dbmail/sql/update_mysql_tmptables.mysql
-%%MYSQL%%share/dbmail/sql/update_ownerid_aliases.mysql
-%%PGSQL%%share/dbmail/sql/add-constraints.pgsql
-%%PGSQL%%share/dbmail/sql/add-lastlogin.postgresql
-%%PGSQL%%share/dbmail/sql/add_auto_notification.pgsql
-%%PGSQL%%share/dbmail/sql/add_auto_reply.pgsql
-%%PGSQL%%share/dbmail/sql/add_rfcsize.postgresql
-%%PGSQL%%share/dbmail/sql/create_tables.pgsql
-%%PGSQL%%share/dbmail/sql/no-constraint-tables.pgsql
-%%PGSQL%%share/dbmail/sql/update_encryption.pgsql
+%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql
+%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql
+%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql
+%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql
+%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql
+%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql
+%%MYSQL%%%%DATADIR%%/sql/newnames.mysql
+%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql
+%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql
+%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql
+%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
+%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
+%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
+%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
+%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
+%%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/pop_before_smtp.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm share/dbmail/sql
-@dirrm share/dbmail
+@dirrm %%DATADIR%%/sql
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%