4 files changed, 50 insertions, 10 deletions

diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index aacac8a65c7e..cac97fb9f1c1 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libraries
 PORTVERSION=	4.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -108,6 +108,7 @@ post-extract:
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 post-patch:
+	${CP} ${MASTERDIR}/files/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
 	cd ${WRKSRC}/nls; \
 	for i in Compose XI18N_OBJS XLC_LOCALE; do \
 		${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
diff --git a/x11/XFree86-4-libraries/files/nls::Compose::microsoft-cp1251 b/x11/XFree86-4-libraries/files/nls::Compose::microsoft-cp1251
new file mode 100644
index 000000000000..b7218bdbc7d9
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/nls::Compose::microsoft-cp1251
@@ -0,0 +1,15 @@
+XCOMM
+XCOMM microsoft-cp1251 Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM $XFree86$
+XCOMM
+XCOMM This file currently has no entries.  It appears that a compose file (even
+XCOMM just an empty one) is required for the appropriate keysyms to work for
+XCOMM this encoding.
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+
+XCOMM End of Sequence Definition
diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f
index bac6e4ebf87a..df0b829586e2 100644
--- a/x11/XFree86-4-libraries/files/patch-f
+++ b/x11/XFree86-4-libraries/files/patch-f
@@ -1,6 +1,14 @@
---- nls/compose.dir.orig	Thu Nov 22 07:29:11 2001
-+++ nls/compose.dir	Sat Jan 19 22:12:13 2002
-@@ -211,7 +211,7 @@
+--- nls/compose.dir.orig	Wed Nov 21 23:29:11 2001
++++ nls/compose.dir	Wed Jul 17 15:05:38 2002
+@@ -62,6 +62,7 @@
+ iso8859-1/Compose:		en_TT.ISO8859-1
+ iso8859-1/Compose:		en_UK.ISO8859-1
+ iso8859-1/Compose:		en_US.ISO8859-1
++iso8859-15/Compose:		en_US.ISO8859-15
+ iso8859-1/Compose:		en_ZA.ISO8859-1
+ iso8859-3/Compose:		eo_XX.ISO8859-3
+ iso8859-1/Compose:		es_AR.ISO8859-1
+@@ -211,7 +212,7 @@
  zh_CN/Compose:			zh_CN.GB2312
  zh_CN.gbk/Compose:		zh_CN.GBK
  zh_TW.big5/Compose:		zh_TW.big5
@@ -34,9 +42,17 @@
  zh_TW.EUC:					zh_TW.eucTW
  
  XCOMM The following locale names are used in SCO 3.0
---- nls/locale.dir.orig	Thu Jan 10 01:14:16 2002
-+++ nls/locale.dir	Sat Jan 19 22:16:56 2002
-@@ -216,7 +216,7 @@
+--- nls/locale.dir.orig	Wed Jan  9 17:14:16 2002
++++ nls/locale.dir	Wed Jul 17 15:06:35 2002
+@@ -68,6 +68,7 @@
+ iso8859-1/XLC_LOCALE:			en_TT.ISO8859-1
+ iso8859-1/XLC_LOCALE:			en_UK.ISO8859-1
+ iso8859-1/XLC_LOCALE:			en_US.ISO8859-1
++iso8859-15/XLC_LOCALE:			en_US.ISO8859-15
+ iso8859-1/XLC_LOCALE:			en_ZA.ISO8859-1
+ iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
+ iso8859-3/XLC_LOCALE:			eo_XX.ISO8859-3
+@@ -216,7 +217,7 @@
  zh_CN.gbk/XLC_LOCALE:			zh_CN.gbk
  zh_HK.big5/XLC_LOCALE:			zh_HK.big5
  zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.big5hkscs
@@ -45,9 +61,16 @@
  zh_TW/XLC_LOCALE:			zh_TW.eucTW
  XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
  en_US.UTF-8/XLC_LOCALE:			af_ZA.UTF-8
---- nls/Compose/Imakefile.orig	Sat Nov  3 08:29:28 2001
-+++ nls/Compose/Imakefile	Sat Jan 19 22:17:40 2002
-@@ -70,5 +70,5 @@
+--- nls/Compose/Imakefile.orig	Sun Nov 24 15:54:38 2002
++++ nls/Compose/Imakefile	Sun Nov 24 15:55:37 2002
+@@ -64,11 +64,12 @@
+ ComposeTarget(koi8-r)
+ ComposeTarget(koi8-u)
+ ComposeTarget(koi8-c)
++ComposeTarget(microsoft-cp1251)
+ ComposeTarget(mulelao-1)
+ ComposeTarget(vi_VN.tcvn)
+ ComposeTarget(vi_VN.viscii)
  ComposeTarget(zh_CN)
  ComposeTarget(zh_CN.gbk)
  ComposeTarget(zh_TW)
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index d07629b00b36..4a48b4141c0b 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -472,6 +472,7 @@ lib/X11/locale/koi8-u/XI18N_OBJS
 lib/X11/locale/koi8-u/XLC_LOCALE
 lib/X11/locale/locale.alias
 lib/X11/locale/locale.dir
+lib/X11/locale/microsoft-cp1251/Compose
 lib/X11/locale/microsoft-cp1251/XI18N_OBJS
 lib/X11/locale/microsoft-cp1251/XLC_LOCALE
 lib/X11/locale/microsoft-cp1255/XI18N_OBJS