Enable multibyte character encodings at configure time, with default to

off. Add a resource file to document how it can be enabled. Add a message
to point at the resource file.

Unfortunately the same method does not work for greek keyboard support,
as the resource handling for this is documented but not implemented in
this rxvt version.

Fixes PR pkg/13273, as good as we can for this rxvt version.

3 files changed, 64 insertions, 2 deletions

diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index a2477bb2309..950cf2ddb3e 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/08/06 03:37:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.26 2001/08/06 06:09:55 martin Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -16,6 +16,7 @@ COMMENT=		Low memory usage xterm replacement that supports color
 USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
+MESSAGE_SUBST+=		X11BASE="${X11BASE}"
 
 CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-wtmp \
@@ -29,9 +30,27 @@ CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-xgetdefault \
 			--enable-frills \
 			--enable-keepscrolling \
-			--enable-mousewheel
+			--enable-mousewheel \
+			--enable-languages \
+			--with-encoding=noenc
+
+# Note: greek support could not be enabled, as the resource file handling
+# to disable it at runtime is documented but not implemented in the current
+# version. See files/Rxvt and check if it works for newer versions. When
+# enabling it, please fix pkg/MESSAGE as well.
+#			--enable-greek
 
 CPPFLAGS+=		-I${BUILDLINK_DIR}/include/X11
 
+post-patch:
+	${MV} ${WRKSRC}/src/feature.h  ${WRKSRC}/src/feature.h.orig
+	${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \
+		-e "s:/usr/lib/X11/app-defaults:${X11BASE}/lib/X11/app-defaults:"
+
+pre-install:
+	if [ ! -f ${X11BASE}/lib/X11/app-defaults/Rxvt ]; then \
+		${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11BASE}/lib/X11/app-defaults; \
+	fi
+
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt/files/Rxvt b/x11/rxvt/files/Rxvt
new file mode 100644
index 00000000000..f80acd9f213
--- /dev/null
+++ b/x11/rxvt/files/Rxvt
@@ -0,0 +1,30 @@
+! $NetBSD: Rxvt,v 1.1 2001/08/06 06:09:56 martin Exp $
+!
+! This is a default Rxvt app defaults file that just disables greek keyboard
+! support and multibyte character encodings. We build rxvt with support
+! for these, but since the current rxvt version does not properly switch
+! these features on or off at runtime, we controll them via resources.
+!
+! To enable one of these features, just comment the current active one
+! and uncomment the one you prefere.
+
+! ---- NOTE -------------------
+! Greek keyboard support is not compiled into rxvt, as the following
+! resource is documented but not implemented in the current version.
+! ---- NOTE -------------------
+! greek keyboard support:
+! default:
+! Rxvt.greek_keyboard:	iso
+! Disable greek keyboard support (by disabling the toggle key):
+! Rxvt.greektoggle_key:	VoidSymbol
+! Enable default greek keyboard support: use ModeSwitch to switch
+! into greek input mode:
+! Rxvt.greektoggle_key:	ModeSwitch
+
+! Select multibyte character sheme
+Rxvt.multichar_encoding:	noenc
+! Rxvt.multichar_encoding:	eucj
+! Rxvt.multichar_encoding:	sjis
+! Rxvt.multichar_encoding:	big5
+! Rxvt.multichar_encoding:	gb
+! Rxvt.multichar_encoding:	kr
diff --git a/x11/rxvt/pkg/MESSAGE b/x11/rxvt/pkg/MESSAGE
new file mode 100644
index 00000000000..c93b593742e
--- /dev/null
+++ b/x11/rxvt/pkg/MESSAGE
@@ -0,0 +1,13 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2001/08/06 06:09:56 martin Exp $
+
+The rxvt binary is able to use greek keyboard extensions and
+multibyte character encodings. Due to errors in the current
+version, the greek keyboard support is not compiled into the
+binary (it can not be disabled at runtime and causes problems
+for users in other locales).
+
+The multibyte character encoding support is compiled in, but
+by default disabled. To enable it, please edit the file 
+${X11BASE}/lib/X11/app-defaults/Rxvt.
+======================================================================