elf does't actually use curses, termcap or terminfo.

4 files changed, 138 insertions, 6 deletions

diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index a7a5ed965dc..ce835dc6f04 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2013/10/16 12:32:17 roy Exp $
 #
 
 DISTNAME=	elf-0.5.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_BACKUP} \
 		http://www.kerneled.com/projects/elf/
@@ -22,7 +22,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/elf ${DESTDIR:Q}${PREFIX:Q}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/elf.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1
 
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/elf/distinfo b/devel/elf/distinfo
index 52b6e3f70a6..67371378bf0 100644
--- a/devel/elf/distinfo
+++ b/devel/elf/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/10/31 19:21:47 sbd Exp $
+$NetBSD: distinfo,v 1.4 2013/10/16 12:32:17 roy Exp $
 
 SHA1 (elf-0.5.3.tar.gz) = 7cf3ea7d098b239c7b70405a2641dfcd55a49c37
 RMD160 (elf-0.5.3.tar.gz) = f3198b4183c9bd6d288013847e525c21c972afff
 Size (elf-0.5.3.tar.gz) = 43552 bytes
-SHA1 (patch-aa) = a8e3d3e981e14fc3b3d51d7a9113f8a75225f2dc
+SHA1 (patch-aa) = d5b4ab57a5442c499839c705c81e5370f5d2bba0
+SHA1 (patch-configure) = ece37ad216857d56b6e4e67d593871c798626f75
+SHA1 (patch-configure.in) = 0347b9e69632e12018e40e50c66d8a141346b2a3
diff --git a/devel/elf/patches/patch-configure b/devel/elf/patches/patch-configure
new file mode 100644
index 00000000000..a1ce462e519
--- /dev/null
+++ b/devel/elf/patches/patch-configure
@@ -0,0 +1,118 @@
+$NetBSD: patch-configure,v 1.1 2013/10/16 12:32:18 roy Exp $
+
+--- configure.orig	2013-10-16 12:26:43.000000000 +0000
++++ configure
+@@ -1749,56 +1749,6 @@ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:1752: checking for main in -lcurses" >&5
+-echo $ECHO_N "checking for main in -lcurses... $ECHO_C" >&6
+-if test "${ac_cv_lib_curses_main+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcurses  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 1760 "configure"
+-#include "confdefs.h"
+-
+-int
+-main ()
+-{
+-main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:1772: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1775: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:1778: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1781: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_curses_main=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_curses_main=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:1792: result: $ac_cv_lib_curses_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_curses_main" >&6
+-if test $ac_cv_lib_curses_main = yes; then
+-  cat >>confdefs.h <<EOF
+-#define HAVE_LIBCURSES 1
+-EOF
+-
+-  LIBS="-lcurses $LIBS"
+-
+-fi
+ 
+ echo "$as_me:1803: checking for main in -ledit" >&5
+ echo $ECHO_N "checking for main in -ledit... $ECHO_C" >&6
+@@ -1851,56 +1801,6 @@ EOF
+ 
+ fi
+ 
+-echo "$as_me:1854: checking for main in -lncurses" >&5
+-echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6
+-if test "${ac_cv_lib_ncurses_main+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lncurses  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 1862 "configure"
+-#include "confdefs.h"
+-
+-int
+-main ()
+-{
+-main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:1874: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1877: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:1880: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1883: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_ncurses_main=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_ncurses_main=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:1894: result: $ac_cv_lib_ncurses_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6
+-if test $ac_cv_lib_ncurses_main = yes; then
+-  cat >>confdefs.h <<EOF
+-#define HAVE_LIBNCURSES 1
+-EOF
+-
+-  LIBS="-lncurses $LIBS"
+-
+-fi
+ 
+ echo "$as_me:1905: checking for main in -lreadline" >&5
+ echo $ECHO_N "checking for main in -lreadline... $ECHO_C" >&6
diff --git a/devel/elf/patches/patch-configure.in b/devel/elf/patches/patch-configure.in
new file mode 100644
index 00000000000..8f84adcfaa1
--- /dev/null
+++ b/devel/elf/patches/patch-configure.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure.in,v 1.1 2013/10/16 12:32:18 roy Exp $
+
+--- configure.in.orig	2013-10-16 12:26:35.000000000 +0000
++++ configure.in
+@@ -6,9 +6,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
+-AC_CHECK_LIB([curses], [main])
+ AC_CHECK_LIB([edit], [main])
+-AC_CHECK_LIB([ncurses], [main])
+ AC_CHECK_LIB([readline], [main])
+ 
+ AC_HEADER_STDC