xorg-font-adobe-utopia-type1, maj 1.0.4-1

6 files changed, 33 insertions, 36 deletions

diff --git a/xorg/xorg-font-adobe-utopia-type1/.footprint.i686 b/xorg/xorg-font-adobe-utopia-type1/.footprint.i686
index cc391ff25..6ad707ace 100644
--- a/xorg/xorg-font-adobe-utopia-type1/.footprint.i686
+++ b/xorg/xorg-font-adobe-utopia-type1/.footprint.i686
@@ -1,13 +1,13 @@
 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/Type1/
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTBI____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTBI____.pfa
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTB_____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTB_____.pfa
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTI_____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTI_____.pfa
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTRG____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTRG____.pfa
+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/Type1/
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTBI____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTBI____.pfa
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTB_____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTB_____.pfa
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTI_____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTI_____.pfa
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTRG____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTRG____.pfa
diff --git a/xorg/xorg-font-adobe-utopia-type1/.footprint.x86_64 b/xorg/xorg-font-adobe-utopia-type1/.footprint.x86_64
index cc391ff25..6ad707ace 100644
--- a/xorg/xorg-font-adobe-utopia-type1/.footprint.x86_64
+++ b/xorg/xorg-font-adobe-utopia-type1/.footprint.x86_64
@@ -1,13 +1,13 @@
 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/Type1/
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTBI____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTBI____.pfa
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTB_____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTB_____.pfa
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTI_____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTI_____.pfa
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTRG____.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/UTRG____.pfa
+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/Type1/
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTBI____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTBI____.pfa
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTB_____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTB_____.pfa
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTI_____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTI_____.pfa
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTRG____.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/UTRG____.pfa
diff --git a/xorg/xorg-font-adobe-utopia-type1/.md5sum.i686 b/xorg/xorg-font-adobe-utopia-type1/.md5sum.i686
index a6adf7a51..091209134 100644
--- a/xorg/xorg-font-adobe-utopia-type1/.md5sum.i686
+++ b/xorg/xorg-font-adobe-utopia-type1/.md5sum.i686
@@ -1 +1 @@
-aa7ff4bd20b961afda9c15d103b972a5  font-adobe-utopia-type1-1.0.1.tar.bz2
+fcf24554c348df3c689b91596d7f9971  font-adobe-utopia-type1-1.0.4.tar.bz2
diff --git a/xorg/xorg-font-adobe-utopia-type1/.md5sum.x86_64 b/xorg/xorg-font-adobe-utopia-type1/.md5sum.x86_64
index a6adf7a51..091209134 100644
--- a/xorg/xorg-font-adobe-utopia-type1/.md5sum.x86_64
+++ b/xorg/xorg-font-adobe-utopia-type1/.md5sum.x86_64
@@ -1 +1 @@
-aa7ff4bd20b961afda9c15d103b972a5  font-adobe-utopia-type1-1.0.1.tar.bz2
+fcf24554c348df3c689b91596d7f9971  font-adobe-utopia-type1-1.0.4.tar.bz2
diff --git a/xorg/xorg-font-adobe-utopia-type1/Pkgfile b/xorg/xorg-font-adobe-utopia-type1/Pkgfile
index 785ac1014..320a1899a 100644
--- a/xorg/xorg-font-adobe-utopia-type1/Pkgfile
+++ b/xorg/xorg-font-adobe-utopia-type1/Pkgfile
@@ -1,4 +1,4 @@
-# Description: xorg font font-adobe-utopia-type1
+# Description: Polices Xorg font-adobe-utopia-type1
 # URL: http://xorg.freedesktop.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
@@ -6,17 +6,14 @@
 # Run on: xorg-mkfontdir,xorg-mkfontscale,fontconfig,xorg-font-util
 
 name=xorg-font-adobe-utopia-type1
-version=1.0.1
-release=2
+version=1.0.4
+release=1
 source=(http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-$version.tar.bz2)
 
 build() {
 	cd font-adobe-utopia-type1-$version
-
-	./configure --prefix=/usr
-
+	./configure $XORG_CONFIG
 	make
 	make DESTDIR=$PKG install
-
-	rm -f $PKG/usr/lib/X11/fonts/Type1/fonts.{dir,scale,cache-1}
+	rm -f $PKG/$XORG_PREFIX/share/fonts/X11/Type1/fonts.{dir,scale,cache-1}
 }
diff --git a/xorg/xorg-font-adobe-utopia-type1/post-install b/xorg/xorg-font-adobe-utopia-type1/post-install
index 5760c9cf6..ee54b8e50 100755
--- a/xorg/xorg-font-adobe-utopia-type1/post-install
+++ b/xorg/xorg-font-adobe-utopia-type1/post-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-mkfontdir /usr/lib/X11/fonts/Type1
-mkfontscale /usr/lib/X11/fonts/Type1
+mkfontdir $XORG_PREFIX/share/fonts/X11/Type1
+mkfontscale $XORG_PREFIX/share/fonts/X11/Type1
 fc-cache