4 files changed, 23 insertions, 19 deletions
diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild
index 127351170..6c1d60fff 100755
--- a/source/l/freetype/freetype.SlackBuild
+++ b/source/l/freetype/freetype.SlackBuild
@@ -30,15 +30,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -92,7 +92,7 @@ make install DESTDIR=$PKG
 mkdir -p $PKG/usr/include
 ( cd $PKG/usr/include
   rm -rf freetype
-  ln -sf freetype2/freetype .
+  ln -sf freetype2 freetype
 )
 
 # Can't imagine a lot of use for this:
@@ -101,6 +101,9 @@ rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/freetype-$VERSION
 cp -a \
   docs \
diff --git a/source/l/freetype/freetype.illadvisederror.diff b/source/l/freetype/freetype.illadvisederror.diff
index 0afdcdfa7..fee71076d 100644
--- a/source/l/freetype/freetype.illadvisederror.diff
+++ b/source/l/freetype/freetype.illadvisederror.diff
@@ -1,8 +1,8 @@
-diff -u -r freetype-2.1.7.orig/include/freetype/freetype.h freetype-2.1.7/include/freetype/freetype.h
---- freetype-2.1.7.orig/include/freetype/freetype.h	2003-11-09 00:38:13.000000000 -0800
-+++ freetype-2.1.7/include/freetype/freetype.h	2004-06-05 13:43:55.000000000 -0700
-@@ -16,13 +16,20 @@
- /***************************************************************************/
+diff -Nur freetype-2.6.1.orig/include/freetype/freetype.h freetype-2.6.1/include/freetype/freetype.h
+--- freetype-2.6.1.orig/include/freetype/freetype.h	2015-10-03 23:54:01.000000000 -0500
++++ freetype-2.6.1/include/freetype/freetype.h	2015-10-04 22:13:40.233912984 -0500
+@@ -20,13 +20,20 @@
+ #define __FREETYPE_H__
  
  
 -#ifndef FT_FREETYPE_H
@@ -28,4 +28,4 @@ diff -u -r freetype-2.1.7.orig/include/freetype/freetype.h freetype-2.1.7/includ
 +/***************************************************************************/
  
  
- #ifndef __FREETYPE_H__
+ #include <ft2build.h>
diff --git a/source/l/freetype/freetype.subpixel.rendering.diff b/source/l/freetype/freetype.subpixel.rendering.diff
index e4bd9e1ee..5ab3b379a 100644
--- a/source/l/freetype/freetype.subpixel.rendering.diff
+++ b/source/l/freetype/freetype.subpixel.rendering.diff
@@ -1,5 +1,6 @@
---- ./include/freetype/config/ftoption.h.orig	2007-01-05 10:18:45.000000000 -0600
-+++ ./include/freetype/config/ftoption.h	2007-04-21 15:07:04.000000000 -0500
+diff -Naur freetype-2.6.1.orig/include/freetype/config/ftoption.h freetype-2.6.1/include/freetype/config/ftoption.h
+--- freetype-2.6.1.orig/include/freetype/config/ftoption.h	2015-09-25 07:58:57.000000000 +0200
++++ freetype-2.6.1/include/freetype/config/ftoption.h	2015-10-31 16:11:42.016958163 +0100
 @@ -92,7 +92,7 @@
    /* This is done to allow FreeType clients to run unmodified, forcing     */
    /* them to display normal gray-level anti-aliased glyphs.                */
diff --git a/source/l/freetype/slack-desc b/source/l/freetype/slack-desc
index 0d179401f..d70b3e756 100644
--- a/source/l/freetype/slack-desc
+++ b/source/l/freetype/slack-desc
@@ -6,14 +6,14 @@
 # leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-freetype: freetype (A Free, High-Quality, and Portable Font Engine)
-freetype:
-freetype: The FreeType engine is a free and portable TrueType font rendering
-freetype: engine.  It has been developed to provide TrueType support to a
-freetype: great variety of platforms and environments.
-freetype:
-freetype:
+freetype: freetype (A free, high-quality, and portable font engine)
 freetype:
+freetype: FreeType is a free and portable font rendering engine.  It has been
+freetype: developed to provide support for a number of font formats, including
+freetype: TrueType, Type 1, and OpenType, and is designed to be small,
+freetype: efficient, highly customizable, and portable while capable of
+freetype: producing high-quality output.
 freetype:
+freetype: Homepage:  http://www.freetype.org
 freetype:
 freetype: