xorg-font-bitstream-type1, maj 1.0.3-1

6 files changed, 51 insertions, 53 deletions

diff --git a/xorg/xorg-font-bitstream-type1/.footprint.i686 b/xorg/xorg-font-bitstream-type1/.footprint.i686
index 39f4f7d4f..408dfbbbc 100644
--- a/xorg/xorg-font-bitstream-type1/.footprint.i686
+++ b/xorg/xorg-font-bitstream-type1/.footprint.i686
@@ -1,21 +1,21 @@
 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/c0419bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0419bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0582bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0582bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0583bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0583bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0611bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0611bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0632bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0632bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0633bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0633bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0648bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0648bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0649bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0649bt_.pfb
+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/c0419bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0419bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0582bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0582bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0583bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0583bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0611bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0611bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0632bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0632bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0633bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0633bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0648bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0648bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0649bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0649bt_.pfb
diff --git a/xorg/xorg-font-bitstream-type1/.footprint.x86_64 b/xorg/xorg-font-bitstream-type1/.footprint.x86_64
index 39f4f7d4f..408dfbbbc 100644
--- a/xorg/xorg-font-bitstream-type1/.footprint.x86_64
+++ b/xorg/xorg-font-bitstream-type1/.footprint.x86_64
@@ -1,21 +1,21 @@
 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/c0419bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0419bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0582bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0582bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0583bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0583bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0611bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0611bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0632bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0632bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0633bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0633bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0648bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0648bt_.pfb
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0649bt_.afm
--rw-r--r--	root/root	usr/lib/X11/fonts/Type1/c0649bt_.pfb
+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/c0419bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0419bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0582bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0582bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0583bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0583bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0611bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0611bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0632bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0632bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0633bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0633bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0648bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0648bt_.pfb
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0649bt_.afm
+-rw-r--r--	root/root	usr/share/fonts/X11/Type1/c0649bt_.pfb
diff --git a/xorg/xorg-font-bitstream-type1/.md5sum.i686 b/xorg/xorg-font-bitstream-type1/.md5sum.i686
index 2b36c9652..b5bbc7db1 100644
--- a/xorg/xorg-font-bitstream-type1/.md5sum.i686
+++ b/xorg/xorg-font-bitstream-type1/.md5sum.i686
@@ -1 +1 @@
-6610475e2e231242f8f2122a709c3695  font-bitstream-type1-1.0.0.tar.bz2
+5e0c9895d69d2632e2170114f8283c11  font-bitstream-type1-1.0.3.tar.bz2
diff --git a/xorg/xorg-font-bitstream-type1/.md5sum.x86_64 b/xorg/xorg-font-bitstream-type1/.md5sum.x86_64
index 2b36c9652..b5bbc7db1 100644
--- a/xorg/xorg-font-bitstream-type1/.md5sum.x86_64
+++ b/xorg/xorg-font-bitstream-type1/.md5sum.x86_64
@@ -1 +1 @@
-6610475e2e231242f8f2122a709c3695  font-bitstream-type1-1.0.0.tar.bz2
+5e0c9895d69d2632e2170114f8283c11  font-bitstream-type1-1.0.3.tar.bz2
diff --git a/xorg/xorg-font-bitstream-type1/Pkgfile b/xorg/xorg-font-bitstream-type1/Pkgfile
index 1627d765a..0cb6fc188 100644
--- a/xorg/xorg-font-bitstream-type1/Pkgfile
+++ b/xorg/xorg-font-bitstream-type1/Pkgfile
@@ -1,22 +1,20 @@
-# Description: xorg font font-bitstream-type1
+# Description: Police Xorg font-bitstream-type1
 # 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, fontconfig
 # Run on: xorg-mkfontdir,xorg-mkfontscale,fontconfig
 
 name=xorg-font-bitstream-type1
-version=1.0.0
-release=2
+version=1.0.3
+release=1
 source=(http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-$version.tar.bz2)
 
 build() {
 	cd font-bitstream-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-bitstream-type1/post-install b/xorg/xorg-font-bitstream-type1/post-install
index 5760c9cf6..ee54b8e50 100755
--- a/xorg/xorg-font-bitstream-type1/post-install
+++ b/xorg/xorg-font-bitstream-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