diff options
| -rw-r--r-- | development/fpc/fpc.SlackBuild | 20 | ||||
| -rw-r--r-- | development/fpc/fpc.info | 12 |
2 files changed, 19 insertions, 13 deletions
diff --git a/development/fpc/fpc.SlackBuild b/development/fpc/fpc.SlackBuild index dfc7f29238..228f03fd7b 100644 --- a/development/fpc/fpc.SlackBuild +++ b/development/fpc/fpc.SlackBuild @@ -24,9 +24,9 @@ # Modified by the SlackBuilds.org project. PRGNAM=fpc -VERSION=${SRCVER:-2.4.4} +VERSION=${SRCVER:-2.6.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -52,7 +52,7 @@ else exit 1 fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -60,7 +60,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.$ARCH-linux.tar +tar xvf $CWD/$PRGNAM-$VERSION.$ARCH-linux.tar --strip-components=1 # Unpack docs, binary, and demo files. ( @@ -91,10 +91,16 @@ else ln -s ../lib$LIBDIRSUFFIX/fpc/$VERSION/ppc386 fi -# copy docs +# 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 +# No idea why, but the pdf docs are in different places depending on arch +if [ "$ARCH" = "x86_64" ]; then + mv $TMP/$PRGNAM-$VERSION/docs/doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION +else + mv $TMP/$PRGNAM-$VERSION/docs/share/doc/fpdocs-$VERSION/*.pdf \ + $PKG/usr/doc/$PRGNAM-$VERSION/ +fi cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -type d -name '.svn' | xargs rm -rf @@ -107,7 +113,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/etc $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/ide/text $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION/samplecfg \ $PKG/usr/lib$LIBDIRSUFFIX/fpc/$VERSION \ - $PKG/etc + $PKG/etc # Clean up the configs by removing our package directory. sed -i -e "s:$PKG::g" $PKG/etc/fpc.cfg diff --git a/development/fpc/fpc.info b/development/fpc/fpc.info index d4e6d3e38e..cc7ba5cd5d 100644 --- a/development/fpc/fpc.info +++ b/development/fpc/fpc.info @@ -1,10 +1,10 @@ PRGNAM="fpc" -VERSION="2.4.4" +VERSION="2.6.0" HOMEPAGE="http://www.freepascal.org/" -DOWNLOAD="http://downloads.sourceforge.net/freepascal/fpc-2.4.4.i386-linux.tar" -MD5SUM="e761c4866ac4c8fcbe09f657f315ec32" -DOWNLOAD_x86_64="http://downloads.sourceforge.net/freepascal/fpc-2.4.4.x86_64-linux.tar" -MD5SUM_x86_64="058e6cd765026748a2bd24c86f1ecf18" +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" MAINTAINER="Andre Barboza" EMAIL="bmg.andre@gmail.com" -APPROVED="Niels Horn" +APPROVED="dsomero" |