From 6b2896886c4b1b56d1b201ee7d3d3a3762a65dd5 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 29 Feb 2008 16:44:55 +0000 Subject: + 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. --- devel/libslang/Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'devel/libslang/Makefile') 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" -- cgit v1.2.3