Skip to Content.
Sympa Menu

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

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 (b848bb4df4b13c5d64dc1046a0c4d806f779b831)
  • Date: Tue, 20 Sep 2011 03:37:26 -0500

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

chat-im/amsn/DETAILS | 4 ++--
chat-im/amsn/HISTORY | 3 +++
chat-im/amsn/PREPARE | 8 ++------
chat-irc/weechat/BUILD | 8 ++++----
chat-irc/weechat/DEPENDS | 15 +++++++++------
chat-irc/weechat/DETAILS | 24 +++++++-----------------
chat-irc/weechat/HISTORY | 6 ++++++
chat-irc/weechat/INSTALL | 7 +++++--
chat-irc/weechat/PREPARE | 24 +++++++++++++-----------
e-17/ecore/DEPENDS | 4 ++--
e-17/ecore/DETAILS | 4 ++--
e-17/ecore/HISTORY | 5 +++++
e-17/ecore/PREPARE | 9 ++-------
e-17/ecore/PRE_BUILD | 2 +-
editors/vim/DEPENDS | 29 +++++++++++++++--------------
editors/vim/DETAILS | 4 ++--
editors/vim/HISTORY | 3 +++
editors/vim/PREPARE | 6 ++----
windowmanagers/blackbox/BUILD | 2 +-
windowmanagers/blackbox/DEPENDS | 2 +-
windowmanagers/blackbox/DETAILS | 7 +++----
windowmanagers/blackbox/HISTORY | 3 +++
windowmanagers/blackbox/INSTALL | 2 +-
windowmanagers/blackbox/PREPARE | 8 ++------
windowmanagers/blackbox/PRE_BUILD | 2 +-
25 files changed, 97 insertions(+), 94 deletions(-)

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

blackbox: Use prepare_select_branch

commit 408a25f3f9c8956732a4a3dc2c816330c5cd4987
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

blackbox: Abbreviate SOURCE_URL[0]

commit 44c9661e836fde9399df9c6bdb5d6f58d89a8396
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

amsn: Use prepare_select_branch

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

weechat: Use prepare_select_branch

Also fix prefix for config variables, and scm branch dependency mess.

commit 79bc2ecbfa96aa54293cf5461d9e738ee64cdb99
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

weechat: Make compatibility symlink optional

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

vim: Simplify the chain of ifs at the end of DEPENDS to a case statement

commit 7a0ab8491b274307fca3106d91a888c113861639
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vim: Use prepare_select_branch

commit 6c2c78669bb73eaaae8a2c71264930dd9c337f1e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ecore: Now it depends on subversion instead of CVS

And it's only needed if using the scm branch.

commit 284e9f357d57812f8938be88d1b0f82cf301d6d5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ecore: Use prepare_select_branch

diff --git a/chat-im/amsn/DETAILS b/chat-im/amsn/DETAILS
index 5f82520..0517de5 100755
--- a/chat-im/amsn/DETAILS
+++ b/chat-im/amsn/DETAILS
@@ -1,6 +1,6 @@
SPELL=amsn
-if [ "$AMSN_SCM" == "y" ]; then
- if [ "$AMSN_SCM_AUTOUPDATE" == "y" ]; then
+if [[ $AMSN_BRANCH == scm ]]; then
+ if [[ $AMSN_AUTOUPDATE == y ]]; then
VERSION="$(date +%Y%m%d)"
else
VERSION=svnsnapshot
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index 0320250..fff8e77 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/chat-im/amsn/PREPARE b/chat-im/amsn/PREPARE
index 822f5ec..98d27e4 100755
--- a/chat-im/amsn/PREPARE
+++ b/chat-im/amsn/PREPARE
@@ -1,6 +1,2 @@
-config_query AMSN_SCM "Build a subversion snapshot?" n &&
-
-if [ "$AMSN_SCM" == "y" ]; then
- config_query AMSN_SCM_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-irc/weechat/BUILD b/chat-irc/weechat/BUILD
index 7eb84d0..b1ab749 100755
--- a/chat-irc/weechat/BUILD
+++ b/chat-irc/weechat/BUILD
@@ -1,19 +1,19 @@
-if [ "$DEV_DEBUG" == "y" ]; then
- if [ "$DEV_DEBUG_FULL" == "y" ]; then
+if [[ $WEECHAT_DEBUG == y ]]; then
+ if [[ $WEECHAT_DEBUG_FULL == y ]]; then
OPTS="$OPTS --with-debug=2"
else
OPTS="$OPTS --with-debug=1"
fi
fi &&

