diff options
| author | tron <tron@pkgsrc.org> | 2001-06-30 16:56:30 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-06-30 16:56:30 +0000 |
| commit | 83283045729d159eedd4b22602236c740d498ed1 (patch) | |
| tree | 283fd9c587f28a6a989f0aecd26fc4b11ad27e4b | |
| parent | c4be2646a49011d7cbf0633c4332395042223b35 (diff) | |
| download | pkgsrc-83283045729d159eedd4b22602236c740d498ed1.tar.gz | |
Fix loading of Python module "emma.py".
| -rw-r--r-- | finance/emma/Makefile | 4 | ||||
| -rw-r--r-- | finance/emma/distinfo | 4 | ||||
| -rw-r--r-- | finance/emma/patches/patch-ab | 13 | ||||
| -rw-r--r-- | finance/emma/patches/patch-ac | 17 |
4 files changed, 35 insertions, 3 deletions
diff --git a/finance/emma/Makefile b/finance/emma/Makefile index 1007943b503..662b3c6abaf 100644 --- a/finance/emma/Makefile +++ b/finance/emma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/30 16:06:06 tron Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/30 16:56:30 tron Exp $ # DISTNAME= emma-0.8-1 @@ -13,7 +13,7 @@ COMMENT= Money management program BUILD_DEPENDS+= automake-1.4:../../devel/automake DEPENDS+= gnome-libs-*:../../x11/gnome-libs -DEPENDS+= python-*:../../lang/python +DEPENDS+= python>=2.0:../../lang/python USE_X11BASE= YES GNU_CONFIGURE= YES diff --git a/finance/emma/distinfo b/finance/emma/distinfo index 21425a06d3d..4a919553700 100644 --- a/finance/emma/distinfo +++ b/finance/emma/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/06/30 16:43:06 tron Exp $ +$NetBSD: distinfo,v 1.5 2001/06/30 16:56:30 tron Exp $ SHA1 (emma-0.8-1.tar.gz) = 06c0216a441511b88c36d7d600b9e6e5b443f6d3 Size (emma-0.8-1.tar.gz) = 409664 bytes SHA1 (patch-aa) = 55412520766343b18c46b1b4e13cc58077a14269 +SHA1 (patch-ab) = 2e47edb27702a38e91c45010052d288cd1fe8cd2 +SHA1 (patch-ac) = d4519cc7d6c1b9d982855be957b88a33f38c3c3d diff --git a/finance/emma/patches/patch-ab b/finance/emma/patches/patch-ab new file mode 100644 index 00000000000..b973ec57ed6 --- /dev/null +++ b/finance/emma/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/06/30 16:56:30 tron Exp $ + +--- src/Makefile.in.orig Fri Nov 3 13:16:27 2000 ++++ src/Makefile.in Sat Jun 30 18:50:41 2001 +@@ -150,7 +150,7 @@ + toolbar.o transaction_dlg.o + emma_DEPENDENCIES = + emma_LDFLAGS = +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -DPREFIX=\"@prefix@\" + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) diff --git a/finance/emma/patches/patch-ac b/finance/emma/patches/patch-ac new file mode 100644 index 00000000000..dc278a60026 --- /dev/null +++ b/finance/emma/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.1 2001/06/30 16:56:31 tron Exp $ + +--- src/py_module.c.orig Wed Nov 1 09:10:18 2000 ++++ src/py_module.c Sat Jun 30 18:44:56 2001 +@@ -101,11 +101,7 @@ + strcat(tmp, "/.emma.py"); + py_module_include_file(tmp, FALSE); + +- py_module_include_file("/usr/share/emma.py", FALSE); +- py_module_include_file("/usr/local/share/emma.py", FALSE); +- +- py_module_include_file("/usr/share/emma/emma.py", FALSE); +- py_module_include_file("/usr/local/share/emma/emma.py", FALSE); ++ py_module_include_file(PREFIX "/share/emma/emma.py", FALSE); + } + + void py_module_redirect_stderr(void) |