diff --git a/packages/x11/font/font-misc-misc/build b/packages/x11/font/font-misc-misc/build index f77ee86427..5df2bbf0a1 100755 --- a/packages/x11/font/font-misc-misc/build +++ b/packages/x11/font/font-misc-misc/build @@ -28,13 +28,25 @@ cd $PKG_BUILD --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --with-fontdir=$XORG_PATH_FONTS + --with-fontrootdir=/usr/share/fonts \ + --disable-silent-rules \ + --enable-iso8859-1 \ + --enable-iso8859-2 \ + --disable-iso8859-3 \ + --disable-iso8859-4 \ + --enable-iso8859-5 \ + --disable-iso8859-6 \ + --enable-iso8859-7 \ + --enable-iso8859-8 \ + --enable-iso8859-9 \ + --disable-iso8859-10 \ + --disable-iso8859-11 \ + --disable-iso8859-12 \ + --disable-iso8859-13 \ + --enable-iso8859-14 \ + --enable-iso8859-15 \ + --disable-iso8859-16 \ + --disable-koi8-r \ + --disable-jisx0201 \ -make UTIL_DIR="`ls -d $ROOT/$BUILD/font-util*`" - -mkdir -p fonts - cp 6x13-ISO8859-1.pcf.gz fonts - cp ../font-cursor-misc*/cursor.pcf.gz fonts - -cd fonts - mkfontdir +make UTIL_DIR="$SYSROOT_PREFIX/usr/share/fonts/util/" diff --git a/packages/x11/font/font-misc-misc/install b/packages/x11/font/font-misc-misc/install index f167eba3f2..e74e1bf2a3 100755 --- a/packages/x11/font/font-misc-misc/install +++ b/packages/x11/font/font-misc-misc/install @@ -22,6 +22,10 @@ . config/options $1 -mkdir -p $INSTALL/$XORG_PATH_FONTS/misc - cp $PKG_BUILD/fonts/* $INSTALL/$XORG_PATH_FONTS/misc - cp $PKG_DIR/config/fonts.alias $INSTALL/$XORG_PATH_FONTS/misc +FONTDIR="$INSTALL/usr/share/fonts/misc" + +mkdir -p $FONTDIR + cp $PKG_BUILD/*.pcf.gz $FONTDIR +# cp $PKG_DIR/config/fonts.alias $FONTDIR + +mkfontdir $FONTDIR diff --git a/packages/x11/font/font-misc-misc/meta b/packages/x11/font/font-misc-misc/meta index 41e6956e64..34d182f26d 100644 --- a/packages/x11/font/font-misc-misc/meta +++ b/packages/x11/font/font-misc-misc/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="font-cursor-misc font-util" -PKG_BUILD_DEPENDS="toolchain util-macros font-cursor-misc font-util" +PKG_DEPENDS="font-util font-cursor-misc" +PKG_BUILD_DEPENDS="toolchain util-macros font-util font-cursor-misc" PKG_PRIORITY="optional" PKG_SECTION="x11/font" PKG_SHORTDESC="font-misc-misc: A misc. public domain font"