11 files changed, 79 insertions, 81 deletions

diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile
index 2c22ad5893aa..b0c966491eef 100644
--- a/mail/masqmail/Makefile
+++ b/mail/masqmail/Makefile
@@ -6,27 +6,40 @@
 #
 
 PORTNAME=	masqmail
-PORTVERSION=	0.1.17
+PORTVERSION=	0.2.20
 CATEGORIES=	mail
 MASTER_SITES=	http://innominate.org/kurth/masqmail/download/
-DISTNAME=	MasqMail-${PORTVERSION}
 
 MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Mail server for hosts, not permanently connected to the internet
 
-CONFLICTS=	masqmail-0.2*
-
 MAN5=		masqmail.aliases.5 masqmail.conf.5 masqmail.get.5 masqmail.route.5
-MAN8=		masqmail.8
+MAN8=		masqmail.8 mservdetect.8
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-trigraphs
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \
-		--with-conffile=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
+		--with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+.if defined(WITH_LIBCRYPTO)
+CONFIGURE_ARGS+=	--with-libcrypto
+.endif
 .if defined(WITHOUT_POP3)
 CONFIGURE_ARGS+=	--disable-pop3
 .endif
+.if defined(WITHOUT_SMTP)
+CONFIGURE_ARGS+=	--disable-smtp-server
+.endif
+.if defined(WITHOUT_RESOLVER)
+CONFIGURE_ARGS+=	--disable-resolver
+.endif
+.if defined(WITH_MAILDIR)
+CONFIGURE_ARGS+=	--enable-maildir
+.endif
+.if defined(WITH_MSERVER)
+CONFIGURE_ARGS+=	--enable-mserver
+.endif
 .if defined(WITH_AUTH)
 CONFIGURE_ARGS+=	--enable-auth
 .endif
@@ -36,6 +49,7 @@ CONFIGURE_ARGS+=	--enable-ident
 
 USE_GNOME=	glib12
 USE_RC_SUBR=	yes
+NO_LATEST_LINK=	yes
 
 post-build:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
@@ -52,7 +66,7 @@ post-install:
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in  AUTHORS COPYING INSTALL NEWS README THOUGHTS TODO docs/install.html
+.for i in  AUTHORS COPYING INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/masqmail/distinfo b/mail/masqmail/distinfo
index d44e6de9b33d..c8b22e7aaca6 100644
--- a/mail/masqmail/distinfo
+++ b/mail/masqmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (MasqMail-0.1.17.tar.gz) = d62975ed5c20d4cebe7ad9e20f439e15
-SIZE (MasqMail-0.1.17.tar.gz) = 175425
+MD5 (masqmail-0.2.20.tar.gz) = 74540980ecde45783e888d1da80cb318
+SIZE (masqmail-0.2.20.tar.gz) = 243171
diff --git a/mail/masqmail/files/patch-Makefile.in b/mail/masqmail/files/patch-Makefile.in
index 10fadd751a6b..696faa3794d4 100644
--- a/mail/masqmail/files/patch-Makefile.in
+++ b/mail/masqmail/files/patch-Makefile.in
@@ -1,18 +1,17 @@
---- Makefile.in.old	Sun Apr  4 19:10:04 2004
-+++ Makefile.in	Sun Apr  4 19:10:29 2004
-@@ -375,13 +375,13 @@
+--- Makefile.in.old	Sun Apr  4 23:36:26 2004
++++ Makefile.in	Sun Apr  4 23:38:38 2004
+@@ -377,9 +377,12 @@
+ $(DESTDIR)@datadir@/tpl: conf_dir
+ 	install -d $(DESTDIR)@datadir@/masqmail/tpl
+ 	install -m 644 tpl/failmsg.tpl $(DESTDIR)@datadir@/masqmail/tpl
+-	install -m 644 tpl/failmsg.tpl.{de,fr,it} $(DESTDIR)@datadir@/masqmail/tpl
++	install -m 644 tpl/failmsg.tpl.de $(DESTDIR)@datadir@/masqmail/tpl
++	install -m 644 tpl/failmsg.tpl.fr $(DESTDIR)@datadir@/masqmail/tpl
++	install -m 644 tpl/failmsg.tpl.it $(DESTDIR)@datadir@/masqmail/tpl
+ 	install -m 644 tpl/warnmsg.tpl $(DESTDIR)@datadir@/masqmail/tpl
+-	install -m 644 tpl/warnmsg.tpl.{de,fr} $(DESTDIR)@datadir@/masqmail/tpl
++	install -m 644 tpl/warnmsg.tpl.de $(DESTDIR)@datadir@/masqmail/tpl
++	install -m 644 tpl/warnmsg.tpl.fr $(DESTDIR)@datadir@/masqmail/tpl
  
