summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2011-10-03 00:45:47 +0000
committerdholland <dholland>2011-10-03 00:45:47 +0000
commitf9d98a6bd6f7a6bbf7a572ce48d544437d4bd312 (patch)
tree63d2ee2caf6858f5641c13526ac67f9f13b34dba
parentf1b1af53f551dcbcfe6f72d1376748c286b895c4 (diff)
downloadpkgsrc-f9d98a6bd6f7a6bbf7a572ce48d544437d4bd312.tar.gz
Run this thing's configure script at the configure phase, so it's easier
to tell what's going on. Patch it to be able to find netbsd's terminfo. This might fix the bulk failure.
-rw-r--r--editors/easyedit/Makefile6
-rw-r--r--editors/easyedit/distinfo4
-rw-r--r--editors/easyedit/patches/patch-ab18
3 files changed, 22 insertions, 6 deletions
diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index 02309d31282..cccaf2dc111 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/02/07 17:33:51 abs Exp $
+# $NetBSD: Makefile,v 1.14 2011/10/03 00:45:47 dholland Exp $
#
DISTNAME= ee-1.4.6.src
@@ -15,9 +15,13 @@ PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+MAKE_FILE= make.local
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+do-configure:
+ cd ${WRKSRC} && ./create.make
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ee ${DESTDIR}${PREFIX}/bin/easyedit
${INSTALL_MAN} ${WRKSRC}/ee.1 \
diff --git a/editors/easyedit/distinfo b/editors/easyedit/distinfo
index 02b46580ce0..540a93da0d8 100644
--- a/editors/easyedit/distinfo
+++ b/editors/easyedit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:10 agc Exp $
+$NetBSD: distinfo,v 1.5 2011/10/03 00:45:47 dholland Exp $
SHA1 (ee-1.4.6.src.tgz) = 6be7d03eade441a6c409b9d441ba2c144e26b157
RMD160 (ee-1.4.6.src.tgz) = 2ed8ad3123c5443b29f5db142ad367d67028da27
Size (ee-1.4.6.src.tgz) = 70511 bytes
SHA1 (patch-aa) = b06c957864d790b46e7e133f5abb4ceb877aa15a
-SHA1 (patch-ab) = 60f95dc10b4a41f237120784ef6220a9cf2b2408
+SHA1 (patch-ab) = daf02fd0bdc7bbb397baf3d7d1c713e92ce73ea5
SHA1 (patch-ac) = cf3c94a42825a86941a40a8a66c7f413c51d0ac7
diff --git a/editors/easyedit/patches/patch-ab b/editors/easyedit/patches/patch-ab
index 585d2924162..d4d420a8854 100644
--- a/editors/easyedit/patches/patch-ab
+++ b/editors/easyedit/patches/patch-ab
@@ -1,8 +1,20 @@
-$NetBSD: patch-ab,v 1.1 2003/07/03 07:05:10 cjep Exp $
+$NetBSD: patch-ab,v 1.2 2011/10/03 00:45:47 dholland Exp $
---- create.make.orig 2001-06-28 06:39:33.000000000 +0100
+- find netbsd's terminfo
+- configure for pkgsrc
+
+--- create.make.orig 2002-09-23 04:18:30.000000000 +0000
+++ create.make
-@@ -254,16 +254,16 @@ echo "all : $TARGET" >> make.local
+@@ -31,7 +31,7 @@ fi
+
+ # test for terminfo directory (exists on SysV systems)
+
+-if [ -d /usr/lib/terminfo -o -d /usr/share/lib/terminfo -o -d /usr/share/terminfo ]
++if [ -d /usr/lib/terminfo -o -d /usr/share/lib/terminfo -o -d /usr/share/terminfo -o -f /usr/share/misc/terminfo.db ]
+ then
+ terminfo_exists=""
+ else
+@@ -267,16 +267,16 @@ echo "all : $TARGET" >> make.local
cat >> make.local << EOF
curses : ee.c