From 193cd55b223f3ba7fea02249d57acd7e7031e707 Mon Sep 17 00:00:00 2001 From: he Date: Fri, 17 Sep 2004 07:57:51 +0000 Subject: Contrary to what I stated previously, the terminfo library is installed on 2.0_BETA. Based on a tip from Thomas Klausner, make the PLIST entries for the terminfo library conditional, and they're then effectively commented out on NetBSD 1.6.* (tested/verified) and 1.5.* (so far untested). --- graphics/libggi/Makefile | 12 +++++++++++- graphics/libggi/PLIST | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'graphics') diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index 5bfb7c7d53a..bbbf8708947 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/04/16 17:39:32 xtraeme Exp $ +# $NetBSD: Makefile,v 1.29 2004/09/17 07:57:51 he Exp $ # DISTNAME= libggi-2.0.4.src @@ -30,6 +30,16 @@ CONF_FILES= ${EGDIR}/libggi.conf ${PKG_SYSCONFDIR}/libggi.conf .include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "NetBSD" +.if !empty(OS_VERSION:M1.[56].*) +PLIST_SUBST+= COND_TERMINFO="@comment " +.else +PLIST_SUBST+= COND_TERMINFO="" +.endif +.else +PLIST_SUBST+= COND_TERMINFO="" +.endif + .if exists(${X11BASE}/include/X11/extensions/xf86dga.h) # # it would be more logical to set PLIST_SRC to PLIST first and then add diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST index 3ef6a234abd..276ac616d1a 100644 --- a/graphics/libggi/PLIST +++ b/graphics/libggi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/16 22:29:10 he Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/09/17 07:57:51 he Exp $ bin/cube3d bin/ggiteleserver bin/monitest @@ -121,6 +121,9 @@ lib/ggi/display/sub.so lib/ggi/display/tele.a lib/ggi/display/tele.la lib/ggi/display/tele.so +${COND_TERMINFO}lib/ggi/display/terminfo.a +${COND_TERMINFO}lib/ggi/display/terminfo.la +${COND_TERMINFO}lib/ggi/display/terminfo.so lib/ggi/display/tile.a lib/ggi/display/tile.la lib/ggi/display/tile.so -- cgit v1.2.3