Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (bf1b444069ab4b00f8df62fa8cc40893f67c8d0d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (bf1b444069ab4b00f8df62fa8cc40893f67c8d0d)
  • Date: Sat, 5 May 2007 00:07:08 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

ChangeLog | 3 +
chat-im/gaim/BUILD | 6 ---
chat-im/gaim/DEPENDS | 82
-----------------------------------------------
chat-im/gaim/DETAILS | 21 ++++++------
chat-im/gaim/HISTORY | 4 +-
chat-im/gaim/INSTALL | 1
chat-im/gaim/PRE_BUILD | 7 ----
chat-im/gaim/TRIGGERS | 1
chat-im/pidgin/CONFLICTS | 1
chat-im/pidgin/HISTORY | 3 +
10 files changed, 25 insertions(+), 104 deletions(-)

New commits:
commit bf1b444069ab4b00f8df62fa8cc40893f67c8d0d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gaim: Deprecated in favour of pidgin due to renaing of gaim

diff --git a/ChangeLog b/ChangeLog
index ffabb04..22c92a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * chat-im/gaim: deprecated due to name change to pidgin
+
2007-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* telephony/libtelepathy: new spell
* telephony/telepathy-glib: new spell
diff --git a/chat-im/gaim/BUILD b/chat-im/gaim/BUILD
index b3a3c2c..c98e705 100755
--- a/chat-im/gaim/BUILD
+++ b/chat-im/gaim/BUILD
@@ -1,5 +1 @@
-### had to cook up some pkg-config files for nss and nspr
-CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include"
-export
PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr"
&&
-default_build &&
-cd $SOURCE_DIRECTORY
+true
diff --git a/chat-im/gaim/DEPENDS b/chat-im/gaim/DEPENDS
index 97be709..8227d56 100755
--- a/chat-im/gaim/DEPENDS
+++ b/chat-im/gaim/DEPENDS
@@ -1,81 +1 @@
-depends libxml2 &&
-depends xml-parser-expat &&
-
-if [ "$GAIM_CVS" == "y" ]
-then
- depends subversion &&
- depends intltool
-fi &&
-
-optional_depends evolution2 \
- "--enable-gevolution" \
- "--disable-gevolution" \
- "for gevolution plugin" &&
-
-optional_depends gtk+2 \
- "--enable-gtkui" \
- "--disable-gtkui" \
- "for GTK+ user interface" &&
-
-optional_depends ncurses \
- "--enable-consoleui" \
- "--disable-consoleui" \
- "for console user interface" &&
-
-optional_depends nss \
- "--enable-nss=yes" \
- "--enable-nss=no" \
- "for gaim-encryption plugin , or MSN's new protool 9" &&
-
-optional_depends gnutls \
- "--enable-gnutls=yes" \
- "--enable-gnutls=no" \
- "an alternative to nss for MSN protocol SSL support" &&
-
-optional_depends audiofile \
- "--enable-audio" \
- "--disable-audio" \
- "to play aiff, snd, wave, and au files" &&
-
-optional_depends gtkspell \
- "" \
- "--disable-gtkspell" \
- "For spell checking" &&
-
-optional_depends startup-notification \
- "" \
- "--disable-startup-notification" \
- "support for the startup-notification spec from
freedesktop.org" &&
-
-optional_depends nas \
- "--enable-nas" \
- "--disable-nas" \
- "for Network Audio System support" &&
-
-optional_depends perl \
- '--enable-perl' \
- '--disable-perl' \
- 'for Perl scripting' &&
-
-optional_depends tcl \
- "" \
- "--disable-tcl" \
- "for tcl scripting support" &&
-
-optional_depends tk \
- "" \
- "--disable-tk" \
- "for tcl/tk scripting support" &&
-optional_depends mono \
- "--enable-mono" \
- "--disable-mono" \
- "for Mono runtime support" &&
-optional_depends dbus \
- "--enable-dbus" \
- "--disable-dbus" \
- "for DBUS support" &&
-
-optional_depends howl \
- '' \
- '' \
- 'for network ZeroConf in Bonjour plugin'
+depends pidgin
diff --git a/chat-im/gaim/DETAILS b/chat-im/gaim/DETAILS
index 58a8242..dc6eb5d 100755
--- a/chat-im/gaim/DETAILS
+++ b/chat-im/gaim/DETAILS
@@ -1,19 +1,19 @@
SPELL=gaim
if [ "$GAIM_CVS" == "y" ]; then
VERSION=svn
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=svn_http://gaim.svn.sourceforge.net/svnroot/gaim/trunk:gaim
+# SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE_URL[0]=svn_http://gaim.svn.sourceforge.net/svnroot/gaim/trunk:gaim
FORCE_DOWNLOAD=1
- SOURCE_IGNORE=volatile
+# SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- VERSION=2.0.0beta6
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=${SOURCE}.asc
- SOURCE_URL[0]=$SOURCEFORGE_URL/pidgin/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL}.asc
- SOURCE2_IGNORE=signature
- SOURCE_GPG="gaim.gpg:${SOURCE}.asc"
+ VERSION=2.0.0
+# SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE2=${SOURCE}.asc
+# SOURCE_URL[0]=$SOURCEFORGE_URL/pidgin/$SOURCE
+# SOURCE2_URL[0]=${SOURCE_URL}.asc
+# SOURCE2_IGNORE=signature
+# SOURCE_GPG="gaim.gpg:${SOURCE}.asc"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://gaim.sourceforge.net/
@@ -21,6 +21,7 @@ fi
DISTCC_HOSTS=
CCACHE=off
ENTERED=20011024
+ PATCHLEVEL=1
SHORT="Instant messanger client for several protocols"
cat << EOF
gaim is an instant messanger client used primarly for the AIM protocol
diff --git a/chat-im/gaim/HISTORY b/chat-im/gaim/HISTORY
index ea49e99..d40107f 100644
--- a/chat-im/gaim/HISTORY
+++ b/chat-im/gaim/HISTORY
@@ -1,5 +1,5 @@
-2007-04-30 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated SOURCE_URL
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * ALL: Deprecated because of upstream rename to pidgin

