Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 80162 by George J. Sherwood for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 80162 by George J. Sherwood for review
  • Date: Sun, 4 Jun 2006 05:05:00 +0100 (BST)

Change 80162 by george_sherwood@georges on 2006/06/04 05:00:44

Update spell for svn. Bug 12511.

Affected files ...

... //sgl/grimoires/devel/chat-im/licq/BUILD#5 edit
... //sgl/grimoires/devel/chat-im/licq/DEPENDS#4 edit
... //sgl/grimoires/devel/chat-im/licq/DETAILS#10 edit
... //sgl/grimoires/devel/chat-im/licq/HISTORY#16 edit
... //sgl/grimoires/devel/chat-im/licq/INSTALL#5 edit
... //sgl/grimoires/devel/chat-im/licq/PREPARE#4 edit
... //sgl/grimoires/devel/chat-im/licq/PRE_BUILD#7 edit

Differences ...

==== //sgl/grimoires/devel/chat-im/licq/BUILD#5 (xtext) ====

@@ -1,83 +1,57 @@
- if [ "$LICQ_CVS" == "y" ]; then
+ if [ "$LICQ_SVN" == "y" ]; then
make -f Makefile.cvs
fi &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make &&
+ default_build &&

if [ "$CDK" == "y" ]; then
cd $SOURCE_DIRECTORY/plugins/console &&
- if [ "$LICQ_CVS" == "y" ]; then
+ if [ "$LICQ_SVN" == "y" ]; then
make -f Makefile.cvs
- fi &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var &&
- make
- fi &&
+ fi &&
+ default_build
+ fi &&

if [ "$QTGUI" == "y" ]; then
cd $SOURCE_DIRECTORY/plugins/qt-gui &&
- if [ "$LICQ_CVS" == "y" ]; then
+ if [ "$LICQ_SVN" == "y" ]; then
make -f Makefile.cvs
- fi &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make
- fi &&
+ fi &&
+ default_build
+ fi &&