-if [ "$DEV_CMAKE" == "y" ]; then
+if [[ $WEECHAT_CMAKE == y ]]; then
cd $SOURCE_DIRECTORY &&
mkdir build &&
cd build &&
cmake .. -DPREFIX=/usr &&
make
else
- if [ "$WEECHAT_DEVEL_CVS" == "y" ]; then
+ if [[ $WEECHAT_BRANCH == scm ]]; then
./autogen.sh
fi &&
default_build
diff --git a/chat-irc/weechat/DEPENDS b/chat-irc/weechat/DEPENDS
index 52811a2..5a38c37 100755
--- a/chat-irc/weechat/DEPENDS
+++ b/chat-irc/weechat/DEPENDS
@@ -1,11 +1,14 @@
-if [ "$WEECHAT_DEVEL_CVS" == "y" -a "$DEV_CMAKE" != "y" ]; then
+if [[ $WEECHAT_BRANCH == scm ]]; then
depends git &&
- depends cvs &&
- depends autoconf &&
- depends automake &&
depends gettext &&
- depends libtool
-elif [ "$DEV_CMAKE" == "y" ]; then
+ if [[ $WEECHAT_CMAKE != y ]]; then
+ depends autoconf &&
+ depends automake &&
+ depends libtool
+ fi
+fi &&
+
+if [[ $WEECHAT_CMAKE == y ]]; then
depends cmake
fi &&
depends ncurses &&
diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index 8c0f851..488ab01 100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
@@ -1,21 +1,11 @@
SPELL=weechat
-if [ "$WEECHAT_DEVEL" == "y" ]; then
- if [ "$WEECHAT_DEVEL_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- if [ "$WEECHAT_DEVEL_CVS" == "y" ]; then
- VERSION=git
- else
- VERSION=devel
- fi
- fi
- if [ "$WEECHAT_DEVEL_CVS" == "y" ]; then
- SOURCE=weechat-git.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-git
- else
- SOURCE=weechat-devel.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-devel
+if [ "$WEECHAT_BRANCH" != "stable" ]; then
+ VERSION=$WEECHAT_BRANCH
+ if [ "$WEECHAT_AUTOUPDATE" == "y" ]; then
+ VERSION+=-$(date +%Y%m%d)
fi
+ SOURCE=weechat-$WEECHAT_BRANCH.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-$WEECHAT_BRANCH
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
@@ -24,7 +14,7 @@ else
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
-if [ "$WEECHAT_DEVEL_CVS" == "y" ]; then
+if [ "$WEECHAT_BRANCH" == "scm" ]; then
SOURCE_URL[1]=git://git.sv.gnu.org/weechat.git:$SPELL
else
SOURCE_URL[1]=http://www.weechat.org/files/src/$SOURCE
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index 81b50e2..1975d48 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,3 +1,9 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL, PREPARE: Make compatibility symlink optional
+ * BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: Use prepare_select_branch
+ Fixed prefix for config variables.
+ Fixed scm branch dependency mess.
+
2010-08-09 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated WEECHAT_DEVEL=n to 0.3.3

diff --git a/chat-irc/weechat/INSTALL b/chat-irc/weechat/INSTALL
index cf5d641..f98f33e 100755
--- a/chat-irc/weechat/INSTALL
+++ b/chat-irc/weechat/INSTALL
@@ -1,7 +1,10 @@
-if [ "$DEV_CMAKE" == "y" ]; then
+if [[ $WEECHAT_CMAKE == y ]]; then
cd ${SOURCE_DIRECTORY}/build &&
make install
else
default_install
fi &&
-ln -s weechat-curses ${INSTALL_ROOT}/usr/bin/weechat
+
+if [[ $WEECHAT_SYMLINKS == y ]]; then
+ ln -s weechat-curses ${INSTALL_ROOT}/usr/bin/weechat
+fi
diff --git a/chat-irc/weechat/PREPARE b/chat-irc/weechat/PREPARE
index 26b1e5b..05b612f 100755
--- a/chat-irc/weechat/PREPARE
+++ b/chat-irc/weechat/PREPARE
@@ -1,11 +1,13 @@
-config_query WEECHAT_DEVEL "Build development version?" n
-if [ "$WEECHAT_DEVEL" == "y" ]; then
- config_query WEECHAT_DEVEL_CVS "Use git version instead of devel package?"
n
- config_query WEECHAT_DEVEL_AUTOUPDATE \
- "Update to the latest devel automatically on every cast?" n
- config_query DEV_DEBUG "Enable debug messages?" n
- if [ "$DEV_DEBUG" == "y" ]; then config_query DEV_DEBUG_FULL "Print debug
messages to the window?" n; fi
- if [ "$WEECHAT_DEVEL_CVS" == "y" ]; then
- config_query DEV_CMAKE "Use cmake instead of autotools? (may fail, still
in testing)" n
- fi
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm &&
+case "$WEECHAT_BRANCH" in
+ scm|devel)
+ config_query WEECHAT_DEBUG "Enable debug messages?" n &&
+ if [ "$WEECHAT_DEBUG" == "y" ]; then
+ config_query WEECHAT_DEBUG_FULL "Print debug messages to the window?" n
+ fi &&
+ config_query WEECHAT_CMAKE "Use cmake instead of autotools? (may fail,
still in testing)" n
+ ;;
+esac &&
+
+config_query WEECHAT_SYMLINKS "Make compatibility symlinks?" y
diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index 614cbdd..bc76688 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -1,11 +1,11 @@
depends curl '--enable-curl' &&
-depends CVS &&
depends dbus '--enable-ecore-dbus' &&
depends eina &&
depends evas &&
depends libxcursor &&