2007-04-21 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Bonjour plugin can link against howl
diff --git a/chat-im/gaim/INSTALL b/chat-im/gaim/INSTALL
new file mode 100755
index 0000000..c98e705
--- /dev/null
+++ b/chat-im/gaim/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/chat-im/gaim/PRE_BUILD b/chat-im/gaim/PRE_BUILD
index 27d56d7..27ba77d 100755
--- a/chat-im/gaim/PRE_BUILD
+++ b/chat-im/gaim/PRE_BUILD
@@ -1,6 +1 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if [ "$GAIM_CVS" == "y" ]
-then
- NOCONFIGURE=Y ./autogen.sh
-fi
+true
diff --git a/chat-im/gaim/TRIGGERS b/chat-im/gaim/TRIGGERS
new file mode 100755
index 0000000..5129a72
--- /dev/null
+++ b/chat-im/gaim/TRIGGERS
@@ -0,0 +1 @@
+on_cast gaim dispel_self
diff --git a/chat-im/pidgin/CONFLICTS b/chat-im/pidgin/CONFLICTS
new file mode 100755
index 0000000..cdfc9ff
--- /dev/null
+++ b/chat-im/pidgin/CONFLICTS
@@ -0,0 +1 @@
+conflicts gaim y
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 55d0dd5..c0603a3 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * CONFLICTS: Added to conflict with deprecated gaim spell
+
2007-05-04 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.0.0




  • [SM-Commit] GIT changes to master grimoire by George Sherwood (bf1b444069ab4b00f8df62fa8cc40893f67c8d0d), George Sherwood, 05/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page