diff options
-rw-r--r-- | xorg/xorg-font-xfree86-type1/.footprint.i686 | 10 | ||||
-rw-r--r-- | xorg/xorg-font-xfree86-type1/.footprint.x86_64 | 10 | ||||
-rw-r--r-- | xorg/xorg-font-xfree86-type1/.md5sum.i686 | 2 | ||||
-rw-r--r-- | xorg/xorg-font-xfree86-type1/.md5sum.x86_64 | 2 | ||||
-rw-r--r-- | xorg/xorg-font-xfree86-type1/Pkgfile | 15 | ||||
-rwxr-xr-x | xorg/xorg-font-xfree86-type1/post-install | 4 |
6 files changed, 20 insertions, 23 deletions
diff --git a/xorg/xorg-font-xfree86-type1/.footprint.i686 b/xorg/xorg-font-xfree86-type1/.footprint.i686 index 61e3b0ae0..d63e8151c 100644 --- a/xorg/xorg-font-xfree86-type1/.footprint.i686 +++ b/xorg/xorg-font-xfree86-type1/.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/Type1/ --rw-r--r-- root/root usr/lib/X11/fonts/Type1/cursor.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/cursor.pfa diff --git a/xorg/xorg-font-xfree86-type1/.footprint.x86_64 b/xorg/xorg-font-xfree86-type1/.footprint.x86_64 index 61e3b0ae0..d63e8151c 100644 --- a/xorg/xorg-font-xfree86-type1/.footprint.x86_64 +++ b/xorg/xorg-font-xfree86-type1/.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/Type1/ --rw-r--r-- root/root usr/lib/X11/fonts/Type1/cursor.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/cursor.pfa diff --git a/xorg/xorg-font-xfree86-type1/.md5sum.i686 b/xorg/xorg-font-xfree86-type1/.md5sum.i686 index d1d3a64c8..04a741664 100644 --- a/xorg/xorg-font-xfree86-type1/.md5sum.i686 +++ b/xorg/xorg-font-xfree86-type1/.md5sum.i686 @@ -1 +1 @@ -d7e965776c7f0c30b0f09742176fb77a font-xfree86-type1-1.0.1.tar.bz2 +3eeb3fb44690b477d510bbd8f86cf5aa font-xfree86-type1-1.0.4.tar.bz2 diff --git a/xorg/xorg-font-xfree86-type1/.md5sum.x86_64 b/xorg/xorg-font-xfree86-type1/.md5sum.x86_64 index d1d3a64c8..04a741664 100644 --- a/xorg/xorg-font-xfree86-type1/.md5sum.x86_64 +++ b/xorg/xorg-font-xfree86-type1/.md5sum.x86_64 @@ -1 +1 @@ -d7e965776c7f0c30b0f09742176fb77a font-xfree86-type1-1.0.1.tar.bz2 +3eeb3fb44690b477d510bbd8f86cf5aa font-xfree86-type1-1.0.4.tar.bz2 diff --git a/xorg/xorg-font-xfree86-type1/Pkgfile b/xorg/xorg-font-xfree86-type1/Pkgfile index cd3f85014..9dfce0848 100644 --- a/xorg/xorg-font-xfree86-type1/Pkgfile +++ b/xorg/xorg-font-xfree86-type1/Pkgfile @@ -1,22 +1,19 @@ -# Description: xorg font font-xfree86-type1 +# Description: Polices Xorg font-xfree86-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-xfree86-type1 -version=1.0.1 +version=1.0.4 release=1 source=(http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-$version.tar.bz2) build() { cd font-xfree86-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-xfree86-type1/post-install b/xorg/xorg-font-xfree86-type1/post-install index 5760c9cf6..ee54b8e50 100755 --- a/xorg/xorg-font-xfree86-type1/post-install +++ b/xorg/xorg-font-xfree86-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 |