Fix the awful error in the fontset specifications for several languages.

PR:		ports/18054
Submitted by:	Dmitry Sivachenko <dima@Chg.RU>

8 files changed, 24 insertions, 16 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 1dc28d5448c4..c31fa7476a09 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -33,6 +33,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gtk12-config.1
 
 pre-build:
+	${PERL} -i -pe 's/\\"$$/\\/' ${WRKSRC}/gtk/gtkrc.*
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-af b/x11-toolkits/gtk12/files/patch-af
index 8a8855da671e..383313abc77d 100644
--- a/x11-toolkits/gtk12/files/patch-af
+++ b/x11-toolkits/gtk12/files/patch-af
@@ -1,11 +1,12 @@
---- gtk/gtkrc.ru.orig	Wed Feb 16 13:18:08 2000
-+++ gtk/gtkrc.ru	Fri Feb 18 19:35:43 2000
+--- gtk/gtkrc.ru.orig	Wed Feb 16 20:18:08 2000
++++ gtk/gtkrc.ru	Tue Apr 25 19:22:20 2000
 @@ -1,7 +1,7 @@
  style "gtk-default-ru" {
         fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
+-                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
 -                  -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
-+                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
                    -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
  }
  class "GtkWidget" style "gtk-default-ru"
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 1dc28d5448c4..c31fa7476a09 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -33,6 +33,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gtk12-config.1
 
 pre-build:
+	${PERL} -i -pe 's/\\"$$/\\/' ${WRKSRC}/gtk/gtkrc.*
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk13/files/patch-af b/x11-toolkits/gtk13/files/patch-af
index 8a8855da671e..383313abc77d 100644
--- a/x11-toolkits/gtk13/files/patch-af
+++ b/x11-toolkits/gtk13/files/patch-af
@@ -1,11 +1,12 @@
---- gtk/gtkrc.ru.orig	Wed Feb 16 13:18:08 2000
-+++ gtk/gtkrc.ru	Fri Feb 18 19:35:43 2000
+--- gtk/gtkrc.ru.orig	Wed Feb 16 20:18:08 2000
++++ gtk/gtkrc.ru	Tue Apr 25 19:22:20 2000
 @@ -1,7 +1,7 @@
  style "gtk-default-ru" {
         fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
+-                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
 -                  -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
-+                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
                    -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
  }
  class "GtkWidget" style "gtk-default-ru"
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 1dc28d5448c4..c31fa7476a09 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -33,6 +33,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gtk12-config.1
 
 pre-build:
+	${PERL} -i -pe 's/\\"$$/\\/' ${WRKSRC}/gtk/gtkrc.*
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/files/patch-af b/x11-toolkits/gtk20/files/patch-af
index 8a8855da671e..383313abc77d 100644
--- a/x11-toolkits/gtk20/files/patch-af
+++ b/x11-toolkits/gtk20/files/patch-af
@@ -1,11 +1,12 @@
---- gtk/gtkrc.ru.orig	Wed Feb 16 13:18:08 2000
-+++ gtk/gtkrc.ru	Fri Feb 18 19:35:43 2000
+--- gtk/gtkrc.ru.orig	Wed Feb 16 20:18:08 2000
++++ gtk/gtkrc.ru	Tue Apr 25 19:22:20 2000
 @@ -1,7 +1,7 @@
  style "gtk-default-ru" {
         fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
+-                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
 -                  -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
-+                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
                    -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
  }
  class "GtkWidget" style "gtk-default-ru"
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 1dc28d5448c4..c31fa7476a09 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -33,6 +33,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gtk12-config.1
 
 pre-build:
+	${PERL} -i -pe 's/\\"$$/\\/' ${WRKSRC}/gtk/gtkrc.*
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk30/files/patch-af b/x11-toolkits/gtk30/files/patch-af
index 8a8855da671e..383313abc77d 100644
--- a/x11-toolkits/gtk30/files/patch-af
+++ b/x11-toolkits/gtk30/files/patch-af
@@ -1,11 +1,12 @@
---- gtk/gtkrc.ru.orig	Wed Feb 16 13:18:08 2000
-+++ gtk/gtkrc.ru	Fri Feb 18 19:35:43 2000
+--- gtk/gtkrc.ru.orig	Wed Feb 16 20:18:08 2000
++++ gtk/gtkrc.ru	Tue Apr 25 19:22:20 2000
 @@ -1,7 +1,7 @@
  style "gtk-default-ru" {
         fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
+-                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
 -                  -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
-+                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
                    -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
  }
  class "GtkWidget" style "gtk-default-ru"