+ Pass down the correct values for TERMCAP (the options to link to

  the library containing termcap functions) and MISC_TERMINFO_DIRS
  (the location of the terminfo database).  Patch the configure script
  to use these values instead of using its own broken logic to determine
  the same information.

+ Include termlib.buildlink3.mk to determine the right terminal library
  to use.

The above two changes should fix PR pkg/30725.

+ Move the HTML documentation into ${PREFIX}/share/doc/slang.

Bump the PKGREVISION to 6.

6 files changed, 61 insertions, 22 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 3829bc07825..94f508745af 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.61 2007/06/08 18:39:23 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2008/02/29 16:44:55 jlam Exp $
 #
 
 DISTNAME=	slang-1.4.9
 PKGNAME=	lib${DISTNAME}
 SVR4_PKGNAME=	lslan
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/ \
 		http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \
@@ -22,20 +22,16 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-
 DLOPEN_REQUIRE_PTHREADS=no
 
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/slang
-	${MV} ${DESTDIR}${PREFIX}/share/doc/slang/slangdoc.html \
-		${DESTDIR}${PREFIX}/share/doc/html/slang
-
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/termlib.buildlink3.mk"
 
-# Debian doesn't have -ltermcap, use -lncurses instead
-.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
-BUILDLINK_TRANSFORM+=	rm:-ltermcap
-.  include "../../devel/ncurses/buildlink3.mk"
+.if ${TERMLIB_TYPE} == "termcap"
+CONFIGURE_ENV+=		TERMCAP=${BUILDLINK_LDADD.termlib:Q}
+CONFIGURE_ENV+=		MISC_TERMINFO_DIRS=${PREFIX:Q}/share/terminfo
+.else
+CONFIGURE_ENV+=		TERMCAP=
+CONFIGURE_ENV+=		MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termlib:Q}/share/terminfo
 .endif
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/devel/libslang/PLIST b/devel/libslang/PLIST
index bdd81587873..0e9be030cbe 100644
--- a/devel/libslang/PLIST
+++ b/devel/libslang/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/02/29 16:44:55 jlam Exp $
 include/slcurses.h
 include/slang.h
 lib/libslang.la
-share/doc/html/slang/slangdoc.html
 share/doc/slang/COPYING
 share/doc/slang/COPYING.ART
 share/doc/slang/COPYING.GPL
@@ -11,6 +10,6 @@ share/doc/slang/changes.txt
 share/doc/slang/cref.txt
 share/doc/slang/cslang.txt
 share/doc/slang/slang.txt
+share/doc/slang/slangdoc.html
 share/doc/slang/slangfun.txt
 @dirrm share/doc/slang
-@dirrm share/doc/html/slang
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 83554f3312f..f81af2a2081 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2008/02/29 16:44:55 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
@@ -19,9 +19,6 @@ BUILDLINK_ABI_DEPENDS.libslang+=	libslang>=1.4.9nb4
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
 .endif	# LIBSLANG_BUILDLINK3_MK
 
-# Debian adds a dependency on ncurses.
-.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif
+.include "../../mk/termlib.buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo
index c934aea14f5..eb180d774d9 100644
--- a/devel/libslang/distinfo
+++ b/devel/libslang/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/09/08 19:23:01 kristerw Exp $
+$NetBSD: distinfo,v 1.10 2008/02/29 16:44:55 jlam Exp $
 
 SHA1 (slang-1.4.9.tar.bz2) = 667709eb1bc1b0f68ce36b31204bf8a99d31eefa
 RMD160 (slang-1.4.9.tar.bz2) = bd2c37554129134e4e874502af0ebcb6fc7e151b
 Size (slang-1.4.9.tar.bz2) = 631079 bytes
 SHA1 (patch-aa) = bb8ff1fb65b6e58ff65ef9779e30768faf532268
+SHA1 (patch-ab) = 47f7aa6341072f113cbf138c1206d36dbbc59dc9
 SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5
+SHA1 (patch-ad) = 5d8f0350d473381d5bb0808db60e872b82b0dca4
diff --git a/devel/libslang/patches/patch-ab b/devel/libslang/patches/patch-ab
new file mode 100644
index 00000000000..5f660a50886
--- /dev/null
+++ b/devel/libslang/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.8 2008/02/29 16:44:55 jlam Exp $
+
+--- configure.orig	2003-03-23 02:06:40.000000000 -0500
++++ configure
+@@ -2320,6 +2320,10 @@ EOF
+ 
+ 
+ 
++# pkgsrc will supply definitions for MISC_TERMINFO_DIRS and TERMCAP
++# in order to ensure the correct termcap library is used.
++#
++if false; then
+ echo $ac_n "checking for Terminfo""... $ac_c" 1>&6
+ echo "configure:2325: checking for Terminfo" >&5
+ MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo"
+@@ -2345,6 +2349,7 @@ do
+       break
+    fi
+ done
++fi
+ if test "$TERMCAP"; then
+   echo "$ac_t""no" 1>&6
+   cat >> confdefs.h <<\EOF
diff --git a/devel/libslang/patches/patch-ad b/devel/libslang/patches/patch-ad
new file mode 100644
index 00000000000..eab56e48ed7
--- /dev/null
+++ b/devel/libslang/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2008/02/29 16:44:55 jlam Exp $
+
+--- src/sltermin.c.orig	2003-03-23 02:06:40.000000000 -0500
++++ src/sltermin.c
+@@ -220,14 +220,13 @@ static char *Terminfo_Dirs [] =
+ {
+    NULL, /* $HOME/.terminfo */
+    NULL, /* $TERMINFO */
++#ifdef MISC_TERMINFO_DIRS
++   MISC_TERMINFO_DIRS,
++#endif
+    "/usr/share/terminfo",
+    "/usr/lib/terminfo",
+    "/usr/share/lib/terminfo",
+    "/etc/terminfo",
+-   "/usr/local/lib/terminfo",
+-#ifdef MISC_TERMINFO_DIRS
+-   MISC_TERMINFO_DIRS,
+-#endif
+    ""
+ };
+