Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (7a061393e688344a6933972890da5df8e1aa0011)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (7a061393e688344a6933972890da5df8e1aa0011)
  • Date: Fri, 23 Feb 2007 15:30:43 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

audio-players/mpd/DEPENDS | 2 -
audio-players/mpd/HISTORY | 4 +-
database/mysql/BUILD | 88
++++++++++++++++++++++++++--------------------
database/mysql/CONFIGURE | 1
database/mysql/DEPENDS | 3 +
database/mysql/HISTORY | 6 +++
devel/refal5/BUILD | 2 -
devel/refal5/DETAILS | 2 -
devel/refal5/HISTORY | 10 +++++
devel/refal5/INSTALL | 4 +-
devel/refal5/PRE_BUILD | 6 ++-
xfce/terminal/DETAILS | 2 -
xfce/terminal/HISTORY | 6 ++-
xfce/terminal/PRE_BUILD | 19 +++++----
xfce/thunar/DETAILS | 1
xfce/thunar/HISTORY | 4 ++
xfce/thunar/PRE_BUILD | 14 +++++++
17 files changed, 117 insertions(+), 57 deletions(-)

New commits:
commit 4a9b0bb3a60187a673ec07e7cf2c8c6422020a8b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

devel/refal5:

DETAILS: PATCHLEVEL++
BUILD: explicitly pointed which ref files to compile to avoid
test.rsl installation
INSTALL: added -p to mkdir, renamed rdhelp.txt to reftr.hlp for Refal
tracer to display help correctly
PRE_BUILD: added one more sedit line to make tracer help file
available for him, added our CFLAGS for linking too, made it to link
with -lxml2

commit 777fe752ad49ea9998d24b77b2e66cc07d1fbf5f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

database/mysql:

BUILD: made LD_PRELOAD_OLD local, track_rootifying pkglibdir, added
checking for "none" choice
CONFIGURE: added "none" to engines list
DEPENDS: added checking for "none" choice

commit e3299b6aa5903e0f282ece3aca88c4847f6bb4f0
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-players/mpd:

DEPENDS: switched to libmpcdec from deprecated libmusepack
HISTORY: removed empty line

commit 20185e93d6192f6911979e37e81bea8026ab519b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/terminal:

PRE_BUILD: made loop for easy adding new language

commit 3818d23ba799342b1f6031c8745da18aaa8a440d
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/thunar:

DETAILS: PATCHLEVEL++
PRE_BUILD: added for proper docs installation

commit 78a62d436e70e70b1b63c2210d5ea9011edba197
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/terminal:

PRE_BUILD: added more sedits for proper japan docs installation
DETAILS: PATCHLEVEL++
HISTORY: removed empty line

diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index c6dc456..f2fb706 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -10,7 +10,7 @@ optional_depends "libvorbis"
"--disable-ogg" \
"for ogg/vorbis support" &&

-optional_depends "libmusepack" \
+optional_depends "libmpcdec" \
"--enable-mpc" \
"--disable-mpc" \
"for musepack support" &&
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 6d500be..a7bd747 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2007-02-19 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: switched to libmpcdec from deprecated libmusepack
+
2006-12-27 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.12.1, switched to bz2 tarball, changed
SOURCE_URL
@@ -47,4 +50,3 @@

