- Update to 1.5.4

PR:		ports/125145
Submitted by:	Bartlomiej Syryjczyk <bartlomiej.syryjczyk@expro.pl>
Approved by:	Boris Kovalenko <boris@tagnet.ru> (maintainer)

5 files changed, 25 insertions, 21 deletions

diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index c5be070aa588..74b4e632a82f 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tpop3d
-PORTVERSION=	1.5.3
-PORTREVISION=	6
+PORTVERSION=	1.5.4
 CATEGORIES=	mail
-MASTER_SITES=	http://www.ex-parrot.com/~chris/tpop3d/
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	tpop3d
 
 MAINTAINER=	boris@tagnet.ru
 COMMENT=	Virtual-domain capable POP3 server supporting MySQL, PgSQL etc auth
@@ -28,6 +28,7 @@ OPTIONS=	MYSQL		"Use MySQL authentication"			off \
 		PERLAUTH	"Use Perl authentication"			off \
 		PASSWDAUTH	"Use /etc/passwd authentication"		off \
 		FLATAUTH	"Use /etc/passwd-style flat file authentication"	off \
+		GDBMAUTH        "Use authentication against GNU dbm files"      off \
 		MAILDIR		"Compile Maildir support"			on \
 		MBOXINDICES	"Save Mbox indices"				off \
 		DRAC		"Enable DRAC RFC for POP-before-SMTP relaying"	off \
@@ -69,6 +70,11 @@ CONFIGURE_ARGS+=	--enable-auth-perl
 CONFIGURE_ARGS+=	--enable-auth-flatfile
 .endif
 
+.if defined(WITH_GDBMAUTH)
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
+CONFIGURE_ARGS+=	--enable-auth-gdbm
+.endif
+
 .if defined(WITH_PASSWDAUTH)
 CONFIGURE_ARGS+=	--enable-auth-passwd
 .endif
diff --git a/mail/tpop3d/distinfo b/mail/tpop3d/distinfo
index da9ccbafd3d9..080d8b139a52 100644
--- a/mail/tpop3d/distinfo
+++ b/mail/tpop3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (tpop3d-1.5.3.tar.gz) = dd920c49f4e5879eb3caf7ea047622e9
-SHA256 (tpop3d-1.5.3.tar.gz) = 48625d1cd65de3ff76eaca7f6bca08984bb84d3823ecfc3e4531db1a5a932bd8
-SIZE (tpop3d-1.5.3.tar.gz) = 242294
+MD5 (tpop3d-1.5.4.tar.gz) = 2d96aad121fa5e3ab4c3c1fec0d64ab0
+SHA256 (tpop3d-1.5.4.tar.gz) = 5ce3650b6f48565d671f4fe8a62e6915d03dc2971bc5e5b2620d8a48e96f3482
+SIZE (tpop3d-1.5.4.tar.gz) = 283888
diff --git a/mail/tpop3d/files/patch-Makefile.in b/mail/tpop3d/files/patch-Makefile.in
new file mode 100644
index 000000000000..e55822e22ed1
--- /dev/null
+++ b/mail/tpop3d/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2008-04-02 10:23:24.000000000 -0800
++++ Makefile.in	2008-07-02 17:06:10.000000000 -0800
+@@ -133,8 +133,7 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@ -Wall -g -O2 -DCONFIG_DIR='"@sysconfdir@"' # \
+-	-Wstrict-prototypes
++CFLAGS = @CFLAGS@ -Wall -g -O2 -DCONFIG_DIR='"@sysconfdir@"'
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
diff --git a/mail/tpop3d/files/patch-maildir.c b/mail/tpop3d/files/patch-maildir.c
deleted file mode 100644
index ef52a6d143e2..000000000000
--- a/mail/tpop3d/files/patch-maildir.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- maildir.c.orig	Tue Nov 25 01:23:20 2003
-+++ maildir.c	Sun Apr  3 09:44:25 2005
-@@ -205,7 +205,7 @@
-     mailbox M, failM = NULL;
-     struct timeval tv1, tv2;
-     float f;
--    int locked;
-+    int locked = 0;
-  
-     alloc_struct(_mailbox, M);
-     
diff --git a/mail/tpop3d/pkg-descr b/mail/tpop3d/pkg-descr
index 226e9ea7d9a6..a9dbeec3be56 100644
--- a/mail/tpop3d/pkg-descr
+++ b/mail/tpop3d/pkg-descr
@@ -3,7 +3,4 @@ a server which is fast, extensible, and secure. tpop3d supports
 traditional (BSD-format) mailspools and Maildir. It also supports
 MySQL, perl, and external authentication methods.
 
-WWW: http://www.ex-parrot.com/~chris/tpop3d/
-
-- Chris Elsworth
-chris@shagged.org
+WWW: http://savannah.nongnu.org/projects/tpop3d/