Changes 1.6.1:

	The gl_event_handler() function had the endif of a
	conditional compilation clause in the wrong place. This
	only upset the compiler on unusual systems that don't
	have select(). The problem was seen under Mac OS X, due
	to the configuration problem in 1.6.0 that caused the
	configure script to mistakenly report that select wasn't
	available.

4 files changed, 19 insertions, 71 deletions

diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index be018a5e4fd..b36952cce3d 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/02/21 14:20:17 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2005/02/21 14:56:07 adam Exp $
 
-DISTNAME=	libtecla-1.5.0
+DISTNAME=	libtecla-1.6.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.astro.caltech.edu/~mcs/tecla/
 
@@ -9,12 +8,17 @@ MAINTAINER=	kristerw@NetBSD.org
 HOMEPAGE=	http://www.astro.caltech.edu/~mcs/tecla/
 COMMENT=	Interactive command line editing facilities
 
-WRKSRC=		${WRKDIR}/${PKGBASE}
-USE_BUILDLINK3=	YES
-USE_GNU_TOOLS+=	make
-GNU_CONFIGURE=	YES
-BUILD_TARGET=	default
+WRKSRC=			${WRKDIR}/${PKGBASE}
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+GNU_CONFIGURE=		yes
+BUILD_TARGET=		default
 
-BUILDLINK_TRANSFORM+=	rm:-D_POSIX_C_SOURCE=199506L
+.include "../../mk/bsd.prefs.mk"
+
+# reentrant causes compilation problems
+.if ${OPSYS} != "SunOS"
+CONFIGURE_ENV+=		tecla_cv_reentrant=no
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtecla/PLIST b/devel/libtecla/PLIST
index 4838e40796a..963c8df9bc6 100644
--- a/devel/libtecla/PLIST
+++ b/devel/libtecla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/31 00:05:19 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/21 14:56:07 adam Exp $
 bin/enhance
 include/libtecla.h
 lib/libtecla.a
@@ -48,8 +48,10 @@ man/man3/gl_lookup_history.3
 man/man3/gl_normal_io.3
 man/man3/gl_pending_io.3
 man/man3/gl_prompt_style.3
+man/man3/gl_query_char.3
 man/man3/gl_range_of_history.3
 man/man3/gl_raw_io.3
+man/man3/gl_read_char.3
 man/man3/gl_register_action.3
 man/man3/gl_resize_history.3
 man/man3/gl_return_status.3
diff --git a/devel/libtecla/distinfo b/devel/libtecla/distinfo
index cea204d1ecf..20acdd5e528 100644
--- a/devel/libtecla/distinfo
+++ b/devel/libtecla/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/01/03 15:46:00 kristerw Exp $
+$NetBSD: distinfo,v 1.3 2005/02/21 14:56:07 adam Exp $
 
-SHA1 (libtecla-1.5.0.tar.gz) = 4b1e34c5afb82d8b1248c954e7c72371323fd075
-Size (libtecla-1.5.0.tar.gz) = 475417 bytes
-SHA1 (patch-aa) = 54b14f41fa19279a349faff06ac14a917132752a
+SHA1 (libtecla-1.6.1.tar.gz) = 99c82990e7a41050211e4a449e50e20ee511c284
+Size (libtecla-1.6.1.tar.gz) = 518995 bytes
diff --git a/devel/libtecla/patches/patch-aa b/devel/libtecla/patches/patch-aa
deleted file mode 100644
index ac3d2ed9182..00000000000
--- a/devel/libtecla/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/01/03 15:46:00 kristerw Exp $
-
---- Makefile.in.orig	Sat Jan  3 16:39:10 2004
-+++ Makefile.in	Sat Jan  3 16:30:06 2004
-@@ -221,7 +221,7 @@
- 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
- 	  for template in man/libr/*.in; do \
- 	    page=`basename "$$template" .in`; \
--	    install-sh -c -m 644 man/libr/$$page ${MANDIR}/@LIBR_MANDIR@/$$page.@LIBR_MANEXT@; \
-+	    $(srcdir)/install-sh -c -m 644 man/libr/$$page ${MANDIR}/@LIBR_MANDIR@/$$page.@LIBR_MANEXT@; \
- 	  done ; \
- 	fi
- 
-@@ -229,7 +229,7 @@
- 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
- 	  for template in man/func/*.in; do \
- 	    page=`basename "$$template" .in`; \
--	    install-sh -c -m 644 man/func/$$page ${MANDIR}/@FUNC_MANDIR@/$$page.@FUNC_MANEXT@; \
-+	    $(srcdir)/install-sh -c -m 644 man/func/$$page ${MANDIR}/@FUNC_MANDIR@/$$page.@FUNC_MANEXT@; \
- 	  done ; \
- 	fi
- 
-@@ -237,7 +237,7 @@
- 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
- 	  for template in man/prog/*.in; do \
- 	    page=`basename "$$template" .in`; \
--	    install-sh -c -m 644 man/prog/$$page ${MANDIR}/@PROG_MANDIR@/$$page.@PROG_MANEXT@; \
-+	    $(srcdir)/install-sh -c -m 644 man/prog/$$page ${MANDIR}/@PROG_MANDIR@/$$page.@PROG_MANEXT@; \
- 	  done ; \
- 	fi
- 
-@@ -245,7 +245,7 @@
- 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
- 	  for template in man/misc/*.in; do \
- 	    page=`basename "$$template" .in`; \
--	    install-sh -c -m 644 man/misc/$$page ${MANDIR}/@MISC_MANDIR@/$$page.@MISC_MANEXT@; \
-+	    $(srcdir)/install-sh -c -m 644 man/misc/$$page ${MANDIR}/@MISC_MANDIR@/$$page.@MISC_MANEXT@; \
- 	  done ; \
- 	fi
- 
-@@ -253,14 +253,14 @@
- 	if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \
- 	  for template in man/file/*.in; do \
- 	    page=`basename "$$template" .in`; \
--	    install-sh -c -m 644 man/file/$$page ${MANDIR}/@FILE_MANDIR@/$$page.@FILE_MANEXT@; \
-+	    $(srcdir)/install-sh -c -m 644 man/file/$$page ${MANDIR}/@FILE_MANDIR@/$$page.@FILE_MANEXT@; \
- 	  done ; \
- 	fi
- 
- install_bin: $(BINDIR) $(PROGRAMS) $(PROGRAMS_R)
- 	progs="$(PROGRAMS) $(PROGRAMS_R)"; \
- 	for prog in $$progs; do \
--	  install-sh -c -m 755 -s $$prog $(BINDIR)/; \
-+	  $(srcdir)/install-sh -c -m 755 -s $$prog $(BINDIR)/; \
- 	done
- 
- install: install_lib install_inc install_man install_bin