Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b46cb9170081d3b7034fa9e5d5c526b057d9f022)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b46cb9170081d3b7034fa9e5d5c526b057d9f022)
  • Date: Mon, 24 Oct 2011 09:30:13 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

chat-im/licq/BUILD | 117
++++++++++++++++++++++---------------------------
chat-im/licq/DEPENDS | 14 +++--
chat-im/licq/DETAILS | 41 ++---------------
chat-im/licq/HISTORY | 11 ++++
chat-im/licq/INSTALL | 49 ++++++++------------
chat-im/licq/PREPARE | 16 +++---
chat-im/licq/PRE_BUILD | 32 -------------
7 files changed, 108 insertions(+), 172 deletions(-)

New commits:
commit b46cb9170081d3b7034fa9e5d5c526b057d9f022
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-im/licq: stable version 1.5.1, changed scm to git

diff --git a/chat-im/licq/BUILD b/chat-im/licq/BUILD
index 921f62c..72e211d 100755
--- a/chat-im/licq/BUILD
+++ b/chat-im/licq/BUILD
@@ -1,63 +1,54 @@
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- default_build &&
-
- if [[ "$CDK" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins/console &&
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- default_build
- fi &&
-
- if [[ "$QT4GUI" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins/qt4-gui &&
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- mkdir build &&
- cd build &&
- QTDIR=/usr &&
- PATH=$QTDIR/bin/qt4:$PATH &&
- export QTDIR=/usr &&
- cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr .. &&
- make
- fi &&
-
- if [[ "$EMAIL" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins/email &&
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- default_build
- fi &&
-
- if [[ "$MSN" == "y" ]] && ! list_find "$OPTS" "--disable-openssl"; then
- cd $SOURCE_DIRECTORY/plugins/msn &&
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- default_build
- fi &&
-
- if [[ "$AREP" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins/auto-reply &&
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- default_build
- fi &&
-
- if [[ "$RMS" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins/rms &&
- if [[ "$LICQ_BRANCH" == "scm" ]]; then
- make -f Makefile.cvs
- fi &&
- default_build
- fi &&
-
- if [[ "$XOSD" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins/osd-${SOURCE7_VERSION} &&
- default_build
- fi
+local_cmake_build()
+{
+ mkdir -p build &&
+ cd build &&
+ prepare_cmake_flags &&
+ cmake -DCMAKE_MODULE_PATH=${SOURCE_DIRECTORY}/cmake
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr -DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS
../ &&
+ make
+}
+local_qt4_cmake_build() {
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+ PATH="$QTDIR/bin/qt4:$PATH"
+ local_cmake_build
+}
+
+cmake_build &&
+
+if [[ "$LICQ_CDK" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/console &&
+ local_cmake_build
+fi &&
+
+if [[ "$LICQ_QT4GUI" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/qt4-gui &&
+ local_qt4_cmake_build
+fi &&
+
+if [[ "$LICQ_MSN" == "y" ]] && ! list_find "$OPTS" "--disable-openssl"; then
+ cd $SOURCE_DIRECTORY/plugins/msn &&
+ local_cmake_build
+fi &&
+
+if [[ "$LICQ_FORWARDER" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/forwarder &&
+ local_cmake_build
+fi &&
+
+if [[ "$LICQ_AREP" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/auto-reply &&
+ local_cmake_build
+fi &&
+
+if [[ "$LICQ_RMS" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/rms &&
+ local_cmake_build
+fi &&
+
+if [[ "$LICQ_AOSD" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/aosd &&
+ local_cmake_build
+fi &&
+if [[ "$LICQ_XOSD" == "y" ]]; then
+ cd $SOURCE_DIRECTORY/plugins/osd &&
+ local_cmake_build
+fi
diff --git a/chat-im/licq/DEPENDS b/chat-im/licq/DEPENDS
index 70cea2d..e4d99a0 100755
--- a/chat-im/licq/DEPENDS
+++ b/chat-im/licq/DEPENDS
@@ -1,17 +1,19 @@
if [[ "$LICQ_BRANCH" == "scm" ]]; then
- depends SVN &&
- depends automake
+ depends git
fi &&
-if [ "$XOSD" == "y" ]; then
+if [ "$LICQ_XOSD" == "y" ]; then
depends xosd
fi &&
-if [ "$CDK" == "y" ]; then
+if [ "$LICQ_CDK" == "y" ]; then
depends cdk
fi &&
-if [ "$QT4GUI" == "y" ]; then
+if [ "$LICQ_QT4GUI" == "y" ]; then
depends qt4
fi &&
-depends autoconf &&
+if [ "$LICQ_AOSD" == "y" ]; then
+ depends libaosd
+fi &&
+depends cmake &&
depends boost &&
optional_depends "openssl" \
"" \
diff --git a/chat-im/licq/DETAILS b/chat-im/licq/DETAILS
index 5f3225b..f2edf17 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -3,38 +3,14 @@ if [[ "$LICQ_BRANCH" == "scm" ]]; then
if [[ "$LICQ_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.bz2
- SOURCE_URL[0]=svn://svn.licq.org/svn/trunk:licq
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/licq-im/licq.git:licq
SOURCE_IGNORE=volatile
- SOURCE2=$SPELL-data-svn.tar.bz2
- SOURCE2_URL[0]=svn://svn.licq.org/svn/trunk:licq-data
- SOURCE2_IGNORE=volatile
-if [ "$AREP" == "y" ]; then
- SOURCE3=$SPELL-auto-reply-svn.tar.bz2
- SOURCE3_URL[0]=svn://svn.licq.org/svn/trunk:auto-reply
- SOURCE3_IGNORE=volatile
-fi
-if [ "$CDK" == "y" ]; then
- SOURCE4=$SPELL-console-svn.tar.bz2
- SOURCE4_URL[0]=svn://svn.licq.org/svn/trunk:console
- SOURCE4_IGNORE=volatile
-fi
-if [ "$RMS" == "y" ]; then
- SOURCE5=$SPELL-rms-svn.tar.bz2
- SOURCE5_URL[0]=svn://svn.licq.org/svn/trunk:rms
- SOURCE5_IGNORE=volatile
-fi
-if [ "$EMAIL" == "y" ]; then
- SOURCE6=$SPELL-email-svn.tar.bz2
- SOURCE6_URL[0]=svn://svn.licq.org/svn/trunk:email
- SOURCE6_IGNORE=volatile
-fi
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git/$SPELL
else
- VERSION=1.3.9
+ VERSION=1.5.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -43,13 +19,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG=322EC89E.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
fi
-if [ "$XOSD" == "y" ]; then
- SOURCE7_NAME=osd
- SOURCE7_VERSION=1.3.2.2
- SOURCE7=${SOURCE7_NAME}_${SOURCE7_VERSION}.tgz
- SOURCE7_HASH=md5:3476f5bd79719f89786df69c2f8bc0cd
- SOURCE7_URL[0]=${SOURCEFORGE_URL}/licq-osd/${SOURCE7}
-fi
WEB_SITE=http://www.licq.org
ENTERED=20011031
PATCHLEVEL=2
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index 11dcd15..c47085c 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,14 @@
+2011-10-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5.1, switch scm to git
+ * BUILD: adapted to use cmake
+ * DEPENDS: removed dependencies on automake and SVN, added
+ dependencies on git, cmake and libaosd
+ * INSTALL: adapted to version 1.5.1's plugins and cmake
+ * PREPARE: added prefix LICQ_ to variables, added options for
+ the forwarder, aosd and jabber plugins, removed option for
+ the email plugin
+ * PRE_BUILD: removed
+
2011-10-22 Bor Kraljič <pyrobor AT ver.si>
* BUILD: fixed syntax
* DEPENDS: removed "&&" at the end of file
diff --git a/chat-im/licq/INSTALL b/chat-im/licq/INSTALL
index ce9b8d3..f7a189f 100755
--- a/chat-im/licq/INSTALL
+++ b/chat-im/licq/INSTALL
@@ -1,48 +1,41 @@
-if [[ "$LICQ_BRANCH" == "scm" ]]; then
- mkdir -p /usr/share/licq/qt-gui &&
- cp -R $SOURCE_DIRECTORY/licq-data-svn/qt-gui/* \
- /usr/share/licq/qt-gui &&
- cp -R $SOURCE_DIRECTORY/licq-data-svn/licq/share/sounds \
- /usr/share/licq &&
- cp -R $SOURCE_DIRECTORY/licq-data-svn/licq/share/translations \
- /usr/share/licq
-fi &&
-
-
-cd $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY/build &&
default_install &&

-if [ "$CDK" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/console &&
+if [ "$LICQ_CDK" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/console/build &&
default_install
fi &&

-if [ $QT4GUI == "y" ]; then
+if [ $LICQ_QT4GUI == "y" ]; then
cd $SOURCE_DIRECTORY/plugins/qt4-gui/build &&
default_install
fi &&

-if [ "$EMAIL" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/email &&
+if [ "$LICQ_MSN" == "y" ] && ! list_find "$OPTS" "--disable-openssl"; then
+ cd $SOURCE_DIRECTORY/plugins/msn/build &&
+ default_install
+fi &&
+
+if [ "$LICQ_AREP" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/auto-reply/build &&
default_install
fi &&

-if [ "$MSN" == "y" ] && ! list_find "$OPTS" "--disable-openssl"; then
- cd $SOURCE_DIRECTORY/plugins/msn &&
+if [ "$LICQ_FORWARDER" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/forwarder/build &&
default_install
-fi &&
-
-if [ "$AREP" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/auto-reply &&
+fi &&
+
+if [ "$LICQ_RMS" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/rms/build &&
default_install
fi &&

-if [ "$RMS" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/rms &&
+if [ "$LICQ_AOSD" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/aosd/build &&
default_install
fi &&
-
-if [ "$XOSD" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/osd-${SOURCE7_VERSION} &&
+if [ "$LICQ_XOSD" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/osd/build &&
default_install
fi
diff --git a/chat-im/licq/PREPARE b/chat-im/licq/PREPARE
index e9c5d31..1074dde 100755
--- a/chat-im/licq/PREPARE
+++ b/chat-im/licq/PREPARE
@@ -1,10 +1,12 @@
. ${GRIMOIRE}/FUNCTIONS &&
prepare_select_branch stable scm &&
persistent_remove LICQ_CVS LICQ_CVS_AUTOUPDATE &&
-config_query XOSD "Build xosd plugin (depends on xosd)?" n &&
-config_query QT4GUI "Build QT4 plugin (depends on qt4)?" n &&
-config_query CDK "Build console plugin (depends on cdk)?" n &&
-config_query AREP "Build auto-reply plugin?" n &&
-config_query RMS "Build remote managment server plugin?" n &&
-config_query MSN "Build MSN plugin?" n &&
-config_query EMAIL "Build email plugin?" n
+config_query LICQ_QT4GUI "Build QT4 plugin (depends on qt4)?" n &&
+config_query LICQ_CDK "Build console plugin (depends on cdk)?" n &&
+config_query LICQ_AREP "Build auto-reply plugin?" n &&
+config_query LICQ_RMS "Build remote managment server plugin?" n &&
+config_query LICQ_MSN "Build MSN plugin?" n &&
+config_query LICQ_FORWARDER "Build forwarder plugin?" n &&
+config_query LICQ_AOSD "Build aosd plugin?" n &&
+config_query LICQ_JABBER "Build jabber plugin?" n &&
+config_query LICQ_XOSD "Build xosd plugin (depends on xosd)?" n
diff --git a/chat-im/licq/PRE_BUILD b/chat-im/licq/PRE_BUILD
deleted file mode 100755
index 064933f..0000000
--- a/chat-im/licq/PRE_BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file '' &&
-if [[ "$LICQ_BRANCH" == "scm" ]]; then
- cd $SOURCE_DIRECTORY &&
- patch -p1 < $SCRIPT_DIRECTORY/licq-fake-offline.patch
-
- unpack_file 2 &&
- if [[ "$AREP" == "y" ]]; then
- unpack_file 3 &&
- mv ${SOURCE_DIRECTORY}/${SPELL}-auto-reply-svn \
- ${SOURCE_DIRECTORY}/plugins/auto-reply
- fi &&
- if [[ "$CDK" == "y" ]]; then
- unpack_file 4 &&
- mv ${SOURCE_DIRECTORY}/${SPELL}-console-svn \
- ${SOURCE_DIRECTORY}/plugins/console
- fi &&
- if [[ "$RMS" == "y" ]]; then
- unpack_file 5 &&
- mv ${SOURCE_DIRECTORY}/${SPELL}-rms-svn \
- ${SOURCE_DIRECTORY}/plugins/rms
- fi &&
- if [[ "$EMAIL" == "y" ]]; then
- unpack_file 6 &&
- mv ${SOURCE_DIRECTORY}/${SPELL}-email-svn \
- ${SOURCE_DIRECTORY}/plugins/email
- fi
-fi
-if [[ "$XOSD" == "y" ]]; then
- cd $SOURCE_DIRECTORY/plugins &&
- unpack_file 7
-fi



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b46cb9170081d3b7034fa9e5d5c526b057d9f022), Florian Franzmann, 10/24/2011

Archive powered by MHonArc 2.6.24.

Top of Page