-if [ "$ECORE_CVS" = "y" ]; then
+if [ "$ECORE_BRANCH" = "scm" ]; then
+ depends subversion &&
depends libtool &&
depends automake &&
depends subversion
diff --git a/e-17/ecore/DETAILS b/e-17/ecore/DETAILS
index 598d90c..6f6862f 100755
--- a/e-17/ecore/DETAILS
+++ b/e-17/ecore/DETAILS
@@ -1,6 +1,6 @@
SPELL=ecore
-if [ "$ECORE_CVS" == "y" ]; then
- if [ "$ECORE_CVS_AUTOUPDATE" == "y" ]; then
+if [ "$ECORE_BRANCH" == "scm" ]; then
+ if [ "$ECORE_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index 300a20b..12857b1 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,8 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+ * DEPENDS: Now it depends on subversion instead of CVS
+ and it's only needed if using the scm branch
+
2011-01-29 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DETAILS: updating version and url for 1.0.0

diff --git a/e-17/ecore/PREPARE b/e-17/ecore/PREPARE
index fef57be..98d27e4 100755
--- a/e-17/ecore/PREPARE
+++ b/e-17/ecore/PREPARE
@@ -1,7 +1,2 @@
-config_query ECORE_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$ECORE_CVS" == "y" ]; then
- config_query ECORE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
-
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/ecore/PRE_BUILD b/e-17/ecore/PRE_BUILD
index 0b59249..8e591a1 100755
--- a/e-17/ecore/PRE_BUILD
+++ b/e-17/ecore/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$ECORE_CVS" == "y" ]; then
+if [ "$ECORE_BRANCH" == "scm" ]; then
cd $SOURCE_DIRECTORY &&

#
diff --git a/editors/vim/DEPENDS b/editors/vim/DEPENDS
index 8110b44..668af7f 100755
--- a/editors/vim/DEPENDS
+++ b/editors/vim/DEPENDS
@@ -1,4 +1,4 @@
-if [[ "${VIM_CVS}" == "y" ]]
+if [[ "${VIM_BRANCH}" == "scm" ]]
then depends CVS
fi &&

@@ -58,16 +58,17 @@ optional_depends acl \
"--disable-acl" \
"would you like file system access control list support?" &&

-if [ "$GVIM_GUI" = "gtk" ]; then
- depends gtk+
-elif [ "$GVIM_GUI" = "gnome" ]; then
- depends gnome-libs
-elif [ "$GVIM_GUI" = "gtk2" ]; then
- depends gtk+2
-elif [ "$GVIM_GUI" = "gnome2" ]; then
- depends libgnomeui
-elif [ "$GVIM_GUI" = "motif" ]; then
- depends MOTIF
-elif [ "$GVIM_GUI" = "athena" ]; then
- depends xorg-libs
-fi
+case "$GVIM_GUI" in
+gtk)
+ depends gtk+ ;;
+gnome)
+ depends gnome-libs ;;
+gtk2)
+ depends gtk+2 ;;
+gnome2)
+ depends libgnomeui ;;
+motif)
+ depends MOTIF ;;
+athena)
+ depends xorg-libs ;;
+esac
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 2327fc2..6d50327 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -1,8 +1,8 @@
SPELL=vim
-if [[ "${VIM_CVS}" == "y" ]]
+if [[ "${VIM_BRANCH}" == "scm" ]]
then

