Fri Feb 29 16:44:55 2008 UTC ()
+ 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.


(jlam)
diff -r1.61 -r1.62 pkgsrc/devel/libslang/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/libslang/PLIST
diff -r1.13 -r1.14 pkgsrc/devel/libslang/buildlink3.mk
diff -r1.9 -r1.10 pkgsrc/devel/libslang/distinfo
diff -r0 -r1.8 pkgsrc/devel/libslang/patches/patch-ab
diff -r0 -r1.1 pkgsrc/devel/libslang/patches/patch-ad
cvs diff -r1.61 -r1.62 pkgsrc/devel/libslang/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libslang/Makefile 2007/06/08 18:39:23 1.61
+++ pkgsrc/devel/libslang/Makefile 2008/02/29 16:44:55 1.62
@@ -1,42 +1,38 @@ @@ -1,42 +1,38 @@
1# $NetBSD: Makefile,v 1.61 2007/06/08 18:39:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.62 2008/02/29 16:44:55 jlam Exp $
2# 2#
3 3
4DISTNAME= slang-1.4.9 4DISTNAME= slang-1.4.9
5PKGNAME= lib${DISTNAME} 5PKGNAME= lib${DISTNAME}
6SVR4_PKGNAME= lslan 6SVR4_PKGNAME= lslan
7PKGREVISION= 5 7PKGREVISION= 6
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ 9MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
10 http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \ 10 http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \
11 ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \ 11 ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \
12 ftp://ftp.plig.org/pub/slang/v1.4/ 12 ftp://ftp.plig.org/pub/slang/v1.4/
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.s-lang.org/ 16HOMEPAGE= http://www.s-lang.org/
17COMMENT= Routines for rapid alpha-numeric terminal applications development 17COMMENT= Routines for rapid alpha-numeric terminal applications development
18 18
19PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
21 21
22USE_TOOLS+= gmake 22USE_TOOLS+= gmake
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25 
26DLOPEN_REQUIRE_PTHREADS=no 25DLOPEN_REQUIRE_PTHREADS=no
27 26
28post-install: 27.include "../../mk/termlib.buildlink3.mk"
29 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/slang 28
30 ${MV} ${DESTDIR}${PREFIX}/share/doc/slang/slangdoc.html \ 29.if ${TERMLIB_TYPE} == "termcap"
31 ${DESTDIR}${PREFIX}/share/doc/html/slang 30CONFIGURE_ENV+= TERMCAP=${BUILDLINK_LDADD.termlib:Q}
32 31CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${PREFIX:Q}/share/terminfo
33.include "../../mk/bsd.prefs.mk" 32.else
34 33CONFIGURE_ENV+= TERMCAP=
35# Debian doesn't have -ltermcap, use -lncurses instead 34CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termlib:Q}/share/terminfo
36.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian") 
37BUILDLINK_TRANSFORM+= rm:-ltermcap 
38. include "../../devel/ncurses/buildlink3.mk" 
39.endif 35.endif
40 36
41.include "../../mk/dlopen.buildlink3.mk" 37.include "../../mk/dlopen.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/libslang/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/libslang/PLIST 2004/09/22 08:09:28 1.2
+++ pkgsrc/devel/libslang/PLIST 2008/02/29 16:44:55 1.3
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:28 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/02/29 16:44:55 jlam Exp $
2include/slcurses.h 2include/slcurses.h
3include/slang.h 3include/slang.h
4lib/libslang.la 4lib/libslang.la
5share/doc/html/slang/slangdoc.html 
6share/doc/slang/COPYING 5share/doc/slang/COPYING
7share/doc/slang/COPYING.ART 6share/doc/slang/COPYING.ART
8share/doc/slang/COPYING.GPL 7share/doc/slang/COPYING.GPL
9share/doc/slang/COPYRIGHT 8share/doc/slang/COPYRIGHT
10share/doc/slang/changes.txt 9share/doc/slang/changes.txt
11share/doc/slang/cref.txt 10share/doc/slang/cref.txt
12share/doc/slang/cslang.txt 11share/doc/slang/cslang.txt
13share/doc/slang/slang.txt 12share/doc/slang/slang.txt
 13share/doc/slang/slangdoc.html
14share/doc/slang/slangfun.txt 14share/doc/slang/slangfun.txt
15@dirrm share/doc/slang 15@dirrm share/doc/slang
16@dirrm share/doc/html/slang 
cvs diff -r1.13 -r1.14 pkgsrc/devel/libslang/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/libslang/buildlink3.mk 2006/12/12 21:52:35 1.13
+++ pkgsrc/devel/libslang/buildlink3.mk 2008/02/29 16:44:55 1.14
@@ -1,27 +1,24 @@ @@ -1,27 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:35 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2008/02/29 16:44:55 jlam Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+ 4LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8.if !empty(BUILDLINK_DEPTH:M+) 8.if !empty(BUILDLINK_DEPTH:M+)
9BUILDLINK_DEPENDS+= libslang 9BUILDLINK_DEPENDS+= libslang
10.endif 10.endif
11 11
12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang} 12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang}
13BUILDLINK_PACKAGES+= libslang 13BUILDLINK_PACKAGES+= libslang
14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang 14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang
15 15
16.if !empty(LIBSLANG_BUILDLINK3_MK:M+) 16.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
17BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1 17BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1
18BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 18BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4
19BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang 19BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
20.endif # LIBSLANG_BUILDLINK3_MK 20.endif # LIBSLANG_BUILDLINK3_MK
21 21
22# Debian adds a dependency on ncurses. 22.include "../../mk/termlib.buildlink3.mk"
23.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian") 
24. include "../../devel/ncurses/buildlink3.mk" 
25.endif 
26 23
27BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.9 -r1.10 pkgsrc/devel/libslang/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libslang/distinfo 2006/09/08 19:23:01 1.9
+++ pkgsrc/devel/libslang/distinfo 2008/02/29 16:44:55 1.10
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.9 2006/09/08 19:23:01 kristerw Exp $ 1$NetBSD: distinfo,v 1.10 2008/02/29 16:44:55 jlam Exp $
2 2
3SHA1 (slang-1.4.9.tar.bz2) = 667709eb1bc1b0f68ce36b31204bf8a99d31eefa 3SHA1 (slang-1.4.9.tar.bz2) = 667709eb1bc1b0f68ce36b31204bf8a99d31eefa
4RMD160 (slang-1.4.9.tar.bz2) = bd2c37554129134e4e874502af0ebcb6fc7e151b 4RMD160 (slang-1.4.9.tar.bz2) = bd2c37554129134e4e874502af0ebcb6fc7e151b
5Size (slang-1.4.9.tar.bz2) = 631079 bytes 5Size (slang-1.4.9.tar.bz2) = 631079 bytes
6SHA1 (patch-aa) = bb8ff1fb65b6e58ff65ef9779e30768faf532268 6SHA1 (patch-aa) = bb8ff1fb65b6e58ff65ef9779e30768faf532268
 7SHA1 (patch-ab) = 47f7aa6341072f113cbf138c1206d36dbbc59dc9
7SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5 8SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5
 9SHA1 (patch-ad) = 5d8f0350d473381d5bb0808db60e872b82b0dca4
File Added: pkgsrc/devel/libslang/patches/patch-ab
$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
File Added: pkgsrc/devel/libslang/patches/patch-ad
$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
    ""
 };