sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Treeve Jelbert <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dfd30bb2ac995ca67db94505416b6b37a583c6ff)
Date: Fri, 2 Mar 2007 03:02:29 -0600

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

devel/fpc/BUILD | 8 ++------
devel/fpc/CONFIGURE | 1 -
devel/fpc/DETAILS | 6 ++++--
devel/fpc/FINAL | 14 +++++++++++++-
devel/fpc/HISTORY | 12 ++++++++++++
devel/fpc/INSTALL | 28 +++++-----------------------
devel/fpc/PRE_BUILD | 24 +++++++++---------------
devel/fpc/configs | 1 -
devel/fpc/volatiles | 1 -
graphics/gocr/DETAILS | 4 ++--
graphics/gocr/HISTORY | 3 +++
11 files changed, 50 insertions(+), 52 deletions(-)

New commits:
commit c49cb01eb7444726d12a08701990d49778e7d3cd
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

fpc - update build process

commit 199703e47b3428523ed0b74e78477a4e52c4128f
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

gocr-0.44

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index 575280f..531b497 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -1,12 +1,8 @@
+make_single &&
if ! spell_ok fpc;then
make all PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/2.0.0/ppc386 \
DATA2INC=$SOURCE_DIRECTORY/bootstrap/bin/data2inc
else
make all
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
+make_normal
diff --git a/devel/fpc/CONFIGURE b/devel/fpc/CONFIGURE
deleted file mode 100755
index 2098869..0000000
--- a/devel/fpc/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query FPC_SRC "install source files, for use by Lazarus?" n
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 5eaa77c..80af72a 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -5,7 +5,7 @@
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/beta/$VERSION/source/$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

@@ -19,8 +19,10 @@ if ! spell_ok fpc ; then
fi
LICENSE[0]=GPL
ENTERED=20050521
+ PATCHLEVEL=1
CCACHE=off
- ARCHIVE=off
+ STAGED_INSTALL=off
+# ARCHIVE=off
KEYWORDS="pascal compiler devel"
SHORT="a Pascal compiler"
cat << EOF
diff --git a/devel/fpc/FINAL b/devel/fpc/FINAL
index ad32f7d..145017a 100755
--- a/devel/fpc/FINAL
+++ b/devel/fpc/FINAL
@@ -1 +1,13 @@
-message if you need a cfg file, try "fpcmkcfg>/etc/fpc.cfg"
+local CFG &&
+CFG=fpc.cfg &&
+if ([ ! -e /etc/$CFG ] && [ ! -e ~/.fpc.cfg ] ) ;then
+cat << EOF
+${PROBLEM_COLOR} please create a $CFG file. ${MESSAGE_COLOR}
+Try:
+FPCPATH=/usr/lib/fpc/$VERSION &&
+fpcmkcfg > /etc/fpc.cfg ${DEFAULT_COLOR}
+EOF
+ return 1
+fi
+
+
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index dba2563..2b0b33d 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,15 @@
+2007-03-01 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: PATCHLEVEL++
+ STAGED_INSTALL=off
+ * BUILD: add make_single
+ * CONFIGURE, configs, volatiles: deleted
+ * BUILD, INSTALL: remove saving of source files
+ this is now done in a separate spell, fpcsrc
+ don't need user pascal
+ * PRE_BUILD: copy libgdb.a
+ don't bother deleting lots of files
+ * FINAL: improve message regarding fpc.cfg
+
2006-11-24 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Does not depend on gpm

diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index 1371da1..4dc9ad7 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -1,26 +1,8 @@
local FPCDEST FPCDIR FPC_COMP FPC_MAKE &&
FPCDEST=${INSTALL_ROOT}/usr &&
-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/fpcsrc &&
- cp -r fcl packages rtl $FPCDIR &&
-# do this manually, else there are two copies of the units
- cd compiler &&
- make install PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST &&
- cd ../utils &&
- make install PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE &&
-# link to the already installed units
- cd $FPCDIR &&
- rm -r units &&
- ln -s $FPCDIR/rtl/units
-else
- make install PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST
-fi &&
+FPCDIR=$FPCDEST/lib/fpc/${VERSION} &&
+FPC_COMP=$SOURCE_DIRECTORY/fpcsrc/compiler/ppc386 &&
+FPC_MAKE=$SOURCE_DIRECTORY/fpcsrc/utils/fpcm/fpcmake &&
+mkdir -p $FPCDIR &&
+make install PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST &&
ln -sf $FPCDIR/ppc386 $FPCDEST/bin
diff --git a/devel/fpc/PRE_BUILD b/devel/fpc/PRE_BUILD
index 8207042..cfbb731 100755
--- a/devel/fpc/PRE_BUILD
+++ b/devel/fpc/PRE_BUILD
@@ -1,4 +1,3 @@
-create_account pascal &&
default_pre_build &&
# can we use existing fpc?
if ! spell_ok fpc; then
@@ -7,18 +6,13 @@ if ! spell_ok fpc; then
cd bootstrap &&
unpack_file 2 &&
unpack_file 3
-fi &&
-#remove unnecessary files, in case we save the source files
-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/fpcsrc/fcl &&
-rm -rf amiga beos darwin freebsd go32v2 \
- netware netwlibc os2 qnx sunos win32 &&
-cd $SOURCE_DIRECTORY/fpcsrc//packages/extra &&
-rm -rf amunits os2units palmunits winunits &&
-cd $SOURCE_DIRECTORY
+fi &&
+# we need libgdb.a in our tree
+local GDB WHERE &&
+GDB=$INSTALL_ROOT/usr/lib/libgdb.a &&
+if [ -e $GDB ];then
+ WHERE=fpcsrc/packages/base/gdbint/libgdb/units/i386-linux/ &&
+ mkdir -p $WHERE &&
+ cp $GDB $WHERE
+fi

diff --git a/devel/fpc/configs b/devel/fpc/configs
deleted file mode 100755
index a35843c..0000000
--- a/devel/fpc/configs
+++ /dev/null
@@ -1 +0,0 @@
-^/etc/fpc.cfg$
diff --git a/devel/fpc/volatiles b/devel/fpc/volatiles
deleted file mode 100755
index a35843c..0000000
--- a/devel/fpc/volatiles
+++ /dev/null
@@ -1 +0,0 @@
-^/etc/fpc.cfg$
diff --git a/graphics/gocr/DETAILS b/graphics/gocr/DETAILS
index 5b439e3..c5a425a 100755
--- a/graphics/gocr/DETAILS
+++ b/graphics/gocr/DETAILS
@@ -1,6 +1,6 @@
SPELL=gocr
- VERSION=0.43
-
SOURCE_HASH=sha512:142ec5cbd10e2d644a4b07ddfa62cb00e7c443ea8423b9e1a09416d59b0897bcea30fb9eea7abe0d6f30560248a91cc91292989b1d27bc34407f91d95d1bb9d5
+ VERSION=0.44
+
SOURCE_HASH=sha512:d63c369bd4db09057886939a14830866ea7c5f820e32aafd86c7931cb7c4b1f0e8769920672ef509350e2a7476b6249b63f1c443656a9ff42a769a7e9341bb8a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/jocr/$SOURCE
diff --git a/graphics/gocr/HISTORY b/graphics/gocr/HISTORY
index a0c006d..d1b4bc1 100644
--- a/graphics/gocr/HISTORY
+++ b/graphics/gocr/HISTORY
@@ -1,3 +1,6 @@
+2007-03-01 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 0.44
+
2007-02-01 Treeve Jelbert <treeve AT pi.be>
* DEPENDS: remove tk, netpbm is optional

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dfd30bb2ac995ca67db94505416b6b37a583c6ff), Treeve Jelbert, 03/02/2007