Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a1bec3bad3a609af1867978fde7ec9a9ab99b47c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a1bec3bad3a609af1867978fde7ec9a9ab99b47c)
  • Date: Sun, 21 Apr 2013 22:51:44 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

dev/null |binary
devel/fpc/BUILD | 2 +-
devel/fpc/DETAILS | 34 ++++++++++++----------------------
devel/fpc/EXPORTS | 1 -
devel/fpc/HISTORY | 6 ++++++
devel/fpc/INSTALL | 8 --------
devel/fpc/PREPARE | 1 -
devel/fpc/PRE_BUILD | 14 +++-----------
devel/fpc/REPAIR^none^EXPORTS | 1 -
9 files changed, 22 insertions(+), 45 deletions(-)

New commits:
commit a1bec3bad3a609af1867978fde7ec9a9ab99b47c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fpc 2.6.2

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index 132dd0c..d34d73a 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -7,7 +7,7 @@ else
fi &&

if ! spell_ok fpc ; then
- PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/$VERSIONB/ppc$ARCH
+ PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/$VERSION/ppc$ARCH
else
PP=$INSTALL_ROOT/usr/bin/fpc
fi &&
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 5204725..55f5c0f 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,30 +1,20 @@
SPELL=fpc
-if [[ $FPV_DEV == y ]];then
- VERSION=2.4.4
-
SOURCE_HASH=sha512:05ada1f2605622f342dbc9caad00fb6ea3abd90cda431d8482e74518ef188a99a9eddcb63f2e6fb20607b59b5c59de34032e48e03fe8c65825ea812b1b29204e
+ VERSION=2.6.2
+
SOURCE_HASH=sha512:caa1b2c54907b30b536db2ca65bcdd646e8b9e6f2e99fedf9a88edf65f912660a0a9d060cede2ae0f06cdc8bc8099f73274a617cfa65df46c982a1c17ed42192
SOURCE=$SPELL-$VERSION.source.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
- SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/source-${VERSION}/$SOURCE
-else
- VERSION=2.4.4
-
SOURCE_HASH=sha512:05ada1f2605622f342dbc9caad00fb6ea3abd90cda431d8482e74518ef188a99a9eddcb63f2e6fb20607b59b5c59de34032e48e03fe8c65825ea812b1b29204e
- SOURCE=$SPELL-$VERSION.source.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
- SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/source-${VERSION}/$SOURCE
-fi
+ SOURCE_URL[0]=$SOURCEFORGE_URL/freepascal/Source/$VERSION/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/source/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.freepascal.org
if ! spell_ok fpc ; then
- VERSIONB=2.4.4
- if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
- elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- SOURCE2=$SPELL-$VERSIONB.x86_64-linux.tar
- else
- SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
- fi
- SOURCE2_URL[0]=$SOURCEFORGE_URL/freepascal/$SOURCE2
- SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+case "${SMGL_COMPAT_ARCHS[1]}" in
+ia32) B_ARCH=i386-linux ARCH=386 ;;
+*) B_ARCH=${SMGL_COMPAT_ARCHS[1]}-linux ARCH=x64 ;;
+esac
+ SOURCE2=$SPELL-$VERSION.$B_ARCH.tar
+ SOURCE2_URL[0]=$SOURCEFORGE_URL/freepascal/Linux/$VERSION/$SOURCE2
+ SOURCE2_URL[1]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/$B_ARCH/$SOURCE2
+
SOURCE2_HASH=sha512:3ac22bff975197b3ecc40bd76bb66093f71253290d6eb095e1bf014cb1cdf0354cf05212516bca008d9b525f906c173c1bf2067eda9015cb3db64a42b576a512
fi
LICENSE[0]=GPL
KEYWORDS="pascal compiler devel"
diff --git a/devel/fpc/EXPORTS b/devel/fpc/EXPORTS
index 9f1d54c..91a9309 100644
--- a/devel/fpc/EXPORTS
+++ b/devel/fpc/EXPORTS
@@ -1,3 +1,2 @@
-FPV_DEV
VERSION
SOURCE_HASH
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index cdbc136..18da7e0 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,9 @@
+2013-04-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, EXPORTS, INSTALL, PREPARE, PRE_BUILD,
+ REPAIR^none^EXPORTS: updated spell to 2.6.2
+ Fixed SOURCE_URL[0] and SOURCE2_URL[0]
+ Removed FPV_DEV, VERSIONB, added ARCH and B_ARCH variables
+
2011-10-12 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.4.4

diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index 160e31b..10a1985 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -1,11 +1,3 @@
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- ARCH=386
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- ARCH=x64
-else
- ARCH=386
-fi &&
-
local FPCDEST FPCDIR FPC_COMP FPC_MAKE
&&
FPCDEST=${INSTALL_ROOT}/usr
&&
FPCDIR=$FPCDEST/lib/fpc/${VERSION//rc?}
&&
diff --git a/devel/fpc/PREPARE b/devel/fpc/PREPARE
deleted file mode 100755
index ed8ce23..0000000
--- a/devel/fpc/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query FPV_DEV 'build devel version?' n
diff --git a/devel/fpc/PRE_BUILD b/devel/fpc/PRE_BUILD
index 84cccd3..efe28d4 100755
--- a/devel/fpc/PRE_BUILD
+++ b/devel/fpc/PRE_BUILD
@@ -1,13 +1,5 @@
default_pre_build &&

-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- ARCH=i386
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- ARCH=x86_64
-else
- ARCH=i386
-fi &&
-
cd $SOURCE_DIRECTORY &&
#
# Setup bootstrapping, only if we don't have fpc already
@@ -16,8 +8,8 @@ if ! spell_ok fpc ; then
mkdir bootstrap &&
cd bootstrap &&
unpack_file 2 &&
-tar -xf binary.$ARCH-linux.tar &&
-tar -xzf base.$ARCH-linux.tar.gz
+tar -xf fpc-$VERSION.$B_ARCH/binary.$B_ARCH.tar &&
+tar -xzf base.$B_ARCH.tar.gz
fi &&

cd $SOURCE_DIRECTORY &&
@@ -26,7 +18,7 @@ local GDB WHERE &&
GDB=$INSTALL_ROOT/usr/lib/libgdb.a &&

if [[ -e $GDB ]];then
- WHERE=packages/base/gdbint/libgdb/units/$ARCH-linux/ &&
+ WHERE=packages/base/gdbint/libgdb/units/$B_ARCH/ &&
mkdir -p $WHERE &&
cp $GDB $WHERE
fi
diff --git a/devel/fpc/REPAIR^none^EXPORTS b/devel/fpc/REPAIR^none^EXPORTS
index 9f1d54c..91a9309 100644
--- a/devel/fpc/REPAIR^none^EXPORTS
+++ b/devel/fpc/REPAIR^none^EXPORTS
@@ -1,3 +1,2 @@
-FPV_DEV
VERSION
SOURCE_HASH
diff --git a/devel/fpc/fpc-2.4.4.i386-linux.tar.sig
b/devel/fpc/fpc-2.4.4.i386-linux.tar.sig
deleted file mode 100644
index 8b2de15..0000000
Binary files a/devel/fpc/fpc-2.4.4.i386-linux.tar.sig and /dev/null differ
diff --git a/devel/fpc/fpc-2.4.4.x86_64-linux.tar.sig
b/devel/fpc/fpc-2.4.4.x86_64-linux.tar.sig
deleted file mode 100644
index 2a305ce..0000000
Binary files a/devel/fpc/fpc-2.4.4.x86_64-linux.tar.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a1bec3bad3a609af1867978fde7ec9a9ab99b47c), Ismael Luceno, 04/21/2013

Archive powered by MHonArc 2.6.24.

Top of Page