- $(DESTDIR)@with_logdir@:
- 	mkdir -p $(DESTDIR)@with_logdir@
--	chown @with_user@.@with_group@ $(DESTDIR)@with_logdir@
-+	chown @with_user@:@with_group@ $(DESTDIR)@with_logdir@
+ log_dir: $(DESTDIR)@with_logdir@
  
- $(DESTDIR)@with_spooldir@:
- 	mkdir -p $(DESTDIR)@with_spooldir@
- 	mkdir -p $(DESTDIR)@with_spooldir@/input
- 	mkdir -p $(DESTDIR)@with_spooldir@/popuidl
--	chown -R @with_user@.@with_group@ $(DESTDIR)@with_spooldir@
-+	chown -R @with_user@:@with_group@ $(DESTDIR)@with_spooldir@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/mail/masqmail/files/patch-local.c b/mail/masqmail/files/patch-local.c
new file mode 100644
index 000000000000..d5adb0eef198
--- /dev/null
+++ b/mail/masqmail/files/patch-local.c
@@ -0,0 +1,10 @@
+--- src/local.c.orig	Mon May 19 22:44:46 2003
++++ src/local.c	Wed Aug  4 04:15:10 2004
+@@ -19,6 +19,7 @@
+ #include "masqmail.h"
+ #include "peopen.h"
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ 
+ static
+ void message_stream(FILE *out, message *msg, GList *hdr_list, guint flags)
diff --git a/mail/masqmail/files/patch-log.c b/mail/masqmail/files/patch-log.c
new file mode 100644
index 000000000000..9e4f859f85de
--- /dev/null
+++ b/mail/masqmail/files/patch-log.c
@@ -0,0 +1,10 @@
+--- src/log.c.old	Wed Aug  4 04:16:48 2004
++++ src/log.c	Wed Aug  4 04:17:12 2004
+@@ -16,6 +16,7 @@
+     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
++#include <sys/stat.h>
+ #include "masqmail.h"
+ 
+ #include "sysexits.h"
diff --git a/mail/masqmail/files/patch-masqmail.c b/mail/masqmail/files/patch-masqmail.c
deleted file mode 100644
index 8e6e1945bca2..000000000000
--- a/mail/masqmail/files/patch-masqmail.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/masqmail.c.old	Mon Apr  5 01:18:16 2004
-+++ src/masqmail.c	Mon Apr  5 01:23:09 2004
-@@ -167,7 +167,7 @@
- 
-   DEBUG(5) debugf("accepting smtp message on stdin\n");
- 
--  if(getpeername(0, &saddr, &dummy) == 0){
-+  if(getpeername(0, (struct sockaddr *)(&saddr), &dummy) == 0){
-     peername = g_strdup(inet_ntoa(saddr.sin_addr));
- #ifdef ENABLE_IDENT
-     {
diff --git a/mail/masqmail/files/patch-mserver.c b/mail/masqmail/files/patch-mserver.c
deleted file mode 100644
index f6cf0fefe119..000000000000
--- a/mail/masqmail/files/patch-mserver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mserver.c.old	Mon Mar 19 17:45:28 2001
-+++ src/mserver.c	Mon Apr  5 01:27:29 2004
-@@ -56,7 +56,7 @@
-   if(init_sockaddr(&saddr, conf.mserver_iface)){
-     int sock = socket(PF_INET, SOCK_STREAM, 0);
-     int dup_sock;
--    if(connect(sock, &saddr, sizeof(saddr)) == 0){
-+    if(connect(sock, (struct sockaddr *)(&saddr), sizeof(saddr)) == 0){
-       FILE *in, *out;
-       char buf[256];
- 
diff --git a/mail/masqmail/files/patch-peopen.c b/mail/masqmail/files/patch-peopen.c
new file mode 100644
index 000000000000..fd2c94c202d7
--- /dev/null
+++ b/mail/masqmail/files/patch-peopen.c
@@ -0,0 +1,10 @@
+--- src/peopen.c.old	Wed Aug  4 03:51:30 2004
++++ src/peopen.c	Wed Aug  4 03:52:43 2004
+@@ -6,6 +6,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <stdlib.h>
+ 
+ #include "peopen.h"
+ #include "sysexits.h"
diff --git a/mail/masqmail/files/patch-pop3_in.c b/mail/masqmail/files/patch-pop3_in.c
deleted file mode 100644
index a633dc2e3199..000000000000
--- a/mail/masqmail/files/patch-pop3_in.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pop3_in.c.old	Mon Apr  5 01:13:51 2004
-+++ src/pop3_in.c	Mon Apr  5 01:15:27 2004
-@@ -372,7 +372,7 @@
-     DEBUG(5){
-       struct sockaddr_in name;
-       int len;
--      getsockname(sock, &name, &len);
-+      getsockname(sock, (struct sockaddr *)(&name), &len);
-       debugf("socket: name.sin_addr = %s\n", inet_ntoa(name.sin_addr));
-     }
-     return popb;
diff --git a/mail/masqmail/files/patch-smtp_out.c b/mail/masqmail/files/patch-smtp_out.c
deleted file mode 100644
index 1320e928138c..000000000000
--- a/mail/masqmail/files/patch-smtp_out.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/smtp_out.c.old	Mon Apr  5 01:07:18 2004
-+++ src/smtp_out.c	Mon Apr  5 01:08:18 2004
-@@ -60,7 +60,7 @@
-   struct hostent *host_entry;
- 
-   if(do_correct){
--    getsockname(psb->sock, &sname, &len);
-+    getsockname(psb->sock, (struct sockaddr *)(&sname), &len);
-     DEBUG(5) debugf("socket: name.sin_addr = %s\n", inet_ntoa(sname.sin_addr));
-     host_entry =
-       gethostbyaddr((const char *)&(sname.sin_addr),
-@@ -455,7 +455,7 @@
-     DEBUG(5){
-       struct sockaddr_in name;
-       int len = sizeof(struct sockaddr);
--      getsockname(sock, &name, &len);
-+      getsockname(sock, (struct sockaddr *)(&name), &len);
-       debugf("socket: name.sin_addr = %s\n", inet_ntoa(name.sin_addr));
-     }
-     return psb;
diff --git a/mail/masqmail/pkg-plist b/mail/masqmail/pkg-plist
index d76662c2391c..a5bd33d79a53 100644
--- a/mail/masqmail/pkg-plist
+++ b/mail/masqmail/pkg-plist
@@ -1,16 +1,24 @@
-etc/rc.d/masqmail.sh
+bin/mservdetect
 etc/masqmail/masqmail.conf-dist
 etc/masqmail/masqmail.get-dist
 etc/masqmail/masqmail.route-dist
+etc/rc.d/masqmail.sh
 sbin/masqmail
+share/masqmail/tpl/failmsg.tpl
+share/masqmail/tpl/failmsg.tpl.de
+share/masqmail/tpl/failmsg.tpl.fr
+share/masqmail/tpl/failmsg.tpl.it
+share/masqmail/tpl/warnmsg.tpl
+share/masqmail/tpl/warnmsg.tpl.de
+share/masqmail/tpl/warnmsg.tpl.fr
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THOUGHTS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/install.html
+@dirrm share/masqmail/tpl
+@dirrm share/masqmail
 @dirrm etc/masqmail
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir /var/log/masqmail 2>/dev/null || true