[pkgsrc/trunk]: pkgsrc/www + Include termcap.buildlink3.mk instead of using $...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a76295f708f1
branches:  trunk
changeset: 539436:a76295f708f1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 05 18:01:50 2008 +0000

description:
+ 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.

diffstat:

 www/w3m-img/Makefile    |   4 ++--
 www/w3m/Makefile        |   4 ++--
 www/w3m/Makefile.common |  16 ++++------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diffs (71 lines):

diff -r e6bfaa8da642 -r a76295f708f1 www/w3m-img/Makefile
--- a/www/w3m-img/Makefile      Wed Mar 05 17:38:58 2008 +0000
+++ b/www/w3m-img/Makefile      Wed Mar 05 18:01:50 2008 +0000
@@ -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 -r e6bfaa8da642 -r a76295f708f1 www/w3m/Makefile
--- a/www/w3m/Makefile  Wed Mar 05 17:38:58 2008 +0000
+++ b/www/w3m/Makefile  Wed Mar 05 18:01:50 2008 +0000
@@ -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 -r e6bfaa8da642 -r a76295f708f1 www/w3m/Makefile.common
--- a/www/w3m/Makefile.common   Wed Mar 05 17:38:58 2008 +0000
+++ b/www/w3m/Makefile.common   Wed Mar 05 18:01:50 2008 +0000
@@ -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 @@
 
 .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-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 @@
 .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"