- Update to 3.0.2d

- Support staging
- Many minor fixes

9 files changed, 82 insertions, 119 deletions

diff --git a/mail/mixmaster/files/Makefile.in b/mail/mixmaster/files/Makefile.in
deleted file mode 100644
index f175301d9550..000000000000
--- a/mail/mixmaster/files/Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
-# Mixmaster version 2.9  --  (C) 1999 - 2003 Anonymizer Inc. and others.
-
-# Mixmaster may be redistributed and modified under certain conditions.
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
-# ANY KIND, either express or implied. See the file COPYRIGHT for
-# details.
-
-# Edit according to the libraries you want to use:
-INC =  -I/usr/local/include -I/usr/include
-DEF =  -DUSE_ZLIB -DUSE_PCRE -DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_IDEA -DUSE_SOCK -DSPOOL='"/var/tmp/mixmaster"' -DGLOBALMIXCONF='"/usr/local/etc/mixmaster/client.cfg"' -DHOMEMIXDIR="\".Mix\"" 
-LIBS =     
-LDFLAGS =  -lz -lpcre -L/usr/local/lib -lncurses -ltermcap -rpath=${LOCALBASE}/lib -lcrypto
-
-OPT = -g -Wall
-# OPT = -g -pg -Wall -DDEBUG
-# OPT = -O2 -Wall
-
-CFLAGS = $(INC) $(DEF) $(OPT)
-CC = gcc
-AR = ar rc
-RANLIB = ranlib
-#MAKE = make
-
-OBJ = mix.o rem.o rem1.o rem2.o rem3.o chain.o chain1.o chain2.o chain3.o nym.o pgp.o pgpdb.o pgpdata.o pgpget.o pgpcreat.o pool.o mail.o rfc822.o mime.o keymgt.o compress.o stats.o crypto.o random.o util.o buffers.o
-
-MIXOBJ = rndseed.o menu.o menusend.o menunym.o menuutil.o
-NOMENUOBJ = rndseed.o dummy.o
-WINOBJ = winmain.o winutil.o
-
-all:	mix
-
-mix:	$(OBJ) $(MIXOBJ) main.o $(LIBS)
-	$(CC) $(OBJ) $(MIXOBJ) main.o $(LIBS) $(LDFLAGS) -o mix
-
-libmix.a: $(OBJ) $(MIXOBJ) dllmain.o
-	$(AR) libmix.a $(OBJ) $(MIXOBJ) dllmain.o
-
-libmix32.a: libmix.a mixlib.def
-	dllwrap --dllname mixlib.dll --def mixlib.def --output-lib libmix32.a libmix.a zlib-1.1.4/libz.a pcre-2.08/libpcre.a openssl/libeay32.a -lwsock32
-
-dllmix: main.o libmix32.a
-	$(CC) main.o libmix32.a -o dllmix
-
-winmix.exe:	$(WINOBJ) libmix32.a
-	$(CC) $(WINOBJ) libmix32.a -lgdi32 -luser32 $(LDFLAGS) -o mix.exe
-
-winmix: winmenu.res #winmix.exe
-	rsrc winmenu.res mix.exe
-
-winmenu.o:	winmenu.rc winmenu.h
-	windres winmenu.rc winmenu.o
-
-remailer:	$(OBJ) $(NOMENUOBJ) remailer.o $(LIBS)
-	$(CC) $(OBJ) $(NOMENUOBJ) remailer.o $(LIBS) $(LDFLAGS) -o remailer
-
-mpgp:	$(OBJ) $(NOMENUOBJ) pgptest.o $(LIBS)
-	$(CC) $(OBJ) $(NOMENUOBJ) pgptest.o $(LIBS) $(LDFLAGS) -o mpgp
-
-test:	$(OBJ) test.o $(NOMENUOBJ) $(LIBS)
-	$(CC) $(OBJ) test.o $(NOMENUOBJ) $(LIBS) $(LDFLAGS) -o test
-
-clean:
-	-rm -f *.o *.a *.res *~ mix *.exe remailer test mpgp core gmon.out
-
-allclean: clean
-	-rm -f Makefile
-
-ci: clean
-	cd ~/mix3; ci -l * Mix/* Mix/Src/*; echo
-
-include Makefile.deps
-
-
-
-
-
diff --git a/mail/mixmaster/files/patch-Mix-Src-Makefile.in b/mail/mixmaster/files/patch-Mix-Src-Makefile.in
new file mode 100644
index 000000000000..caf98abcef16
--- /dev/null
+++ b/mail/mixmaster/files/patch-Mix-Src-Makefile.in
@@ -0,0 +1,47 @@
+--- Mix/Src/Makefile.in.orig	2014-06-01 22:58:49.000000000 +0200
++++ Mix/Src/Makefile.in	2014-06-01 23:00:44.000000000 +0200
+@@ -8,10 +8,10 @@
+ # $Id: Makefile.in 647 2003-10-25 23:34:13Z weasel $
+ 
+ # Edit according to the libraries you want to use:
+-INC = %INC
+-DEF = %DEF -DUSE_SOCK %MIXDIR
+-LIBS = %LIBS
+-LDFLAGS = %LDFLAGS
++INC = -I/usr/local/include -I/usr/include
++DEF = -DUSE_ZLIB -DUSE_PCRE -DUSE_AES -DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_IDEA -DHAVE_SETENV -DUSE_SOCK -DSPOOL='"/tmp/mixmaster"' -DGLOBALMIXCONF='"%%ETCDIR%%/mix.cfg"' -DHOMEMIXDIR='".Mix"'
++LIBS =
++LDFLAGS = -Wl -lz -lpcre -L/usr/local/lib -lncurses -ltermcap -lcrypto
+ 
+ # Set compiler options
+ # Note: Define NDEBUG to disable "assert" when not using DEBUG
+@@ -21,7 +21,6 @@
+ # OPT = -O2 -Wall -DNDEBUG
+ 
+ CFLAGS = $(INC) $(DEF) $(OPT)
+-CC = gcc
+ AR = ar rc
+ RANLIB = ranlib
+ #MAKE = make
+@@ -32,7 +31,7 @@
+ NOMENUOBJ = rndseed.o dummy.o
+ WINOBJ = winmain.o winutil.o
+ 
+-all:	mixmaster
++all:	mixmaster mpgp remailer
+ 
+ mixmaster: $(OBJ) $(MIXOBJ) main.o $(LIBS)
+ 	$(CC) $(OBJ) $(MIXOBJ) main.o $(LIBS) $(LDFLAGS) -o mixmaster
+@@ -77,10 +76,10 @@
+ 
+ parsedate.tab.c: parsedate.y
+ 	@echo Expect 6 shift/reduce conflicts
+-	bison parsedate.y
++	yacc -o parsedate.tab.c parsedate.y
+ 
+ parsedate: parsedate.tab.c
+-	gcc -DTEST parsedate.tab.c -o parsedate
++	$(CC) -DTEST parsedate.tab.c -o parsedate
+ 
+ 
+ include Makefile.deps
diff --git a/mail/mixmaster/files/patch-Mix-Src-config.h b/mail/mixmaster/files/patch-Mix-Src-config.h
new file mode 100644
index 000000000000..df63662883d9
--- /dev/null
+++ b/mail/mixmaster/files/patch-Mix-Src-config.h
@@ -0,0 +1,16 @@
+--- Mix/Src/config.h.orig	2014-06-01 23:03:49.000000000 +0200
++++ Mix/Src/config.h	2014-06-01 23:04:46.000000000 +0200
+@@ -179,11 +179,11 @@
+ #define BUFSIZE 4096
+ 
+ /** if it is a systemwide installation defined GLOBALMIXCONF **********/
+-/* #define GLOBALMIXCONF "/etc/mix.cfg" */
++#define GLOBALMIXCONF "%%ETCDIR%%/mix.cfg"
+ 
+ /* The path to append to a user's homedirectory for his local Mix dir */
+ #ifndef HOMEMIXDIR
+-#define HOMEMIXDIR "Mix"
++#define HOMEMIXDIR ".Mix"
+ #endif
+ 
+ /** file names ********************************************************/
diff --git a/mail/mixmaster/files/patch-Mix-Src-mix.c b/mail/mixmaster/files/patch-Mix-Src-mix.c
new file mode 100644
index 000000000000..53ffcefe4bfa
--- /dev/null
+++ b/mail/mixmaster/files/patch-Mix-Src-mix.c
@@ -0,0 +1,11 @@
+--- Mix/Src/mix.c.orig	2014-06-01 23:05:54.000000000 +0200
++++ Mix/Src/mix.c	2014-06-01 23:06:14.000000000 +0200
+@@ -430,7 +430,7 @@
+ #ifdef WIN32
+ 	strnncpy(SENDMAIL     , "outfile");
+ #else /* end of WIN32 */
+-	strnncpy(SENDMAIL     , "/usr/lib/sendmail -t");
++	strnncpy(SENDMAIL     , "/usr/sbin/sendmail -t");
+ #endif /* else if not WIN32 */
+ 	strnncpy(SENDANONMAIL , "");
+ 	strnncpy(NEWS         , "");
diff --git a/mail/mixmaster/files/patch-Mix-conf-mix.cfg b/mail/mixmaster/files/patch-Mix-conf-mix.cfg
new file mode 100644
index 000000000000..5ae3af7e2889
--- /dev/null
+++ b/mail/mixmaster/files/patch-Mix-conf-mix.cfg
@@ -0,0 +1,8 @@
+--- Mix/conf/mix.cfg.orig	2014-06-01 23:07:26.000000000 +0200
++++ Mix/conf/mix.cfg	2014-06-01 23:07:48.000000000 +0200
+@@ -12,3 +12,5 @@
+ RELFINAL	99
+ MAXLAT		36h
+ MINLAT		5m
++SENDMAIL        /usr/sbin/sendmail -t
++POOL            /var/spool/mixmaster
diff --git a/mail/mixmaster/files/patch-aa b/mail/mixmaster/files/patch-aa
deleted file mode 100644
index ef3a87f29f69..000000000000
--- a/mail/mixmaster/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.orig	2003-09-27 18:53:56.000000000 +0200
-+++ config.h	2003-09-27 18:54:08.000000000 +0200
-@@ -138,7 +138,7 @@
- /* Give up if a file is larger than BUFFER_MAX bytes: */
- /* #define BUFFER_MAX 64*1024*1024 */
- 
--#define PATHMAX 512
-+#define PATHMAX 1024
- #define LINELEN 128
- #define BUFSIZE 4096
- 
diff --git a/mail/mixmaster/files/patch-ab b/mail/mixmaster/files/patch-ab
deleted file mode 100644
index a04e9078dd50..000000000000
--- a/mail/mixmaster/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- mix.c.orig	2003-09-27 19:42:28.000000000 +0200
-+++ mix.c	2003-09-27 19:42:47.000000000 +0200
-@@ -86,7 +86,7 @@ char POOLDIR[PATHMAX];
- #ifdef WIN32
- char SENDMAIL[LINELEN] = "outfile";
- #else /* end of WIN32 */
--char SENDMAIL[LINELEN] = "/usr/lib/sendmail -t";
-+char SENDMAIL[LINELEN] = "/usr/sbin/sendmail -t";
- #endif /* else if not WIN32 */
- char SENDANONMAIL[LINELEN];
- char NEWS[LINELEN];
diff --git a/mail/mixmaster/files/patch-ac b/mail/mixmaster/files/patch-ac
deleted file mode 100644
index 415b9fb6cc36..000000000000
--- a/mail/mixmaster/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- pcre-2.08/Makefile.orig	Fri Aug 30 09:36:52 2002
-+++ pcre-2.08/Makefile	Fri Aug 30 09:37:14 2002
-@@ -51,8 +51,8 @@
- # into errlist.
- 
- AR = ar cq
--CC = gcc -O2 -Wall
--CFLAGS =
-+#CC = gcc -O2 -Wall
-+CFLAGS += -Wall
- RANLIB = @true
- 
- # If you are going to obey "make install", edit these settings for your
diff --git a/mail/mixmaster/files/patch-ad b/mail/mixmaster/files/patch-ad
deleted file mode 100644
index 078d348ef654..000000000000
--- a/mail/mixmaster/files/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
---- ../conf/mix.cfg.orig	Wed Oct 31 09:19:55 2001
-+++ ../conf/mix.cfg	Mon Oct 28 13:17:39 2002
-@@ -1,3 +1,5 @@
-+SENDMAIL        /usr/sbin/sendmail -t
-+POOL            /var/spool/mixmaster
- ######################## Client configuration: ##########################
- REMAIL          n
-