+ Include termcap.buildlink3.mk instead of using ${OPSYS} to guess at

  the right terminal library.

Bump the PKGREVISION of www/w3m and www/w3m-img to 2.

3 files changed, 8 insertions, 16 deletions

diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index 2716568982d..ae5842882a2 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2008/01/18 05:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/05 18:01:50 jlam Exp $
 #
 
 PKGNAME=	w3m-img-${W3M_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Multilingualized version of a pager/text-based browser w3m with inline image support
 
 CONFLICTS+=	w3m-[0-9]*
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index ae8a5d84455..a5c57af31a0 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2008/01/18 05:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.55 2008/03/05 18:01:50 jlam Exp $
 #
 
 PKGNAME=	w3m-${W3M_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=	w3m-img-[0-9]*
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 479424540c3..9ad9f0c7464 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2007/06/02 02:35:42 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.48 2008/03/05 18:01:50 jlam Exp $
 #
 
 DISTNAME=	w3m-${W3M_VERS}
@@ -28,15 +28,6 @@ _W3M_USE_IMAGE?=	NO
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--with-termlib=curses
-.elif ${OPSYS} == "Linux"
-.include "../../mk/curses.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-termlib=ncurses
-.else
-CONFIGURE_ARGS+=	--with-termlib=termcap
-.endif
-
 # Configurable by environment variables at run-time.
 CONFIGURE_ARGS+=	--with-charset=US-ASCII
 
@@ -48,8 +39,9 @@ CONFIGURE_ARGS+=	--enable-color
 CONFIGURE_ARGS+=	--enable-cookie
 CONFIGURE_ARGS+=	--enable-mouse
 CONFIGURE_ARGS+=	--with-browser=
+CONFIGURE_ARGS+=	--with-termlib
 CONFIGURE_ARGS+=	--with-editor=vi
-CONFIGURE_ARGS+=	--with-gc=${BUILDLINK_PREFIX.boehm-gc}
+CONFIGURE_ARGS+=	--with-gc=${BUILDLINK_PREFIX.boehm-gc:Q}
 CONFIGURE_ARGS+=	--with-mailer=${MAIL_CMD:Q}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -80,5 +72,5 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"