diff options
| author | roy <roy@pkgsrc.org> | 2011-03-29 21:38:26 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2011-03-29 21:38:26 +0000 |
| commit | 27534d567bbed2c72bd2354b07418df8b7916928 (patch) | |
| tree | 8dacf7da402c07fe7b30c3f758c20608d8e8df3d | |
| parent | 551b74cd054a8a472b07cb7279838e0b31c286ed (diff) | |
| download | pkgsrc-27534d567bbed2c72bd2354b07418df8b7916928.tar.gz | |
joe only uses termcap so......
Depend on termcap instead of ncurses
Replace curses.h and term.h includes with termcap.h
Fixes PR lib/43941
| -rw-r--r-- | editors/joe/Makefile | 4 | ||||
| -rw-r--r-- | editors/joe/distinfo | 3 | ||||
| -rw-r--r-- | editors/joe/patches/patch-ac | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 4b02dc80857..3e670c398ce 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2010/07/10 03:00:49 obache Exp $ +# $NetBSD: Makefile,v 1.34 2011/03/29 21:38:26 roy Exp $ DISTNAME= joe-3.7 PKGREVISION= 1 @@ -26,5 +26,5 @@ CONF_FILES+= ${EGDIR}/jpicorc ${PKG_SYSCONFDIR}/jpicorc CONF_FILES+= ${EGDIR}/jstarrc ${PKG_SYSCONFDIR}/jstarrc CONF_FILES+= ${EGDIR}/rjoerc ${PKG_SYSCONFDIR}/rjoerc -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/joe/distinfo b/editors/joe/distinfo index 7c7a3a2ffb1..c3faca4c679 100644 --- a/editors/joe/distinfo +++ b/editors/joe/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.15 2010/06/23 12:52:43 adam Exp $ +$NetBSD: distinfo,v 1.16 2011/03/29 21:38:26 roy Exp $ SHA1 (joe-3.7.tar.gz) = 54398578886d4a3d325aece52c308a939d31101d RMD160 (joe-3.7.tar.gz) = 7e2c72a750c6aac4732cf4369bceee5333460f15 Size (joe-3.7.tar.gz) = 696036 bytes SHA1 (patch-aa) = 18bf5044cf546c0080df5387719715735389f8cc SHA1 (patch-ab) = bd416192e0273b596db6ecc280ad743efd9ed421 +SHA1 (patch-ac) = 8062acd877404f4a5f6a8cd7f93f49b7b06965d2 diff --git a/editors/joe/patches/patch-ac b/editors/joe/patches/patch-ac new file mode 100644 index 00000000000..def4f703cb4 --- /dev/null +++ b/editors/joe/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.7 2011/03/29 21:38:26 roy Exp $ + +--- termcap.c 2011-03-29 22:25:48.000000000 +0100 ++++ termcap.c 2011-03-29 22:30:35.000000000 +0100 +@@ -8,16 +8,9 @@ + #include "types.h" + + #ifdef TERMINFO +- +-#ifdef HAVE_CURSES_H +-#include <curses.h> +-#endif +-/* curses has to come before term.h on SGI */ +-#ifdef HAVE_TERM_H +-/* term.h is a disaster: it #defines 'tab' */ +-#include <term.h> +-#endif +- ++/* Even though we may configure and test for terminfo and curses ++ * we actually only use termcap */ ++#include <termcap.h> + #endif + + int dopadding = 0; |