diff options
| author | joerg <joerg> | 2006-01-27 17:13:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-01-27 17:13:56 +0000 |
| commit | aa1e3a9ca59ab4234df569564ee9a5d39c0c1def (patch) | |
| tree | c1d07a5903b8abe770f070d463f3189cbb85e7cf /security/mixminion | |
| parent | 948f5ac738b01c385f7a8f3bff6a01e7fe117dec (diff) | |
| download | pkgsrc-aa1e3a9ca59ab4234df569564ee9a5d39c0c1def.tar.gz | |
Make the setup.py hack a bit more likely to work:
/usr/pkg/include and /usr/include can appear in any order, PREFIX can be
!= /usr/pkg.
XXX Why this hack and not split + filter to remove the include pathes?
Diffstat (limited to 'security/mixminion')
| -rw-r--r-- | security/mixminion/Makefile | 7 | ||||
| -rw-r--r-- | security/mixminion/distinfo | 4 | ||||
| -rw-r--r-- | security/mixminion/patches/patch-ab | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile index 167c7dc7797..9f1ede03110 100644 --- a/security/mixminion/Makefile +++ b/security/mixminion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:13 tv Exp $ +# $NetBSD: Makefile,v 1.5 2006/01/27 17:13:56 joerg Exp $ # DISTNAME= Mixminion-0.0.7.1 @@ -19,6 +19,11 @@ PYDISTUTILSPKG= YES TEST_TARGET= test +SUBST_CLASSES+= paths +SUBST_FILES.paths= setup.py +SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_STAGE.paths= post-patch + .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/mixminion/distinfo b/security/mixminion/distinfo index 1412e1d519c..c5de0cf1abe 100644 --- a/security/mixminion/distinfo +++ b/security/mixminion/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 13:10:08 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/01/27 17:13:56 joerg Exp $ SHA1 (Mixminion-0.0.7.1.tar.gz) = 62df7fea95e88267215ed7dc07a1715e099f5312 RMD160 (Mixminion-0.0.7.1.tar.gz) = e94f23a1e119c77a64893f935d49849958968cde Size (Mixminion-0.0.7.1.tar.gz) = 437539 bytes SHA1 (patch-aa) = fe3eed950f09db4aa54865ee99bf0965289dac09 -SHA1 (patch-ab) = 1882865030d118f220181816c8594011465cdb63 +SHA1 (patch-ab) = 28a3fc5e298c64f1bc9822ed8bc0d9fd3c371452 SHA1 (patch-ac) = e6f1dbc080e50feb9174d09df7b22c053c50e540 diff --git a/security/mixminion/patches/patch-ab b/security/mixminion/patches/patch-ab index c93475f4470..12589381e9f 100644 --- a/security/mixminion/patches/patch-ab +++ b/security/mixminion/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2006/01/27 17:13:56 joerg Exp $ --- setup.py.orig 2004-05-10 19:36:22.000000000 +0200 +++ setup.py @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $ EXTRA_CFLAGS = [] if sys.platform != 'win32': EXTRA_CFLAGS += [ '-Wno-strict-prototypes' ] -@@ -534,6 +537,28 @@ elif sys.platform != 'win32': +@@ -534,6 +537,30 @@ elif sys.platform != 'win32': else: EXTRA = {} @@ -22,7 +22,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/12/27 22:58:57 wiz Exp $ + ('man/man8', ['etc/mixminiond.8'])]} + +orig_opts = sysconfig.get_config_vars('OPT') -+if orig_opts == ['-DNDEBUG -O2 -I/usr/pkg/include -I/usr/include']: ++if orig_opts == ['-DNDEBUG -O2 -I@PREFIX@/include -I/usr/include']: ++ sysconfig._config_vars['OPT'] = '-DNDEBUG -O2' ++elif orig_opts == ['-DNDEBUG -O2 -I/usr/include -I@PREFIX@/include']: + sysconfig._config_vars['OPT'] = '-DNDEBUG -O2' +elif orig_opts == ['-DNDEBUG -O2 -I/usr/include']: + sysconfig._config_vars['OPT'] = '-DNDEBUG -O2' |