10 files changed, 111 insertions, 137 deletions

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index f8efd9402886..8cfbf11ba7f9 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -6,15 +6,12 @@
 #
 
 PORTNAME=	nullmailer
-# PORTVERSION=	1.00RC7
-PORTVERSION=	1.00r7
-PORTREVISION=	2
+PORTEPOCH=	1
+PORTVERSION=	1.00
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/nullmailer/ \
 		ftp://mirrors.dataloss.nl/mirrors/bgware/nullmailer/%SUBDIR%/
-# MASTER_SITE_SUBDIR=	${PORTVERSION}
-MASTER_SITE_SUBDIR=	1.00RC7
-DISTNAME=	${PORTNAME}-1.00RC7
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	clive@FreeBSD.org
 COMMENT=	MTA for hosts which relay to a fixed set of smart relays
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index 5f608dd5ef34..fd266e0108e6 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -1 +1,2 @@
-MD5 (nullmailer-1.00RC7.tar.gz) = 4a0bbe04ca8cf53987b7b1c27087aefe
+MD5 (nullmailer-1.00.tar.gz) = ead32b3543ef652891edf3856ec759dd
+SIZE (nullmailer-1.00.tar.gz) = 170605
diff --git a/mail/nullmailer/files/patch-Makefile.in b/mail/nullmailer/files/patch-Makefile.in
index 42719c418022..8703569fb16b 100644
--- a/mail/nullmailer/files/patch-Makefile.in
+++ b/mail/nullmailer/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in	Sat Dec 30 07:22:51 2000
-+++ Makefile.in	Sat Nov  9 10:16:13 2002
-@@ -66,6 +66,8 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- 
+--- Makefile.in~	Sat Mar  5 01:22:15 2005
++++ Makefile.in	Sat Mar  5 01:20:05 2005
+@@ -142,7 +142,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+-libexecdir = @libexecdir@
 +libexecdir = @libexecdir@/nullmailer
-+
  localstatedir = @localstatedir@/nullmailer
