xorg-font-winitzki-cyrillic, maj 1.0.3-1

6 files changed, 21 insertions, 24 deletions

diff --git a/xorg/xorg-font-winitzki-cyrillic/.footprint.i686 b/xorg/xorg-font-winitzki-cyrillic/.footprint.i686
index efa097d8b..6abb7d4f7 100644
--- a/xorg/xorg-font-winitzki-cyrillic/.footprint.i686
+++ b/xorg/xorg-font-winitzki-cyrillic/.footprint.i686
@@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/X11/
-drwxr-xr-x	root/root	usr/lib/X11/fonts/
-drwxr-xr-x	root/root	usr/lib/X11/fonts/cyrillic/
--rw-r--r--	root/root	usr/lib/X11/fonts/cyrillic/proof9x16.pcf.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/fonts/
+drwxr-xr-x	root/root	usr/share/fonts/X11/
+drwxr-xr-x	root/root	usr/share/fonts/X11/cyrillic/
+-rw-r--r--	root/root	usr/share/fonts/X11/cyrillic/proof9x16.pcf.gz
diff --git a/xorg/xorg-font-winitzki-cyrillic/.footprint.x86_64 b/xorg/xorg-font-winitzki-cyrillic/.footprint.x86_64
index efa097d8b..6abb7d4f7 100644
--- a/xorg/xorg-font-winitzki-cyrillic/.footprint.x86_64
+++ b/xorg/xorg-font-winitzki-cyrillic/.footprint.x86_64
@@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/X11/
-drwxr-xr-x	root/root	usr/lib/X11/fonts/
-drwxr-xr-x	root/root	usr/lib/X11/fonts/cyrillic/
--rw-r--r--	root/root	usr/lib/X11/fonts/cyrillic/proof9x16.pcf.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/fonts/
+drwxr-xr-x	root/root	usr/share/fonts/X11/
+drwxr-xr-x	root/root	usr/share/fonts/X11/cyrillic/
+-rw-r--r--	root/root	usr/share/fonts/X11/cyrillic/proof9x16.pcf.gz
diff --git a/xorg/xorg-font-winitzki-cyrillic/.md5sum.i686 b/xorg/xorg-font-winitzki-cyrillic/.md5sum.i686
index 2ea6a5984..32f754b78 100644
--- a/xorg/xorg-font-winitzki-cyrillic/.md5sum.i686
+++ b/xorg/xorg-font-winitzki-cyrillic/.md5sum.i686
@@ -1 +1 @@
-b99b02aff36a88ca3379715423c60303  font-winitzki-cyrillic-1.0.0.tar.bz2
+829a3159389b7f96f629e5388bfee67b  font-winitzki-cyrillic-1.0.3.tar.bz2
diff --git a/xorg/xorg-font-winitzki-cyrillic/.md5sum.x86_64 b/xorg/xorg-font-winitzki-cyrillic/.md5sum.x86_64
index 2ea6a5984..32f754b78 100644
--- a/xorg/xorg-font-winitzki-cyrillic/.md5sum.x86_64
+++ b/xorg/xorg-font-winitzki-cyrillic/.md5sum.x86_64
@@ -1 +1 @@
-b99b02aff36a88ca3379715423c60303  font-winitzki-cyrillic-1.0.0.tar.bz2
+829a3159389b7f96f629e5388bfee67b  font-winitzki-cyrillic-1.0.3.tar.bz2
diff --git a/xorg/xorg-font-winitzki-cyrillic/Pkgfile b/xorg/xorg-font-winitzki-cyrillic/Pkgfile
index 77533ec6c..d7fa0d14b 100644
--- a/xorg/xorg-font-winitzki-cyrillic/Pkgfile
+++ b/xorg/xorg-font-winitzki-cyrillic/Pkgfile
@@ -1,22 +1,19 @@
-# Description: xorg font font-winitzki-cyrillic
+# Description: Polices Xorg font-winitzki-cyrillic
 # URL: http://xorg.freedesktop.org
-# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
-# Packager: tilman at crux dot nu
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
 # Depends on: xorg-mkfontdir, xorg-mkfontscale
 # Run on: xorg-mkfontdir,xorg-mkfontscale
 
 name=xorg-font-winitzki-cyrillic
-version=1.0.0
-release=2
+version=1.0.3
+release=1
 source=(http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-$version.tar.bz2)
 
 build() {
 	cd font-winitzki-cyrillic-$version
-
-	./configure --prefix=/usr
-
+	./configure $XORG_CONFIG
 	make
 	make DESTDIR=$PKG install
-
-	rm -f $PKG/usr/lib/X11/fonts/cyrillic/fonts.{dir,scale}
+	rm -f $PKG/$XORG_PREFIX/share/fonts/X11/cyrillic/fonts.{dir,scale}
 }
diff --git a/xorg/xorg-font-winitzki-cyrillic/post-install b/xorg/xorg-font-winitzki-cyrillic/post-install
index 1df5a15e6..d69bfbf71 100755
--- a/xorg/xorg-font-winitzki-cyrillic/post-install
+++ b/xorg/xorg-font-winitzki-cyrillic/post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-mkfontdir /usr/lib/X11/fonts/cyrillic
-mkfontscale /usr/lib/X11/fonts/cyrillic
+mkfontdir $XORG_PREFIX/share/fonts/X11/cyrillic
+mkfontscale $XORG_PREFIX/share/fonts/X11/cyrillic