[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (492b730c515b9b231a1af6b8bdf52e9adcee6541)

Treeve Jelbert scm at mail.sourcemage.org
Tue Aug 8 09:52:53 EDT 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 devel/fpc/BUILD     |    2 +-
 devel/fpc/DETAILS   |   18 +++++++++---------
 devel/fpc/HISTORY   |    4 ++++
 devel/fpc/INSTALL   |    8 ++++----
 devel/fpc/PRE_BUILD |    6 +++---
 5 files changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 5e39978842cdca094bb60e886698e4a9665d3fe3
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    fpc-2.0.4-rc3

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index d9d77dc..575280f 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -6,7 +6,7 @@ else
 fi &&
 # optionally install source files, for use with Lazarus
 if [ $FPC_SRC == "y" ];then
-
+  cd fpcsrc                   &&
   mv packages/extra/gtk2/units/i386-linux/* rtl/units/i386-linux  &&
   mv packages/extra/x11/units/i386-linux/* rtl/units/i386-linux
 fi
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index c564ed0..1d30793 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,11 +1,14 @@
            SPELL=fpc
-         VERSION=2.0.2
-          SOURCE=$SPELL-$VERSION.source.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+         VERSION=2.0.4-rc3
+     SOURCE_HASH=sha512:e4ae9f2cec2e388b28ca13a8e4f5bfe1b0307450e9f5fd9dd3397a37c0cd87b36826fbb4b11880c9d6c21ed5f9911a809c204356363b9097b9381d1e4e8caacd
+#          SOURCE=$SPELL-$VERSION.source.tar.gz
+          SOURCE=fpcbuild-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/fpcbuild_${VERSION}_exp
    SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.freepascal.org/pub/fpc/dist/source-$VERSION/$SOURCE
+   SOURCE_URL[1]=ftp://ftp.freepascal.org/pub/fpc/beta/$VERSION/source/$SOURCE
+#   SOURCE_URL[1]=ftp://ftp.freepascal.org/pub/fpc/dist/source-$VERSION/$SOURCE
         WEB_SITE=http://www.freepascal.org
-     SOURCE_HASH=sha512:6355540ffb7186dfcf082a60ca8912cbab544a725d7194b528902a4ecdc7f8d00a9096f00c2e172f666c5a5a9ff7599f11e47d0153485510344436ce1bb38f30
+
 if ! spell_ok fpc ; then
          SOURCE2=base.i386-linux.tar.gz
          SOURCE3=utils.i386-linux.tar.gz
@@ -14,14 +17,11 @@ if ! spell_ok fpc ; then
     SOURCE2_HASH=sha512:69c3f8fa9c59898a3248eea2cbb294af634ae737f707c37d7df1c966cc4e109835d6ed29968f2ef9ee0a6b60337ad583ffa52253811a7eca79ed01c54ac96227
     SOURCE3_HASH=sha512:9ebc0370fa8ca36efd3896fbc73c6e115272b850793f5edada67506ee75fc69cb865609c0ad2b0e9961cea8de4b54cf8de9eb69385f7d51b8dd8d5c0b288f7ec
 fi
-      PATCHLEVEL=1
       LICENSE[0]=GPL
          ENTERED=20050521
-         UPDATED=20050521
-       BUILD_API=2
           CCACHE=off
          ARCHIVE=off
-        KEYWORDS="compiler devel"
+        KEYWORDS="pascal compiler devel"
            SHORT="a Pascal compiler"
 cat << EOF
 Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal compiler.
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index 84af352..4afa07a 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,7 @@
+2006-08-08 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 2.0.4-rc3
+	* BUILD, INSTALL: change for new source file layout
+
 2006-07-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* INSTALL: fix the brokeness for bug #12742, unfixing the install config
 	  file stuff this is to stupid imho...
diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index a5dc9bf..459e237 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -1,15 +1,15 @@
 local FPCDEST FPCDIR FPC_COMP FPC_MAKE                     &&
 FPCDEST=${INSTALL_ROOT}/usr                                &&
-FPCDIR=$FPCDEST/lib/fpc/$VERSION                           &&
-FPC_COMP=$SOURCE_DIRECTORY/compiler/ppc386                 &&
-FPC_MAKE=$SOURCE_DIRECTORY/utils/fpcm/fpcmake              &&
+FPCDIR=$FPCDEST/lib/fpc/${VERSION//-rc3}                           &&
+FPC_COMP=$SOURCE_DIRECTORY/fpcsrc/compiler/ppc386                 &&
+FPC_MAKE=$SOURCE_DIRECTORY/fpcsrc/utils/fpcm/fpcmake              &&
 mkdir -p $FPCDIR                                         &&
 chown pascal:pascal $FPCDIR                              &&
 
 # optionally install source files, for use with Lazarus
 if [ $FPC_SRC == "y" ];then
   message copying source files                             &&
-  cd $SOURCE_DIRECTORY                                     &&
+  cd $SOURCE_DIRECTORY/fpcsrc                                     &&
   cp -r fcl packages rtl $FPCDIR                           &&
 # do this manually, else there are two copies of the units
   cd compiler                                              &&
diff --git a/devel/fpc/PRE_BUILD b/devel/fpc/PRE_BUILD
index 58c0958..8207042 100755
--- a/devel/fpc/PRE_BUILD
+++ b/devel/fpc/PRE_BUILD
@@ -9,16 +9,16 @@ if ! spell_ok fpc; then
   unpack_file 3  
 fi                     &&
 #remove unnecessary files, in case we save the source files
-cd $SOURCE_DIRECTORY/rtl                                 &&
+cd $SOURCE_DIRECTORY/fpcsrc/rtl                                 &&
 rm -rf amiga arm atari beos bsd darwin emx freebsd go32v2   \
        m68k macos morphos netbsd netware netwlibc openbsd os2 palmos \
        powerpc solaris sparc sunos watcom win32        &&
 cd linux                                               &&
 rm -rf arm m68k powerpc sparc                          &&
-cd $SOURCE_DIRECTORY/fcl                               &&
+cd $SOURCE_DIRECTORY/fpcsrc/fcl                               &&
 rm -rf amiga beos darwin  freebsd go32v2   \
        netware netwlibc  os2  qnx sunos  win32         &&
-cd $SOURCE_DIRECTORY/packages/extra                    &&
+cd $SOURCE_DIRECTORY/fpcsrc//packages/extra                    &&
 rm -rf amunits os2units palmunits winunits             &&
 cd $SOURCE_DIRECTORY                                   
 



More information about the SM-Commit mailing list