2004-05-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS, DETAILS, HISTORY: created this spell
-
diff --git a/database/mysql/BUILD b/database/mysql/BUILD
index bfe76e4..04084d4 100755
--- a/database/mysql/BUILD
+++ b/database/mysql/BUILD
@@ -1,47 +1,59 @@
-if list_find "$MSQL_ENGINES" "ARCHIVE" ; then
- OPTS="--with-archive-storage-engine $OPTS"
+if list_find "$MSQL_ENGINES" "none" ; then
+ OPTS="--without-archive-storage-engine \
+ --without-berkeley-db \
+ --without-blackhole-storage-engine \
+ --without-csv-storage-engine \
+ --without-example-storage-engine \
+ --without-federated-storage-engine \
+ --without-innodb \
+ --without-ndbcluster \
+ $OPTS"
else
- OPTS="--without-archive-storage-engine $OPTS"
-fi &&
-if ! list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
- OPTS="--without-berkeley-db $OPTS"
-fi &&
-if list_find "$MSQL_ENGINES" "BLACKHOLE" ; then
- OPTS="--with-blackhole-storage-engine $OPTS"
-else
- OPTS="--without-blackhole-storage-engine $OPTS"
-fi &&
-if list_find "$MSQL_ENGINES" "CSV" ; then
- OPTS="--with-csv-storage-engine $OPTS"
-else
- OPTS="--without-csv-storage-engine $OPTS"
-fi &&
-if list_find "$MSQL_ENGINES" "EXAMPLE" ; then
- OPTS="--with-example-storage-engine $OPTS"
-else
- OPTS="--without-example-storage-engine $OPTS"
-fi &&
-if list_find "$MSQL_ENGINES" "FEDERATED" ; then
- OPTS="--with-federated-storage-engine $OPTS"
-else
- OPTS="--without-federated-storage-engine $OPTS"
-fi &&
-if list_find "$MSQL_ENGINES" "InnoDB" ; then
- OPTS="--with-innodb $OPTS"
-else
- OPTS="--without-innodb $OPTS"
-fi &&
-if list_find "$MSQL_ENGINES" "ndbcluster" ; then
- OPTS="--with-ndbcluster $OPTS"
-else
- OPTS="--without-ndbcluster $OPTS"
+ if list_find "$MSQL_ENGINES" "ARCHIVE" ; then
+ OPTS="--with-archive-storage-engine $OPTS"
+ else
+ OPTS="--without-archive-storage-engine $OPTS"
+ fi &&
+ if ! list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
+ OPTS="--without-berkeley-db $OPTS"
+ fi &&
+ if list_find "$MSQL_ENGINES" "BLACKHOLE" ; then
+ OPTS="--with-blackhole-storage-engine $OPTS"
+ else
+ OPTS="--without-blackhole-storage-engine $OPTS"
+ fi &&
+ if list_find "$MSQL_ENGINES" "CSV" ; then
+ OPTS="--with-csv-storage-engine $OPTS"
+ else
+ OPTS="--without-csv-storage-engine $OPTS"
+ fi &&
+ if list_find "$MSQL_ENGINES" "EXAMPLE" ; then
+ OPTS="--with-example-storage-engine $OPTS"
+ else
+ OPTS="--without-example-storage-engine $OPTS"
+ fi &&
+ if list_find "$MSQL_ENGINES" "FEDERATED" ; then
+ OPTS="--with-federated-storage-engine $OPTS"
+ else
+ OPTS="--without-federated-storage-engine $OPTS"
+ fi &&
+ if list_find "$MSQL_ENGINES" "InnoDB" ; then
+ OPTS="--with-innodb $OPTS"
+ else
+ OPTS="--without-innodb $OPTS"
+ fi &&
+ if list_find "$MSQL_ENGINES" "ndbcluster" ; then
+ OPTS="--with-ndbcluster $OPTS"
+ else
+ OPTS="--without-ndbcluster $OPTS"
+ fi
fi &&

OPTS="$MSQL_SERVER $MSQL_EMBED $OPTS" &&

create_account mysql &&

-LD_PRELOAD_OLD="$LD_PRELOAD" &&
+local LD_PRELOAD_OLD="$LD_PRELOAD" &&
unset LD_PRELOAD &&
export CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&

@@ -67,4 +79,4 @@ default_build
# $OPTS &&

export LD_PRELOAD="$LD_PRELOAD_OLD" &&
-make pkglibdir=/usr/lib
+make pkglibdir=${TRACK_ROOT}/usr/lib
diff --git a/database/mysql/CONFIGURE b/database/mysql/CONFIGURE
index a1fcd24..663da98 100755
--- a/database/mysql/CONFIGURE
+++ b/database/mysql/CONFIGURE
@@ -3,6 +3,7 @@ source $GRIMOIRE/config_query_multi.func
config_query_option MSQL_SERVER "Install client only?" n
"--without-server" "" &&
config_query_multi MSQL_ENGINES \
"What additional storage engines to build?" \
+ none \
all \
ARCHIVE \
BerkeleyDB \
diff --git a/database/mysql/DEPENDS b/database/mysql/DEPENDS
index 80659dc..6dc36f6 100755
--- a/database/mysql/DEPENDS
+++ b/database/mysql/DEPENDS
@@ -3,6 +3,7 @@ depends perl &&
depends procps &&
depends g++ &&

