[pkgsrc/trunk]: pkgsrc/x11/rxvt-unicode Do not force useage of "rxvt" as $TER...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4775d76b65b0
branches:  trunk
changeset: 522616:4775d76b65b0
user:      martin <martin%pkgsrc.org@localhost>
date:      Fri Dec 15 16:01:16 2006 +0000

description:
Do not force useage of "rxvt" as $TERM by default, but make it an
option. Also add a hint to the runtime override.
Fixes PR pkg/34605.

diffstat:

 x11/rxvt-unicode/MESSAGE    |  10 ++++++++++
 x11/rxvt-unicode/Makefile   |   3 +--
 x11/rxvt-unicode/options.mk |  25 ++++++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diffs (82 lines):

diff -r 550ac3563382 -r 4775d76b65b0 x11/rxvt-unicode/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/rxvt-unicode/MESSAGE  Fri Dec 15 16:01:16 2006 +0000
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/12/15 16:01:16 martin Exp $
+
+If your system does not have a rxvt-unicode termcap entry, you may consider
+setting the X resource
+
+       URxvt.termName: rxvt
+
+or recompile this pkg with the option rxvt-term defined.
+===========================================================================
diff -r 550ac3563382 -r 4775d76b65b0 x11/rxvt-unicode/Makefile
--- a/x11/rxvt-unicode/Makefile Fri Dec 15 15:03:49 2006 +0000
+++ b/x11/rxvt-unicode/Makefile Fri Dec 15 16:01:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 15:01:30 martin Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 16:01:16 martin Exp $
 #
 
 DISTNAME=              rxvt-unicode-8.1
@@ -19,7 +19,6 @@
                        --enable-menubar        \
                        --enable-xpm-background \
                        --enable-xgetdefault    \
-                       --with-term=rxvt        \
                        --enable-24bit
 
 post-install:
diff -r 550ac3563382 -r 4775d76b65b0 x11/rxvt-unicode/options.mk
--- a/x11/rxvt-unicode/options.mk       Fri Dec 15 15:03:49 2006 +0000
+++ b/x11/rxvt-unicode/options.mk       Fri Dec 15 16:01:16 2006 +0000
@@ -1,33 +1,36 @@
 #
-# $Id: options.mk,v 1.1 2006/12/15 15:01:30 martin Exp $
+# $Id: options.mk,v 1.2 2006/12/15 16:01:16 martin Exp $
 #
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.rxvt-unicode
-PKG_SUPPORTED_OPTIONS=  perl unicode3 xft2
+PKG_SUPPORTED_OPTIONS=  perl unicode3 xft2 rxvt-term
 PKG_SUGGESTED_OPTIONS=  perl unicode3 xft2
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mrxvt-term)
+CONFIGURE_ARGS+=       --with-term=rxvt
+.endif
+
 .if !empty(PKG_OPTIONS:Mperl)
-CONFIGURE_ARGS+=        --enable-perl
-PLIST_SUBST+=           PERL=
+CONFIGURE_ARGS+=       --enable-perl
+PLIST_SUBST+=          PERL=
 .include "../../lang/perl5/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=        --disable-perl
-PLIST_SUBST+=           PERL='@comment '
+CONFIGURE_ARGS+=       --disable-perl
+PLIST_SUBST+=          PERL='@comment '
 .endif
 
 # use 21 instead of 16 bits to represent unicode characters
 .if !empty(PKG_OPTIONS:Municode3)
-CONFIGURE_ARGS+=        --enable-unicode3
+CONFIGURE_ARGS+=       --enable-unicode3
 .else
-CONFIGURE_ARGS+=        --disable-unicode3
+CONFIGURE_ARGS+=       --disable-unicode3
 .endif
 
 .if !empty(PKG_OPTIONS:Mxft2)
-CONFIGURE_ARGS+=        --enable-xft
+CONFIGURE_ARGS+=       --enable-xft
 .include "../../fonts/Xft2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=        --disable-xft
+CONFIGURE_ARGS+=       --disable-xft
 .endif
-