- sysconfdir = @sysconfdir@/nullmailer
- 
-@@ -368,8 +370,8 @@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -587,8 +587,8 @@
  	chown nullmail $(DESTDIR)$(localstatedir)/*
  	chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
  	chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
diff --git a/mail/nullmailer/files/patch-doc-nullmailer-send.8 b/mail/nullmailer/files/patch-doc-nullmailer-send.8
new file mode 100644
index 000000000000..670c5bbf2a20
--- /dev/null
+++ b/mail/nullmailer/files/patch-doc-nullmailer-send.8
@@ -0,0 +1,16 @@
+--- doc/nullmailer-send.8~	Sat Mar  5 10:13:38 2005
++++ doc/nullmailer-send.8	Sat Mar  5 10:16:51 2005
+@@ -57,10 +57,11 @@
+ The protocol name defaults to
+ .IR smtp ,
+ and may be followed by command-line arguments for that module.
+-For example, to connect to port 2525 on your SMTP smart host, use:
++For example, to connect to port 2525 on your SMTP smart host,
++which also requires SMTP authentication, use:
+ 
+ .EX
+-    smarthost.dom smtp --port=2525
++    smarthost.dom smtp --port=2525 --auth=user,pass
+ .EE
+ 
+ Blank lines and lines starting with a pound are ignored.
diff --git a/mail/nullmailer/files/patch-fdobuf.h b/mail/nullmailer/files/patch-fdobuf.h
index 3f4d5cc78382..03ca4a5e174c 100644
--- a/mail/nullmailer/files/patch-fdobuf.h
+++ b/mail/nullmailer/files/patch-fdobuf.h
@@ -1,5 +1,5 @@
---- lib/fdbuf/fdobuf.h.orig	Mon Nov 18 22:27:27 2002
-+++ lib/fdbuf/fdobuf.h	Mon Nov 18 22:27:50 2002
+--- lib/fdbuf/fdobuf.h~	Sat Mar  5 01:12:32 2005
++++ lib/fdbuf/fdobuf.h	Sat Mar  5 01:12:53 2005
 @@ -17,6 +17,8 @@
  #ifndef FDBUF__FDOBUF__H__
  #define FDBUF__FDOBUF__H__
diff --git a/mail/nullmailer/files/patch-lib-list.h b/mail/nullmailer/files/patch-lib-list.h
index f4244c8cf168..fc634a31af51 100644
--- a/mail/nullmailer/files/patch-lib-list.h
+++ b/mail/nullmailer/files/patch-lib-list.h
@@ -1,35 +1,13 @@
---- lib/list.h~	Sun Aug  1 15:46:43 2004
-+++ lib/list.h	Sun Aug  1 16:26:21 2004
+--- lib/list.h~	Sat Mar  5 01:16:28 2005
++++ lib/list.h	Sat Mar  5 01:13:35 2005
 @@ -18,8 +18,8 @@
    typedef list_node<T> node;
    typedef list_iterator<T> iter;
    typedef const_list_iterator<T> const_iter;
 -  friend class iter;
 -  friend class const_iter;
-+  friend class list_iterator<T>;
-+  friend class const_list_iterator<T>;
++  friend class list_iterator<T>;;
++  friend class const_list_iterator<T>;;
    
    list()
      : head(0), tail(0), cnt(0)
-@@ -111,8 +111,8 @@
-     }
- private:
-   const list<T>& lst;
--  const list<T>::node* prev;
--  const list<T>::node* curr;
-+  const typename list<T>::node* prev;
-+  const typename list<T>::node* curr;
- };
- 
- template<class T>
-@@ -164,8 +164,8 @@
-     }
- private:
-   list<T>& lst;
--  list<T>::node* prev;
--  list<T>::node* curr;
-+  typename list<T>::node* prev;
-+  typename list<T>::node* curr;
- };
- 
- template<class T>
diff --git a/mail/nullmailer/files/patch-sendmail.cc b/mail/nullmailer/files/patch-sendmail.cc
deleted file mode 100644
index 2c83bb469c86..000000000000
--- a/mail/nullmailer/files/patch-sendmail.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sendmail.cc
-+++ src/sendmail.cc
-@@ -84,7 +84,7 @@
-   str[varlen] = '=';
-   memcpy(str+varlen+1, val, vallen);
-   str[varlen+vallen+1] = 0;
--  return putenv(str);
-+  return putenv(strdup(str));
- }
- #endif
- 
diff --git a/mail/nullmailer/files/patch-smtp_authentication b/mail/nullmailer/files/patch-smtp_authentication
index 1868d5a828c7..ee91be69cef2 100644
--- a/mail/nullmailer/files/patch-smtp_authentication
+++ b/mail/nullmailer/files/patch-smtp_authentication
@@ -1,6 +1,5 @@
-diff -u protocols/protocol.cc protocols/protocol.cc
---- protocols/protocol.cc	2003-01-03 13:00:29.000000000 -0800
-+++ protocols/protocol.cc	2004-08-04 12:20:34.000000000 -0700
+--- protocols/protocol.cc~	Sat Mar  5 09:38:23 2005
++++ protocols/protocol.cc	Sat Mar  5 09:39:42 2005
 @@ -30,10 +30,12 @@
  const char* cli_help_suffix = "";
  const char* cli_args_usage = "remote-address < mail-file";
@@ -11,13 +10,12 @@ diff -u protocols/protocol.cc protocols/protocol.cc
    { 'p', "port", cli_option::integer, 0, &port,
      "Set the port number on the remote host to connect to", 0 },
 +  { 'a', "auth", cli_option::string, 0, &auth,
-+    "Set the user and password for authentication (user,pass)", 0 } ,
-   {0}
++    "Set the user and password for authentication (user,pass)", 0 },
+   {0, 0, cli_option::flag, 0, 0, 0, 0}
  };
  
-diff -u protocols/protocol.h protocols/protocol.h
---- protocols/protocol.h	2002-12-23 10:14:53.000000000 -0800
-+++ protocols/protocol.h	2004-08-04 12:21:25.000000000 -0700
+--- protocols/protocol.h~	Sat Mar  5 09:40:15 2005
++++ protocols/protocol.h	Sat Mar  5 09:40:46 2005
 @@ -8,6 +8,7 @@
  
  // This must be provided by the protocol, but will be set by the lib.
@@ -26,9 +24,8 @@ diff -u protocols/protocol.h protocols/protocol.h
  
  extern void protocol_prep(fdibuf* in);
  extern void protocol_send(fdibuf* in, int fd);
-diff -u protocols/qmqp.cc protocols/qmqp.cc
---- protocols/qmqp.cc	2003-01-03 13:00:31.000000000 -0800
-+++ protocols/qmqp.cc	2004-08-04 12:21:13.000000000 -0700
+--- protocols/qmqp.cc~	Sat Mar  5 09:40:59 2005
++++ protocols/qmqp.cc	Sat Mar  5 09:41:21 2005
 @@ -31,6 +31,7 @@
  #include "protocol.h"
  
@@ -37,9 +34,8 @@ diff -u protocols/qmqp.cc protocols/qmqp.cc
  const char* cli_program = "qmqp";
  const char* cli_help_prefix = "Send an emal message via QMQP\n";
  
-diff -u protocols/smtp.cc protocols/smtp.cc
---- protocols/smtp.cc	2003-01-03 13:00:32.000000000 -0800
-+++ protocols/smtp.cc	2004-08-04 20:46:15.605469184 -0700
+--- protocols/smtp.cc~	Sat Mar  5 09:41:31 2005
++++ protocols/smtp.cc	Sat Mar  5 09:44:58 2005
 @@ -30,6 +30,7 @@
  #include "protocol.h"
  
@@ -60,7 +56,7 @@ diff -u protocols/smtp.cc protocols/smtp.cc
  void protocol_send(fdibuf* in, int fd)
  {
    mystring hh = getenv("HELOHOST");
-@@ -143,5 +149,67 @@
+@@ -143,5 +149,68 @@
    smtp conn(fd);
    conn.docmd("", 200);
    conn.docmd("HELO " + hh, 200);
@@ -75,6 +71,7 @@ diff -u protocols/smtp.cc protocols/smtp.cc
 +    to64(plain,encoded);
 +    conn.docmd(encoded,200);
 +  }
++
    conn.send(in);
  }
 +
@@ -86,17 +83,17 @@ diff -u protocols/smtp.cc protocols/smtp.cc
 +    int c1, c2, c3;
 +    size_t inpos = 0;
 +    while ((c1 = infile[inpos++])) {
-+        c2 = infile[inpos++];
-+        if (!c2) {
-+            output64chunk(c1, 0, 0, 2, outfile);
-+        } else {
-+            c3 = infile[inpos++];
-+            if (!c3) {
-+                output64chunk(c1, c2, 0, 1, outfile);
-+            } else {
-+                output64chunk(c1, c2, c3, 0, outfile);
-+            }
-+        }
++	c2 = infile[inpos++];
++	if (!c2) {
++	    output64chunk(c1, 0, 0, 2, outfile);
++	} else {
++	    c3 = infile[inpos++];
++	    if (!c3) {
++		output64chunk(c1, c2, 0, 1, outfile);
++	    } else {
++		output64chunk(c1, c2, c3, 0, outfile);
++	    }
++	}
 +    }
 +}
 +
@@ -127,4 +124,4 @@ diff -u protocols/smtp.cc protocols/smtp.cc
 +  out[4] = 0;
 +  outfile += out;
 +}
-+// vim:cin:si:ai:et:ts=2:sw=2:
++
diff --git a/mail/nullmailer/files/patch-src-Makefile.in b/mail/nullmailer/files/patch-src-Makefile.in
index d760f0647072..d7e1621f185f 100644
--- a/mail/nullmailer/files/patch-src-Makefile.in
+++ b/mail/nullmailer/files/patch-src-Makefile.in
@@ -1,36 +1,42 @@
---- src/Makefile.in~	Sat Mar  1 17:13:21 2003
-+++ src/Makefile.in	Sat Mar  1 17:18:54 2003
-@@ -68,14 +68,15 @@
- VERSION = @VERSION@
- 
- bin_PROGRAMS = \
--	mailq \
- 	nullmailer-inject
- 
-+libexecdir = @libexecdir@/nullmailer
+--- src/Makefile.in.orig	Tue Mar  1 01:39:50 2005
++++ src/Makefile.in	Sat Mar  5 10:06:52 2005
+@@ -36,9 +36,9 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-bin_PROGRAMS = mailq$(EXEEXT) nullmailer-inject$(EXEEXT)
+-sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT) \
+-	sendmail$(EXEEXT)
++bin_PROGRAMS = nullmailer-inject$(EXEEXT)
++sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT)
++libexec_PROGRAMS = mailq$(EXEEXT) sendmail$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -52,7 +52,9 @@
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 +
- sbin_PROGRAMS = \
- 	nullmailer-queue \
- 	nullmailer-send \
--	sendmail
- 
-+libexec_PROGRAMS = mailq sendmail
- 
- #noinst_PROGRAMS = address
- 
-@@ -98,7 +99,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
--PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
-+PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS) $(libexec_PROGRAMS)
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
-@@ -195,6 +196,30 @@
- 	list='$(sbin_PROGRAMS)'; for p in $$list; do \
- 	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(libexec_PROGRAMS)
+ am_mailq_OBJECTS = mailq.$(OBJEXT)
+ mailq_OBJECTS = $(am_mailq_OBJECTS)
+ mailq_DEPENDENCIES = ../lib/libnullmailer.a
+@@ -158,7 +160,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+-libexecdir = @libexecdir@
++libexecdir = @libexecdir@/nullmailer
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -251,6 +253,31 @@
+ 	  else :; fi; \
  	done
+ 
 +mostlyclean-libexecPROGRAMS:
 +
 +clean-libexecPROGRAMS:
@@ -44,26 +50,27 @@
 +	@$(NORMAL_INSTALL)
 +	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
 +	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	 if test -f $$p; then \
++	  echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 +	  else :; fi; \
 +	done
 +
 +uninstall-libexecPROGRAMS:
 +	@$(NORMAL_UNINSTALL)
 +	list='$(libexec_PROGRAMS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 +	done
++
+ uninstall-sbinPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+@@ -433,7 +460,7 @@
+ 
+ install-data-am:
  
- .c.o:
- 	$(COMPILE) -c $<
-@@ -313,7 +338,7 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
 -install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
 +install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-libexecPROGRAMS
- install-exec: install-exec-am
  
- install-data-am:
+ install-info: install-info-am
+ 
diff --git a/mail/nullmailer/files/patch-src-send.cc b/mail/nullmailer/files/patch-src-send.cc
deleted file mode 100644
index 825586519359..000000000000
--- a/mail/nullmailer/files/patch-src-send.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/send.cc.orig	Sat Jan  4 04:58:31 2003
-+++ src/send.cc	Sun Nov 28 18:49:02 2004
-@@ -166,7 +166,7 @@
-   unsigned i = 0;
-   args[i++] = program.c_str();
-   for(slist::const_iter opt(remote.options); opt; opt++)
--    args[i++] = (*opt).c_str();
-+    args[i++] = strdup((*opt).c_str());
-   args[i++] = remote.host.c_str();
-   args[i++] = 0;
-   execv(args[0], (char**)args);