Skip to Content.
Sympa Menu

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

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 (c07b260c4fe535dff352e33b890686e6fedebbb5)
  • Date: Fri, 26 Nov 2010 23:15:06 -0600

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

editors/emacs/BUILD | 15 ++++++++-------
editors/emacs/DEPENDS | 4 ++--
editors/emacs/DETAILS | 12 ++++++------
editors/emacs/HISTORY | 3 +++
editors/emacs/PREPARE | 7 ++++---
5 files changed, 23 insertions(+), 18 deletions(-)

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

emacs: update to build from the new bzr repo

commit 0dd191cbe215fe52baf4e167c34f115468946caf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

emacs: fix whitespace

diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index cb62051..322fe52 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -1,17 +1,18 @@
- # don't make it track all info files in /usr/share/info
+# don't make it track all info files in /usr/share/info
# sedit 's:${COPYDESTS} ${infodir}:${COPYDESTS}:' Makefile.in &&
- # Fixes Bug #2938
- export LDFLAGS="${LDFLAGS/-z combreloc/}" &&
+
+# Fixes Bug #2938
+export LDFLAGS="${LDFLAGS/-z combreloc/}" &&

#
# Fails to link if using -Wl,-O1
#
export LDFLAGS="${LDFLAGS//-Wl,-O1/}" &&

-if [ "$CVS" == "y" ]; then
- # Crashes with -03
+if [ "$VCS" == "y" ]; then
+ # Crashes with -O3
export CFLAGS="${CFLAGS//-O3/-O2}" &&
-
+
OPTS="$OPTS --build=${BUILD}"

[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
@@ -23,6 +24,6 @@ if [ "$CVS" == "y" ]; then
--infodir=${INSTALL_ROOT}/usr/share/info \
$OPTS &&
make bootstrap
-else
+else
default_build
fi
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 895294f..d413125 100755
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -38,6 +38,6 @@ optional_depends "gtk+2" \
"" \
"for GTK+2 look" &&

-if [ "$CVS" == "y" ]; then
-depends CVS
+if [ "$VCS" == "y" ]; then
+ depends bzr
fi
diff --git a/editors/emacs/DETAILS b/editors/emacs/DETAILS
index 54fae20..776cd26 100755
--- a/editors/emacs/DETAILS
+++ b/editors/emacs/DETAILS
@@ -1,13 +1,13 @@
SPELL=emacs
-if [ "$CVS" == "y" ]; then
- if [ "$CVS_AUTOUPDATE" == "y" ]; then
+if [ "$VCS" == "y" ]; then
+ if [ "$VCS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=trunk
fi
- SOURCE=$SPELL-cvs.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.savannah.gnu.org:/sources/emacs:emacs
+ SOURCE=$SPELL-trunk.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-trunk
+ SOURCE_URL[0]=bzr://bzr.savannah.gnu.org/emacs/trunk/:emacs-trunk
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index b5731fd..7fecd08 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,6 @@
+2010-11-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated to build from the new bzr repo
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/editors/emacs/PREPARE b/editors/emacs/PREPARE
index 9b78568..7d4a8a3 100755
--- a/editors/emacs/PREPARE
+++ b/editors/emacs/PREPARE
@@ -1,4 +1,5 @@
-config_query CVS "Use the CVS version? (offers optional GTK+2 interface)"
n
-if [ "$CVS" == "y" ]; then
- config_query CVS_AUTOUPDATE "Update to the latest CVS automatically on
every cast?" n
+config_query VCS "Use the trunk version?" n
+
+if [ "$VCS" == "y" ]; then
+ config_query VCS_AUTOUPDATE "Update to the latest trunk automatically on
every cast?" n
fi




Archive powered by MHonArc 2.6.24.

Top of Page