- if [[ "${VIM_CVS_AUTOUPDATE}" == "y" ]]
+ if [[ "${VIM_AUTOUPDATE}" == "y" ]]
then VERSION=$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else VERSION=cvs
fi
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 239735e..4be8d5d 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-04-04 Justin Boffemmyer <flux AT sourcemage.org>
* PRE_BUILD: correct patch loop logic so it prints 0-padded numbers
and
can find the patch files
diff --git a/editors/vim/PREPARE b/editors/vim/PREPARE
index 9db39a4..98d27e4 100755
--- a/editors/vim/PREPARE
+++ b/editors/vim/PREPARE
@@ -1,4 +1,2 @@
-config_query VIM_CVS "Build the CVS version?" n
-if [[ "${VIM_CVS}" == "y" ]]
-then config_query VIM_CVS_AUTOUPDATE "Update cvs repo on every update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/windowmanagers/blackbox/BUILD b/windowmanagers/blackbox/BUILD
index 33e49a8..9c37888 100755
--- a/windowmanagers/blackbox/BUILD
+++ b/windowmanagers/blackbox/BUILD
@@ -1,4 +1,4 @@
-if [ "${BLACKBOX_CVS}" == "y" ] ; then
+if [[ $BLACKBOX_BRANCH == scm ]]; then
aclocal &&
./mk.sh
fi &&
diff --git a/windowmanagers/blackbox/DEPENDS b/windowmanagers/blackbox/DEPENDS
index 1556b19..d381d56 100755
--- a/windowmanagers/blackbox/DEPENDS
+++ b/windowmanagers/blackbox/DEPENDS
@@ -1,5 +1,5 @@
depends xorg-libs &&
-if [ "${BLACKBOX_CVS}" == "y" ] ; then
+if [[ ${BLACKBOX_BRANCH == scm ]]; then
depends libtool &&
depends automake
fi &&
diff --git a/windowmanagers/blackbox/DETAILS b/windowmanagers/blackbox/DETAILS
index 47dd50a..2475d76 100755
--- a/windowmanagers/blackbox/DETAILS
+++ b/windowmanagers/blackbox/DETAILS
@@ -1,14 +1,13 @@
SPELL=blackbox
-
-if [ "${BLACKBOX_CVS}" = "y" ] ; then
- if [ "${BLACKBOX_CVS_AUTOUPDATE}" = "y" ] ; then
+if [[ $BLACKBOX_BRANCH == scm ]]; then
+ if [[ $BLACKBOX_AUTOUPDATE == y ]] ; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
fi
SOURCE=${SPELL}-cvs-snapshot.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
-
SOURCE_URL[0]=http://blackboxwm.sourceforge.net/blackbox-cvs-snapshot.tar.bz2
+ SOURCE_URL[0]=http://blackboxwm.sourceforge.net/$SOURCE
SOURCE_IGNORE=cvs
FORCE_DOWNLOAD=on
else
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index b96e046..2a57897 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use
prepare_select_branch
+
2011-09-19 Arjan Bouter <abouter AT sourcemage.org>
* PRE_BUILD: added Jeremy Kajikawa's build fix for bug #178
and changed _XUTIL_H_ to _X11& in lib/Util.cc (opensuse fix)
diff --git a/windowmanagers/blackbox/INSTALL b/windowmanagers/blackbox/INSTALL
index c514af8..88255cc 100755
--- a/windowmanagers/blackbox/INSTALL
+++ b/windowmanagers/blackbox/INSTALL
@@ -1,2 +1,2 @@
-default_install &&
+default_install &&
install_wmfiles
diff --git a/windowmanagers/blackbox/PREPARE b/windowmanagers/blackbox/PREPARE
index 353ae21..98d27e4 100755
--- a/windowmanagers/blackbox/PREPARE
+++ b/windowmanagers/blackbox/PREPARE
@@ -1,6 +1,2 @@
-config_query BLACKBOX_CVS "Build from nightly cvs snapshot?" n
-
-if [ "$BLACKBOX_CVS" == "y" ]; then
- config_query BLACKBOX_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/windowmanagers/blackbox/PRE_BUILD
b/windowmanagers/blackbox/PRE_BUILD
index 344d369..fb8724d 100755
--- a/windowmanagers/blackbox/PRE_BUILD
+++ b/windowmanagers/blackbox/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-if [ "${BLACKBOX_CVS}" == "y" ] ; then
+if [[ $BLACKBOX_BRANCH == scm ]]; then
aclocal &&
libtoolize -c &&
autoheader &&



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b848bb4df4b13c5d64dc1046a0c4d806f779b831), Ismael Luceno, 09/20/2011

Archive powered by MHonArc 2.6.24.

Top of Page