Heimdal really uses termcap

4 files changed, 97 insertions, 4 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 118cc76f3e8..ee1a6528763 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2013/08/24 16:45:08 richard Exp $
+# $NetBSD: Makefile,v 1.104 2013/10/11 16:21:40 roy Exp $
 
 DISTNAME=	heimdal-1.5.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.h5l.org/dist/src/
 
@@ -103,7 +103,7 @@ pre-build:
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 504f9056c1e..8fb59df448d 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2013/08/16 08:30:14 adam Exp $
+$NetBSD: distinfo,v 1.39 2013/10/11 16:21:40 roy Exp $
 
 SHA1 (heimdal-1.5.3.tar.gz) = 23f39a099ae862dce1f5f4e5c3720861849a4bd0
 RMD160 (heimdal-1.5.3.tar.gz) = 834660b4c0fe81a3aac4ffd9d8d37d74add1fa70
@@ -13,4 +13,6 @@ SHA1 (patch-lib_hcrypto_libtommath_tommath.h) = 60f223bb23145854f2a144da9e0a9484
 SHA1 (patch-lib_hcrypto_libtommath_tommath_class.h) = 8c7b1e8d30cda79fd59a8ef83094a611b47a43df
 SHA1 (patch-lib_hcrypto_libtommath_tommath_superclass.h) = 141e75b5b310446694769b16a977fa5b25160fbd
 SHA1 (patch-lib_libedit_aclocal.m4) = c50025a3b9bcae9913adab251169462dbc0f3221
+SHA1 (patch-lib_libedit_configure) = c029c471d68d389e67e1cc636a352a004fd6124e
+SHA1 (patch-lib_libedit_configure.ac) = 588b184615a80ab85d7c3624c6c05860c8e6feb0
 SHA1 (patch-lib_otp_Makefile.in) = 0fe1426000824614f0e31d3ab2348948f3f414d3
diff --git a/security/heimdal/patches/patch-lib_libedit_configure b/security/heimdal/patches/patch-lib_libedit_configure
new file mode 100644
index 00000000000..ac392056518
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_libedit_configure
@@ -0,0 +1,71 @@
+$NetBSD: patch-lib_libedit_configure,v 1.1 2013/10/11 16:21:40 roy Exp $
+
+Include termcap in the termcap test
+
+--- lib/libedit/configure.orig	2013-10-11 15:50:12.000000000 +0000
++++ lib/libedit/configure
+@@ -11603,7 +11603,50 @@ test -n "$NROFF" || NROFF="/bin/false"
+ 
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
++$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
++if test "${ac_cv_lib_curses_termcap+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltermcap  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char tgetent ();
++int
++main ()
++{
++return tgetent ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_termcap_tgetent=yes
++else
++  ac_cv_lib_termcap_tgetent=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
++$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
++if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBTERMCAP 1
++_ACEOF
++
++  LIBS="-ltermcap $LIBS"
++
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
+ $as_echo_n "checking for tgetent in -lcurses... " >&6; }
+ if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
+@@ -11692,11 +11735,12 @@ _ACEOF
+   LIBS="-lncurses $LIBS"
+ 
+ else
+-  as_fn_error "libcurses or libncurses are required!" "$LINENO" 5
++  as_fn_error "libtermcap, libcurses or libncurses are required!" "$LINENO" 5
+ fi
+ 
+ fi
+ 
++fi
+ 
+ 
+ ### use option --enable-widec to turn on use of wide-character support
diff --git a/security/heimdal/patches/patch-lib_libedit_configure.ac b/security/heimdal/patches/patch-lib_libedit_configure.ac
new file mode 100644
index 00000000000..04fc587216e
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_libedit_configure.ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib_libedit_configure.ac,v 1.1 2013/10/11 16:21:40 roy Exp $
+
+Include termcap in the termcap test
+
+--- lib/libedit/configure.ac.orig	2013-10-11 15:50:21.000000000 +0000
++++ lib/libedit/configure.ac
+@@ -33,9 +33,10 @@ AC_PROG_AWK
+ EL_MANTYPE
+ 
+ 
+-AC_CHECK_LIB(curses, tgetent,,
+-   [AC_CHECK_LIB(ncurses, tgetent,,
+-      [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
++AC_CHECK_LIB(termcap, tgetent,,
++   [AC_CHECK_LIB(curses, tgetent,,
++      [AC_CHECK_LIB(ncurses, tgetent,,
++         [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )] )
+ 
+ 
+ ### use option --enable-widec to turn on use of wide-character support