-if list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
+if ! list_find "$MSQL_ENGINES" "none" && list_find "$MSQL_ENGINES"
"BerkeleyDB"
+then
depends db "--with-berkeley-db"
fi
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 3e939ec..ffd18ca 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,9 @@
+2007-02-20 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: made LD_PRELOAD_OLD local, track_rootifying pkglibdir, added
+ checking for "none" choice
+ * CONFIGURE: added "none" to engines list
+ * DEPENDS: added checking for "none" choice
+
2007-01-11 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 5.0.33

diff --git a/devel/refal5/BUILD b/devel/refal5/BUILD
index c6bdb0f..008b7ca 100755
--- a/devel/refal5/BUILD
+++ b/devel/refal5/BUILD
@@ -1,6 +1,6 @@
make &&

-for file in *.ref
+for file in {e,mbprep,reflib}.ref
do
./refc ${file}
done
diff --git a/devel/refal5/DETAILS b/devel/refal5/DETAILS
index 37ff9c8..6607f58 100755
--- a/devel/refal5/DETAILS
+++ b/devel/refal5/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
WEB_SITE=http://refal.org/
LICENSE[0]=UNKNOWN
ENTERED=20061218
- PATCHLEVEL=1
+ PATCHLEVEL=2
KEYWORDS="devel"
DOCS="bf.txt copyright.txt news.txt readme.txt README"
SHORT="REFAL is a REcursive Functions ALgorithmic programming
language"
diff --git a/devel/refal5/HISTORY b/devel/refal5/HISTORY
index 9aca8c6..1a97fa8 100644
--- a/devel/refal5/HISTORY
+++ b/devel/refal5/HISTORY
@@ -1,3 +1,13 @@
+2007-02-21 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * BUILD: explicitly pointed which ref files to compile to avoid
+ test.rsl installation
+ * INSTALL: added -p to mkdir, renamed rdhelp.txt to reftr.hlp for
Refal
+ tracer to display help correctly
+ * PRE_BUILD: added one more sedit line to make tracer help file
+ available for him, added our CFLAGS for linking too, made it to link
+ with -lxml2
+
2006-12-19 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCHLEVEL++
* PRE_BUILD, refal5-config.patch: added patch for better handling of
diff --git a/devel/refal5/INSTALL b/devel/refal5/INSTALL
index a882935..7b14adc 100755
--- a/devel/refal5/INSTALL
+++ b/devel/refal5/INSTALL
@@ -1,4 +1,4 @@
-mkdir ${INSTALL_ROOT}/usr/share/${SPELL} &&
+mkdir -p ${INSTALL_ROOT}/usr/share/${SPELL} &&
for file in *.rsl
do
install ${file} ${INSTALL_ROOT}/usr/share/${SPELL}
@@ -7,5 +7,5 @@ for file in refc refgo reftr
do
install ${file} ${INSTALL_ROOT}/usr/bin
done &&
-install rdhelp.txt ${INSTALL_ROOT}/usr/share/${SPELL} &&
+install rdhelp.txt ${INSTALL_ROOT}/usr/share/${SPELL}/reftr.hlp &&
install_config_file ${SPELL}.cf_ ${INSTALL_ROOT}/etc/${SPELL}.cfg
diff --git a/devel/refal5/PRE_BUILD b/devel/refal5/PRE_BUILD
index d32c55a..b1260dd 100755
--- a/devel/refal5/PRE_BUILD
+++ b/devel/refal5/PRE_BUILD
@@ -9,6 +9,8 @@ cp makefile.lin makefile &&
rm -f *.rsl &&

