1 files changed, 18 insertions, 15 deletions
diff --git a/development/fpc/fpc.SlackBuild b/development/fpc/fpc.SlackBuild
index 6efe575ba9..bee656a10c 100644
--- a/development/fpc/fpc.SlackBuild
+++ b/development/fpc/fpc.SlackBuild
@@ -24,7 +24,8 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=fpc
-VERSION=${SRCVER:-2.6.4}
+VERSION=${SRCVER:-3.0.0}
+BINVERSION=${BINVERSION:-2.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,32 +58,32 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-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
+rm -rf $PRGNAM-$BINVERSION ${PRGNAM}build-$VERSION
+mkdir $PRGNAM-$BINVERSION ${PRGNAM}build-$VERSION
+cd $TMP/$PRGNAM-$BINVERSION
+tar xvf $CWD/$PRGNAM-$BINVERSION.$ARCH-linux.tar --strip-components=1
 cd $TMP/${PRGNAM}build-$VERSION
 tar xvf $CWD/${PRGNAM}build-$VERSION.tar.gz
 
 # Unpack binary files.
 (
-  mkdir -p $TMP/$PRGNAM-$VERSION/binary
-  cd $TMP/$PRGNAM-$VERSION/binary
-  tar xvf $TMP/$PRGNAM-$VERSION/binary.$ARCH-linux.tar
+  mkdir -p $TMP/$PRGNAM-$BINVERSION/binary
+  cd $TMP/$PRGNAM-$BINVERSION/binary
+  tar xvf $TMP/$PRGNAM-$BINVERSION/binary.$ARCH-linux.tar
 
-  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
+  cd  $TMP/$PRGNAM-$BINVERSION
+  tar xvf $TMP/$PRGNAM-$BINVERSION/binary/base.$ARCH-linux.tar.gz
+  tar xvf $TMP/$PRGNAM-$BINVERSION/binary/utils.$ARCH-linux.tar.gz
 
-  cd $TMP/$PRGNAM-$VERSION/bin
+  cd $TMP/$PRGNAM-$BINVERSION/bin
   if [ "$ARCH" = "x86_64" ]; then
-    ln -s ../lib/fpc/$VERSION/ppcx64
+    ln -s ../lib/fpc/$BINVERSION/ppcx64
   else
-    ln -s ../lib/fpc/$VERSION/ppc386
+    ln -s ../lib/fpc/$BINVERSION/ppc386
   fi
 )
 
-export PATH="$TMP/$PRGNAM-$VERSION/bin":$PATH
+export PATH="$TMP/$PRGNAM-$BINVERSION/bin":$PATH
 echo $PATH
 
 cd $TMP/${PRGNAM}build-$VERSION/${PRGNAM}build-$VERSION
@@ -118,6 +119,8 @@ $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/samplecfg \
 
 # Clean up the configs by removing our package directory.
 sed -i -e "s:$PKG::g" $PKG/etc/fpc.cfg
+sed -i -e "s:$PKG::g" $PKG/etc/fppkg.cfg
+sed -i -e "s:$PKG::g" $PKG/etc/fppkg/default
 sed -i -e "s:$PKG::g" $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/ide/text/fp.cfg
 mv $PKG/etc/fpc.cfg $PKG/etc/fpc.cfg.new