Index: head/x11/xterm/pkg-message
===================================================================
--- head/x11/xterm/pkg-message	(revision 398734)
+++ head/x11/xterm/pkg-message	(nonexistent)
@@ -1,10 +0,0 @@
-================================================================================
-You installed xterm with wide chars support. This introduces some limitations
-comparing to the plain single chars version: this version of xterm will use
-UTF-8 charset for selection buffers, breaking 8-bit copy/paste support unless
-you are using UTF-8 or ISO8859-1 locale. If you want 8-bit charset selections to
-work as before, use "eightBitSelectTypes" XTerm resource setting.
-
-For further information refer to the SELECT/PASTE section of xterm(1) manual
-page.
-================================================================================

Property changes on: head/x11/xterm/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/x11/xterm/Makefile
===================================================================
--- head/x11/xterm/Makefile	(revision 398734)
+++ head/x11/xterm/Makefile	(revision 398735)
@@ -1,91 +1,84 @@
 # Created by: krion
 # $FreeBSD$
 
 PORTNAME=	xterm
 PORTVERSION=	320
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/:src1 \
 		LOCAL/ehaupt:src1 LOCAL/ehaupt:src2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src1 \
 		bsd-xterm-icons-${ICONVERSION}${EXTRACT_SUFX}:src2
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Terminal emulator for the X Window System
 
 LICENSE=	MIT
 
 CONFLICTS=	x11iraf-[0-9]*
 
 USES=		tar:tgz
 USE_XORG=	xft
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-utempter --enable-narrowproto
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 ICONVERSION=	1
 
 OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME LOGGING
 OPTIONS_RADIO=	3D
 OPTIONS_RADIO_3D=	XAW3D XAW3DXFT NEXTAW
 
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
 LUIT_DESC=	Use LUIT for locale convertion from/to UTF-8
 SIXEL_DESC=	Enable Sixel graphics support
 WCHAR_DESC=	Enable wide-character support
 256COLOR_DESC=	Enable 256-color support
 LOGGING_DESC=	Enable logging terminal I/O to a file
 XAW3D_DESC=	Link with Xaw 3d library
 XAW3DXFT_DESC=	Link with Xaw 3d xft (extended fonts) library
 NEXTAW_DESC=	Link with neXT Athena library
 
 OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
 
 256COLOR_CONFIGURE_ENABLE=	256-color
 LUIT_BUILD_DEPENDS=		luit:${PORTSDIR}/x11/luit
 LUIT_CONFIGURE_ENABLE=		luit
 WCHAR_CONFIGURE_ENABLE=		wide-chars
+WCHAR_VARS=			PKGMESSAGE="${PKGDIR}/pkg-message.wchar"
 DECTERM_CONFIGURE_ENABLE=	dec-locator
 PCRE_CONFIGURE_WITH=		pcre
 PCRE_LIB_DEPENDS=		libpcre.so:${PORTSDIR}/devel/pcre
 DABBREV_CONFIGURE_ENABLE=	dabbrev
 SIXEL_CONFIGURE_ENABLE=		sixel-graphics
 GNOME_USES=			desktop-file-utils
 LOGGING_CONFIGURE_ENABLE=	logging
 XAW3D_CONFIGURE_WITH=		Xaw3d
 XAW3D_LIB_DEPENDS=		libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
 XAW3DXFT_CONFIGURE_WITH=	Xaw3dxft
 XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft
 NEXTAW_CONFIGURE_WITH=		neXtaw
 NEXTAW_LIB_DEPENDS=		libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MXAW3D} && ! ${PORT_OPTIONS:MXAW3DXFT} && ! ${PORT_OPTIONS:MNEXTAW}
 USE_XORG+=	xaw
 .endif
 
-.if ${OSVERSION} < 900004
-LIB_DEPENDS+=	libutempter.so:${PORTSDIR}/sysutils/libutempter
-.endif
-
 post-extract:
 	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
 		${WRKDIR}/bsd-xterm-icons-1/*.xpm \
 			${WRKSRC}/icons/
 
 post-install:
 .for f in koi8rxterm resize uxterm xterm
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/xterm.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
-
-.if ${PORT_OPTIONS:MWCHAR}
-	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>
Index: head/x11/xterm/pkg-message.wchar
===================================================================
--- head/x11/xterm/pkg-message.wchar	(nonexistent)
+++ head/x11/xterm/pkg-message.wchar	(revision 398735)
@@ -0,0 +1,10 @@
+================================================================================
+You installed xterm with wide chars support. This introduces some limitations
+comparing to the plain single chars version: this version of xterm will use
+UTF-8 charset for selection buffers, breaking 8-bit copy/paste support unless
+you are using UTF-8 or ISO8859-1 locale. If you want 8-bit charset selections to
+work as before, use "eightBitSelectTypes" XTerm resource setting.
+
+For further information refer to the SELECT/PASTE section of xterm(1) manual
+page.
+================================================================================

Property changes on: head/x11/xterm/pkg-message.wchar
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property