2 files changed, 39 insertions, 28 deletions
diff --git a/development/fpc/fpc.SlackBuild b/development/fpc/fpc.SlackBuild
index c3abb768a1..5f5e9d79d3 100644
--- a/development/fpc/fpc.SlackBuild
+++ b/development/fpc/fpc.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=fpc
-VERSION=${SRCVER:-2.6.0}
+VERSION=${SRCVER:-2.6.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -57,31 +57,40 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION ${PRGNAM}build-$VERSION
+mkdir $PRGNAM-$VERSION ${PRGNAM}build-$VERSION
+cd $TMP/$PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.$ARCH-linux.tar --strip-components=1
+cd $TMP/${PRGNAM}build-$VERSION
+tar xvf $CWD/${PRGNAM}build-$VERSION.tar.gz
 
-# Unpack docs, binary, and demo files.
+# Unpack binary files.
 (
-  mkdir -p $TMP/$PRGNAM-$VERSION/{binary,docs}
+  mkdir -p $TMP/$PRGNAM-$VERSION/binary
   cd $TMP/$PRGNAM-$VERSION/binary
   tar xvf $TMP/$PRGNAM-$VERSION/binary.$ARCH-linux.tar
 
-  cd $TMP/$PRGNAM-$VERSION/docs
-  tar xvf $TMP/$PRGNAM-$VERSION/doc-pdf.tar.gz
+  cd  $TMP/$PRGNAM-$VERSION
+  tar xvf $TMP/$PRGNAM-$VERSION/binary/base.$ARCH-linux.tar.gz
+  tar xvf $TMP/$PRGNAM-$VERSION/binary/utils.$ARCH-linux.tar.gz
 
-  mkdir -p $PKG/usr/share/doc/$PRGNAM-$VERSION/demo
-  cd $PKG/usr/share/doc/$PRGNAM-$VERSION/demo
-  tar xvf $TMP/$PRGNAM-$VERSION/demo.tar.gz
+  cd $TMP/$PRGNAM-$VERSION/bin
+  if [ "$ARCH" = "x86_64" ]; then
+    ln -s ../lib/fpc/$VERSION/ppcx64
+  else
+    ln -s ../lib/fpc/$VERSION/ppc386
+  fi
 )
 
-# Install program
-cd $PKG/usr
-for file in $(ls $TMP/$PRGNAM-$VERSION/binary/*tar.gz)
-do
-  tar xvf $file
-done
+export PATH="$TMP/$PRGNAM-$VERSION/bin":$PATH
+echo $PATH
+
+cd $TMP/${PRGNAM}build-$VERSION/${PRGNAM}build-$VERSION
+fpcmake -Tall
+make build NOGDB=1
+make -j1 NOGDB=1 PREFIX=$PKG/usr install
+
+# Fix library dir
 [ "$LIBDIRSUFFIX" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
 
 cd $PKG/usr/bin
@@ -94,9 +103,7 @@ fi
 # copy docs
 mv $PKG/usr/share/doc $PKG/usr/doc
 rmdir $PKG/usr/share
-mv $TMP/$PRGNAM-$VERSION/docs/doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type d -name '.svn' | xargs rm -rf
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -122,9 +129,9 @@ cd $PKG
 # fix permissions for program docs and demos.
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/fpc/fpc.info b/development/fpc/fpc.info
index e2b7558924..7a23a0b22b 100644
--- a/development/fpc/fpc.info
+++ b/development/fpc/fpc.info
@@ -1,10 +1,14 @@
 PRGNAM="fpc"
-VERSION="2.6.0"
+VERSION="2.6.2"
 HOMEPAGE="http://www.freepascal.org/"
-DOWNLOAD="http://downloads.sourceforge.net/freepascal/fpc-2.6.0.i386-linux.tar"
-MD5SUM="42b8fcaba867f515446a84aa0430db91"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/freepascal/fpc-2.6.0.x86_64-linux.tar"
-MD5SUM_x86_64="631d93ca49778537cd84fa3a2878883c"
+DOWNLOAD="http://downloads.sourceforge.net/freepascal/fpc-2.6.2.i386-linux.tar \
+http://downloads.sourceforge.net/freepascal/fpcbuild-2.6.2.tar.gz"
+MD5SUM="3474affc41d6106c498fc5b79f883588 \
+89c7e60db6280f3d5cc006a4a9ff43a9"
+DOWNLOAD_x86_64="http://downloads.sourceforge.net/freepascal/fpc-2.6.2.x86_64-linux.tar \
+http://downloads.sourceforge.net/freepascal/fpcbuild-2.6.2.tar.gz"
+MD5SUM_x86_64="c32c4c8e94aed6f84b34407e7ea84ecd \
+89c7e60db6280f3d5cc006a4a9ff43a9"
 REQUIRES=""
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"