3 files changed, 80 insertions, 0 deletions
diff --git a/security/mixminion/patches/patch-aa b/security/mixminion/patches/patch-aa
new file mode 100644
index 00000000000..40ddadf473f
--- /dev/null
+++ b/security/mixminion/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $
+
+--- Makefile.orig	2004-04-04 20:43:33.000000000 +0200
++++ Makefile
+@@ -12,8 +12,7 @@
+ 
+ # XXXX This fails when PYTHON is set to a version of Python earlier than 1.3
+ 
+-PYTHON_CANDIDATES = python python2.3 python2.3x python2.2 python2.2x python2.1\
+-        python2.1x python2.0 python2.0x python2
++PYTHON_CANDIDATES = python2p4 python2p3 python2p2 python2p1
+ FINDPYTHON = \
+    if [ "x`which which`" = "x" ]; then                                       \
+         echo "Ouch!  I couldn't run 'which' on your system.";                \
diff --git a/security/mixminion/patches/patch-ab b/security/mixminion/patches/patch-ab
new file mode 100644
index 00000000000..c93475f4470
--- /dev/null
+++ b/security/mixminion/patches/patch-ab
@@ -0,0 +1,52 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $
+
+--- setup.py.orig	2004-05-10 19:36:22.000000000 +0200
++++ setup.py
+@@ -492,6 +492,9 @@ if os.path.exists("/usr/kerberos/include
+ 
+ INCLUDE_DIRS.append("src")
+ 
++INCLUDE_DIRS.append('/usr/pkg/include')
++INCLUDE_DIRS.append('/usr/include')
++
+ EXTRA_CFLAGS = []
+ if sys.platform != 'win32':
+     EXTRA_CFLAGS += [ '-Wno-strict-prototypes' ]
+@@ -534,6 +537,28 @@ elif sys.platform != 'win32':
+ else:
+     EXTRA = {}
+ 
++EXTRA = {'data_files':
++         [('man/man1', ['etc/mixminion.1']),
++          ('man/man5', ['etc/mixminionrc.5', 'etc/mixminiond.conf.5']),
++          ('man/man8', ['etc/mixminiond.8'])]}
++
++orig_opts = sysconfig.get_config_vars('OPT')
++if orig_opts == ['-DNDEBUG -O2 -I/usr/pkg/include -I/usr/include']:
++    sysconfig._config_vars['OPT'] = '-DNDEBUG -O2'
++elif orig_opts == ['-DNDEBUG -O2 -I/usr/include']:
++    sysconfig._config_vars['OPT'] = '-DNDEBUG -O2'
++elif orig_opts == ['-O2 -I/usr/include']:
++    sysconfig._config_vars['OPT'] = '-O2'
++elif orig_opts == ['-DNDEBUG -g -O3 -Wall -Wstrict-prototypes']:
++    pass
++elif orig_opts == ['-g -O2 -Wall -Wstrict-prototypes']:
++    pass
++else:
++    # The package defines the Python packages it can rely upon.
++    # If we get here, this assumption is invalid.
++    print "Looks like the Python we are using has unexpected properties."
++    sys.exit(1)
++
+ setup(name='Mixminion',
+       version=VERSION,
+       license="LGPL",
+@@ -550,6 +575,8 @@ setup(name='Mixminion',
+       **EXTRA
+ )
+ 
++sysconfig._config_vars['OPT'] = orig_opts
++
+ try:
+     for s in SCRIPTS:
+         os.unlink(s)
diff --git a/security/mixminion/patches/patch-ac b/security/mixminion/patches/patch-ac
new file mode 100644
index 00000000000..b753b32d8fc
--- /dev/null
+++ b/security/mixminion/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $
+
+--- lib/mixminion/test.py.orig	Sun Apr  4 10:43:12 2004
++++ lib/mixminion/test.py
+@@ -4272,7 +4272,8 @@ IntRS=5
+             self.assert_(os.path.exists(c[0]) and c[0].endswith("/rm"))
+             self.assertEquals(c[1], [])
+             self.assertEquals(C._parseCommand("/bin/ls"), ("/bin/ls", []))
+-            self.failUnless(C._parseCommand("python")[0] is not None)
++            # "python" does not have to be in the path.
++#            self.failUnless(C._parseCommand("python")[0] is not None)
+ 
+         # Base64
+         self.assertEquals(C._parseBase64(" YW\nJj"), "abc")