- cd $SOURCE_DIRECTORY/plugins/email &&
- if [ "$LICQ_CVS" == "y" ]; then
- make -f Makefile.cvs
- fi &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make &&
+ if [ "$EMAIL" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/email &&
+ if [ "$LICQ_SVN" == "y" ]; then
+ make -f Makefile.cvs
+ fi &&
+ default_build
+ fi &&

- if ! list_find "$OPTS" "--disable-openssl"; then
+ if [ "$MSN" == "y" ] && ! list_find "$OPTS" "--disable-openssl"; then
cd $SOURCE_DIRECTORY/plugins/msn &&
- if [ "$LICQ_CVS" == "y" ]; then
- make -f Makefile.cvs
+ if [ "$LICQ_SVN" == "y" ]; then
+ make -f Makefile.cvs
fi &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make
- fi &&
+ default_build
+ fi &&
+
+ if [ "$AREP" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/auto-reply &&
+ if [ "$LICQ_SVN" == "y" ]; then
+ make -f Makefile.cvs
+ fi
&&
+ default_build
+ fi &&

- cd $SOURCE_DIRECTORY/plugins/auto-reply &&
- if [ "$LICQ_CVS" == "y" ]; then
- make -f Makefile.cvs
- fi &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make &&
-
+ if [ "$RMS" == "y" ]; then
cd $SOURCE_DIRECTORY/plugins/rms &&
- if [ "$LICQ_CVS" == "y" ]; then
- make -f Makefile.cvs
- fi
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make &&
+ if [ "$LICQ_SVN" == "y" ]; then
+ make -f Makefile.cvs
+ fi &&
+ default_build
+ fi &&

if [ "$XOSD" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/osd-1.2.7.5 &&
-# ./build &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make
+ cd $SOURCE_DIRECTORY/plugins/osd-${SOURCE7_VERSION} &&
+ default_build
fi

==== //sgl/grimoires/devel/chat-im/licq/DEPENDS#4 (xtext) ====

@@ -1,5 +1,5 @@
-if [ "$LICQ_CVS" == "y" ]; then
- depends CVS &&
+if [ "$LICQ_SVN" == "y" ]; then
+ depends SVN &&
depends automake
fi &&
if [ "$XOSD" == "y" ]; then

==== //sgl/grimoires/devel/chat-im/licq/DETAILS#10 (xtext) ====

@@ -1,21 +1,38 @@
SPELL=licq
-if [ "$LICQ_CVS" == "y" ]; then
- if [ "$LICQ_CVS_AUTOUPDATE" == "y" ]; then
+if [ "$LICQ_SVN" == "y" ]; then
+ if [ "$LICQ_SVN_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=svn
fi
- SOURCE=$SPELL-cvs.tar.bz2
- SOURCE2=$SPELL-data-cvs.tar.bz2
- SOURCE3=$SPELL-plugins-cvs.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/licq:licq
-
SOURCE2_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/licq:licq-data
-
SOURCE3_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/licq:licq-plugins
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_URL[0]=svn://svn.licq.org/svn/trunk/licq:licq
SOURCE_IGNORE=volatile
+ SOURCE2=$SPELL-data-svn.tar.bz2
+ SOURCE2_URL[0]=svn://svn.licq.org/svn/trunk/licq-data: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: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: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: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:email
+ SOURCE6_IGNORE=volatile
+fi
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
VERSION=1.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
@@ -24,11 +41,11 @@
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
if [ "$XOSD" == "y" ]; then
- SOURCE4_NAME=osd
- SOURCE4_VERSION=1.2.7.5
- SOURCE4=$SOURCE4_NAME-$SOURCE4_VERSION.tgz
- MD5[3]=365463c0482093e0ab171dd7baff62c5
- SOURCE4_URL[0]=${SOURCEFORGE_URL}/licq-osd/${SOURCE4}
+ SOURCE7_NAME=osd
+ SOURCE7_VERSION=1.3.2.2
+ SOURCE7=${SOURCE7_NAME}_${SOURCE7_VERSION}.tgz
+ MD5[6]=8b3b71c203b019fa36d9919699ca7f09
+ SOURCE7_URL[0]=${SOURCEFORGE_URL}/licq-osd/${SOURCE7}
fi
WEB_SITE=http://www.licq.org
BUILD_API=2

==== //sgl/grimoires/devel/chat-im/licq/HISTORY#16 (text) ====

@@ -1,3 +1,15 @@
+2006-06-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, DEPENDS, INSTALL, PRE_BUILD, PREPARE:
+ The licq project now maintains the code in a subversion
+ repository, the cvs repository is no longer continued
+ => switched from cvs to svn.
+ * BUILD: replaced './configure && make' with 'default_build'
+ * INSTALL: replaced 'make install' with 'default_install'
+ * DETAILS, BUILD, INSTALL: Updated osd plugin to version
+ 1.3.2.2
+ * BUILD, DETAILS, INSTALL, PRE_BUILD, PREPARE: made plugins
+ optional
+
2006-04-27 George Sherwood <george AT beernabeer.com>
* DEPENDS: Disabled openssl on optional_depends. Bug #11316
* BUILD: Don't build msn if no openssl. Bug #11316

==== //sgl/grimoires/devel/chat-im/licq/INSTALL#5 (xtext) ====

@@ -1,44 +1,47 @@
- if [ "$LICQ_CVS" == "y" ]; then
- cd $SOURCE_DIRECTORY/licq-data-cvs &&
- mkdir -p /usr/share/licq/qt-gui &&
- for i in $(find $SOURCE_DIRECTORY/licq-data-cvs -path "*CVS" -type
d);\
- do rm -rf $i; done &&
- cp -R $SOURCE_DIRECTORY/licq-data-cvs/qt-gui/* \
+if [ "$LICQ_SVN" == "y" ]; 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-cvs/sounds \
- /usr/share/licq &&
- cp -R $SOURCE_DIRECTORY/licq-data-cvs/translations
/usr/share/licq
- fi &&
+ cp -R $SOURCE_DIRECTORY/licq-data-svn/sounds \
+ /usr/share/licq &&
+ cp -R $SOURCE_DIRECTORY/licq-data-svn/translations /usr/share/licq
+fi &&
+
+
+cd $SOURCE_DIRECTORY &&
+default_install &&

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

- cd $SOURCE_DIRECTORY &&
- make install &&
-
- if [ "$CDK" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/console &&
- make install
- fi &&
+if [ $QTGUI == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/qt-gui &&
+ default_install
+fi &&

- if [ $QTGUI == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/qt-gui &&
- make install
- fi &&
+if [ "$EMAIL" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/email &&
+ default_install
+fi &&

- cd $SOURCE_DIRECTORY/plugins/email &&
- make install &&
+if [ "$MSN" == "y" ] && ! list_find "$OPTS" "--disable-openssl"; then
+ cd $SOURCE_DIRECTORY/plugins/msn &&
+ default_install
+fi &&
+
+if [ "$AREP" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/auto-reply &&
+ default_install
+fi &&

- if ! list_find "$OPTS" "--disable-openssl"; then
- cd $SOURCE_DIRECTORY/plugins/msn &&
- make install
- fi &&
-
- cd $SOURCE_DIRECTORY/plugins/auto-reply &&
- make install &&
-
- cd $SOURCE_DIRECTORY/plugins/rms &&
- make install &&
-
- if [ "$XOSD" == "y" ]; then
- cd $SOURCE_DIRECTORY/plugins/osd-1.2.7.5 &&
- make install
- fi
+if [ "$RMS" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/rms &&
+ default_install
+fi &&
+
+if [ "$XOSD" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/osd-${SOURCE7_VERSION} &&
+ make install
+fi

==== //sgl/grimoires/devel/chat-im/licq/PREPARE#4 (xtext) ====

@@ -1,8 +1,12 @@
-config_query LICQ_CVS "Build CVS version?" n
-if [ "$LICQ_CVS" == "y" ]; then
- config_query LICQ_CVS_AUTOUPDATE \
- "Update to the latest CVS automatically on every cast?" n
+config_query LICQ_SVN "Build SVN version?" n
+if [ "$LICQ_SVN" == "y" ]; then
+ config_query LICQ_SVN_AUTOUPDATE \
+ "Update to the latest SVN automatically on every cast?" n
fi
config_query XOSD "Build xosd plugin (depends on xosd)?" n
config_query QTGUI "Build QT-X11 plugin (depends on qt-x11)?" 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

==== //sgl/grimoires/devel/chat-im/licq/PRE_BUILD#7 (xtext) ====

@@ -1,18 +1,38 @@
mk_source_dir $SOURCE_DIRECTORY &&
unpack_file '' &&
-if [ "$LICQ_CVS" == "n" ]; then
- cd $SOURCE_DIRECTORY &&
- patch -p0 < $SCRIPT_DIRECTORY/licq-email.patch
+if [ "$LICQ_SVN" == "n" ] && [ "$EMAIL" == "y" ]; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p0 < $SCRIPT_DIRECTORY/licq-email.patch
fi &&
-if [ "$LICQ_CVS" == "y" ]; then
+if [ "$LICQ_SVN" == "y" ]; then
cd $SOURCE_DIRECTORY &&
unpack_file 2 &&
- cd $SOURCE_DIRECTORY &&
- unpack_file 3 &&
- rm -rf $SOURCE_DIRECTORY/plugins &&
- mv $SOURCE_DIRECTORY/$SPELL-plugins-cvs $SOURCE_DIRECTORY/plugins
-fi
+ if [ "$AREP" == "y" ]; then
+ cd $SOURCE_DIRECTORY &&
+ unpack_file 3 &&
+ mv ${SOURCE_DIRECTORY}/${SPELL}-auto-reply-svn \
+ ${SOURCE_DIRECTORY}/plugins/auto-reply
+ fi &&
+ if [ "$CDK" == "y" ]; then
+ cd $SOURCE_DIRECTORY &&
+ unpack_file 4 &&
+ mv ${SOURCE_DIRECTORY}/${SPELL}-console-svn \
+ ${SOURCE_DIRECTORY}/plugins/console
+ fi &&
+ if [ "$RMS" == "y" ]; then
+ cd $SOURCE_DIRECTORY &&
+ unpack_file 5 &&
+ mv ${SOURCE_DIRECTORY}/${SPELL}-rms-svn \
+ ${SOURCE_DIRECTORY}/plugins/rms
+ fi &&
+ if [ "$EMAIL" == "y" ]; then
+ cd $SOURCE_DIRECTORY &&
+ 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 4
+ unpack_file 7
fi




Archive powered by MHonArc 2.6.24.

Top of Page