Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (39d3383fff45ed5a39f143990553a77d854deddb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (39d3383fff45ed5a39f143990553a77d854deddb)
  • Date: Tue, 18 Jul 2006 10:34:48 -0500

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

devel/fpc/BUILD | 4 ++--
devel/fpc/HISTORY | 6 ++++++
devel/fpc/INSTALL | 11 ++++-------
devel/fpc/configs | 1 +
devel/fpc/volatiles | 1 +
5 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 39d3383fff45ed5a39f143990553a77d854deddb
Merge: 5d47c0afd0ea4e8d9ed2dadca81baf1c111f6d1b
58228992498dffab179196a1c5b9dd9b4443ca3b
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

Merge with git+ssh://alevstik AT scm.sourcemage.org/smgl/grimoire.git

commit 5d47c0afd0ea4e8d9ed2dadca81baf1c111f6d1b
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

fpc: fix broken spell, it didn't build on rebuild, it didn't work with
any other
spell

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index ea4b6ea..d9d77dc 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -2,8 +2,8 @@ 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
+ make all
+fi &&
# optionally install source files, for use with Lazarus
if [ $FPC_SRC == "y" ];then

diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index 37e6655..bc31255 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,9 @@
+2006-07-18 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * INSTALL: fix the brokeness for bug #12742, use install_config_file
+ * volatiles: added for config files
+ * configs: added for config files
+ * BUILD: broken build chain
+
2006-06-23 David Kowis <dkowis AT shlrm.org>
* DETAILS: fixed a glitch with spell_ok

diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index 1231732..c345788 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -3,18 +3,17 @@ FPCDEST=${INSTALL_ROOT}/usr
FPCDIR=$FPCDEST/lib/fpc/$VERSION &&
FPC_COMP=$SOURCE_DIRECTORY/compiler/ppc386 &&
FPC_MAKE=$SOURCE_DIRECTORY/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 &&
- mkdir -p $FPCDIR &&
- chown pascal:pascal $FPCDIR &&
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 &&
- ln -sf $FPCDIR/ppc386 $FPCDEST/bin &&
cd ../utils &&
make install PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE &&
# link to the already installed units
@@ -24,8 +23,6 @@ # link to the already installed units
else
make install PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST
fi &&
-
+ln -sf $FPCDIR/ppc386 $FPCDEST/bin &&
# create a config file if none exists
-if ! [ -f ${INSTALL_ROOT}/etc/fpc.cfg ];then
- $FPCDIR/samplecfg $FPCDIR ${INSTALL_ROOT}/etc
-fi
+install_config_file $FPCDIR/samplecfg ${INSTALL_ROOT}/etc/fpc.cfg
diff --git a/devel/fpc/configs b/devel/fpc/configs
new file mode 100755
index 0000000..a35843c
--- /dev/null
+++ b/devel/fpc/configs
@@ -0,0 +1 @@
+^/etc/fpc.cfg$
diff --git a/devel/fpc/volatiles b/devel/fpc/volatiles
new file mode 100755
index 0000000..a35843c
--- /dev/null
+++ b/devel/fpc/volatiles
@@ -0,0 +1 @@
+^/etc/fpc.cfg$



  • [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (39d3383fff45ed5a39f143990553a77d854deddb), Andra?? Levstik, 07/18/2006

Archive powered by MHonArc 2.6.24.

Top of Page