sedit "s:/etc/refal5.cfg:${TRACK_ROOT}/etc/${SPELL}.cfg:" load.c &&
-sedit "s:-L./linux/:${LDFLAGS}:" makefile &&
-sedit "s:-c:${CFLAGS} -c:" makefile &&
+sedit "s:-L./linux/:${CFLAGS} ${LDFLAGS}:" makefile &&
+sedit "s:-lxmlparse -lxmltok:-lxml2:g" makefile &&
+sedit "s:-c:${CFLAGS} -c:" makefile &&
+sedit "s:reftr.hlp:${TRACK_ROOT}/usr/share/${SPELL}/reftr.hlp:" dtrace.c &&
sedit "s:REF5RSL=.*:REF5RSL=${TRACK_ROOT}/usr/share/${SPELL}:" ${SPELL}.cf_
diff --git a/xfce/terminal/DETAILS b/xfce/terminal/DETAILS
index babb18b..8be67a7 100755
--- a/xfce/terminal/DETAILS
+++ b/xfce/terminal/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Termin
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
WEB_SITE=http://terminal.os-cillation.com/
ENTERED=20050101
- PATCHLEVEL=2
+ PATCHLEVEL=3
LICENSE=GPL
DOCS="COPYING NEWS README"
KEYWORDS="terminal xfce"
diff --git a/xfce/terminal/HISTORY b/xfce/terminal/HISTORY
index 3324557..7b37dbb 100644
--- a/xfce/terminal/HISTORY
+++ b/xfce/terminal/HISTORY
@@ -1,3 +1,8 @@
+2007-02-19 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: added more sedits for proper japan docs installation,
made
+ it in loop, for easy adding new language
+ * DETAILS: PATCHLEVEL++
+
2007-01-23 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 4.4.0. Updated SOURCE & SOURCE_URL

@@ -31,4 +36,3 @@

2005-01-01 Bas van Gils <bas.vangils AT cs.ru.nl>
* created spell
-
diff --git a/xfce/terminal/PRE_BUILD b/xfce/terminal/PRE_BUILD
index 47929e5..b254517 100755
--- a/xfce/terminal/PRE_BUILD
+++ b/xfce/terminal/PRE_BUILD
@@ -1,9 +1,12 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-sedit "s:doc/Terminal:doc/${SPELL}:g" doc/C/Makefile.am &&
-sedit "s:doc/Terminal:doc/${SPELL}:g" doc/C/Makefile.in &&
-sedit "s:doc/Terminal:doc/${SPELL}:g" doc/C/images/Makefile.am &&
-sedit "s:doc/Terminal:doc/${SPELL}:g" doc/C/images/Makefile.in &&
-sedit "s:doc/Terminal:doc/${SPELL}:g" doc/Makefile.am &&
-sedit "s:doc/Terminal:doc/${SPELL}:g" doc/Makefile.in &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit "s:doc/Terminal:doc/${SPELL}:g" doc/Makefile.am &&
+sedit "s:doc/Terminal:doc/${SPELL}:g" doc/Makefile.in &&
+for lang in C ja
+do
+ sedit "s:doc/Terminal:doc/${SPELL}:g" doc/${lang}/Makefile.am &&
+ sedit "s:doc/Terminal:doc/${SPELL}:g" doc/${lang}/Makefile.in &&
+ sedit "s:doc/Terminal:doc/${SPELL}:g" doc/${lang}/images/Makefile.am &&
+ sedit "s:doc/Terminal:doc/${SPELL}:g" doc/${lang}/images/Makefile.in
+done &&
sedit "s:doc/Terminal:doc/${SPELL}:g" TerminalHelp.in
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index c785556..a804052 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Thunar
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=GPL
ENTERED=20030608
+ PATCHLEVEL=1
KEYWORDS="xfce"
SHORT="File manager for the XFce Desktop Environment"
cat << EOF
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index aa113df..866d986 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,7 @@
+2007-02-19 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: added for proper docs installation
+
2007-01-23 George Sherwood <george AT beernabeer.com>
* DEPENDS, DETAILS, HISTORY: created the spell

diff --git a/xfce/thunar/PRE_BUILD b/xfce/thunar/PRE_BUILD
new file mode 100755
index 0000000..6956dfc
--- /dev/null
+++ b/xfce/thunar/PRE_BUILD
@@ -0,0 +1,14 @@
+default_pre_build
&&
+cd ${SOURCE_DIRECTORY}
&&
+sedit "s:doc/Thunar:doc/${SPELL}:g" docs/Makefile.am
&&
+sedit "s:doc/Thunar:doc/${SPELL}:g" docs/Makefile.in
&&
+sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/Makefile.am
&&
+sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/Makefile.in
&&
+for lang in C es eu fr ja pl ru zh_TW
+do
+ sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/Makefile.am
&&
+ sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/Makefile.in
&&
+ sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/images/Makefile.am
&&
+ sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/images/Makefile.in
+done
&&
+sedit "s:doc/Thunar:doc/${SPELL}:g" ThunarHelp.in



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (7a061393e688344a6933972890da5df8e1aa0011), Pol Vinogradov, 02/23/2007

Archive powered by MHonArc 2.6.24.

Top of Page