On 12/6/2013 7:42 AM, Christian Weisgerber wrote:
Brian Callahan <bcal...@devio.us> wrote:
Here's a fix for ee after the Libcompat fallout. What this patch does is
use our curses instead of ee's included subset of curses.
FreeBSD, which has ee in base, also builds it against the system
curses.
+@@ -180,8 +185,8 @@ then
+ TARGET="curses"
+ curses=""
+ else
+- curses="-DNCURSE"
+- TARGET="ee"
++ curses="-DHAS_NCURSES"
++ TARGET="curses"
+ fi
Hmm, that else branch isn't taken:
cc ee.c -o ee -DSYSCONFDIR="\"/etc\"" -DCAP -DBSD_SELECT -DHAS_UNISTD -DHAS_STDARG
-DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR -O2 -pipe -s
-DTERMCAP="\"/usr/share/misc/termcap\"" -lcurses
That doesn't make a difference in our case, but I assume it wasn't
your intention.
Ah, you're right; it was compat for some older machines that still had
sgtty.h lying around. It's unneeded if you don't have sgtty.h
The attached should do the trick.
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/ee/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile 17 May 2013 13:13:51 -0000 1.13
+++ Makefile 6 Dec 2013 15:05:29 -0000
@@ -5,6 +5,7 @@ COMMENT= easy to use text editor
VERSION= 1.5.2
DISTNAME= ee-${VERSION}.src
PKGNAME= ee-${VERSION}
+REVISION= 0
EPOCH= 0
CATEGORIES= editors
@@ -14,7 +15,7 @@ MAINTAINER= Brian Callahan <bcallah@ope
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c
+WANTLIB= c curses
MASTER_SITES= http://devio.us/~bcallah/source/
EXTRACT_SUFX= .tgz
Index: patches/patch-create_make
===================================================================
RCS file: /cvs/ports/editors/ee/patches/patch-create_make,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-create_make
--- patches/patch-create_make 15 Jan 2006 01:01:29 -0000 1.2
+++ patches/patch-create_make 6 Dec 2013 15:05:29 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-create_make,v 1.2 2006/01/15 01:01:29 brad Exp $
--- create.make.orig Mon Sep 23 00:18:30 2002
-+++ create.make Sat Jan 14 19:47:28 2006
++++ create.make Fri Dec 6 10:02:58 2013
@@ -11,6 +11,11 @@
name_string="`uname`"
@@ -27,7 +27,7 @@ $OpenBSD: patch-create_make,v 1.2 2006/0
curses : ee.c
- cc ee.c -o ee \$(CFLAGS) -lcurses
-+ \$(CC) ee.c -o ee \$(CFLAGS) -lcurses
++ \$(CC) ee.c -o ee \$(DEFINES) \$(CFLAGS) -lcurses
ee : ee.o new_curse.o
- cc -o ee ee.o new_curse.o \$(CFLAGS)
