Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (044860bb03c3b1404f5a69ecf732dc44eee3d7af)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <ladislav.hagara AT unob.cz>
  • To: George Sherwood <gsherwood AT sourcemage.org>
  • Cc: "sm-commit AT lists.ibiblio.org" <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (044860bb03c3b1404f5a69ecf732dc44eee3d7af)
  • Date: Sat, 15 Aug 2009 02:09:30 +0200


> GIT changes to master grimoire by George Sherwood
> <gsherwood AT sourcemage.org>:
>
> chat-im/ayttm/BUILD | 10 ----------
> chat-im/ayttm/CONFLICTS | 1 -
> chat-im/ayttm/DETAILS | 14 +++++++-------
> chat-im/ayttm/HISTORY | 8 ++++++++
> chat-im/ayttm/PRE_BUILD | 11 +++++++++++
> chat-im/ayttm/ayttm-0.5.0-111.tar.bz2.sig |binary
> chat-im/ayttm/ayttm-0.5.0-82.tar.bz2.sig | 0
> chat-im/ayttm/ayttm-libproxy.patch | 11 +++++++++++
> dev/null |binary
> 9 files changed, 37 insertions(+), 18 deletions(-)
>
> New commits:
> commit 044860bb03c3b1404f5a69ecf732dc44eee3d7af
> Author: George Sherwood <gsherwood AT sourcemage.org>
> Commit: George Sherwood <gsherwood AT sourcemage.org>
>
> ayttm: Updated to version 0.5.0-111. Fixed CONFLICT with libproxy.
> General spell update, Removed BUILD and CONFLICTS.
>
> diff --git a/chat-im/ayttm/BUILD b/chat-im/ayttm/BUILD
> deleted file mode 100755
> index 62f685a..0000000
> --- a/chat-im/ayttm/BUILD
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - if [ "$CVS" == "y" ]; then
> - patch -p0 < $SCRIPT_DIRECTORY/fixinstall.diff &&
> - ./gen
> - fi &&
> -
> - ./configure --prefix=${INSTALL_ROOT}/usr \
> - --sysconfdir=${INSTALL_ROOT}/etc \
> - --localstatedir=${INSTALL_ROOT}/var \
> - $OPTS &&
> - make
> diff --git a/chat-im/ayttm/CONFLICTS b/chat-im/ayttm/CONFLICTS
> deleted file mode 100755
> index 26f8610..0000000
> --- a/chat-im/ayttm/CONFLICTS
> +++ /dev/null
> @@ -1 +0,0 @@
> -conflicts everybuddy y
> diff --git a/chat-im/ayttm/DETAILS b/chat-im/ayttm/DETAILS
> index 41e19d9..7756baa 100755
> --- a/chat-im/ayttm/DETAILS
> +++ b/chat-im/ayttm/DETAILS
> @@ -1,17 +1,17 @@
> SPELL=ayttm
> -if [ "$CVS" = "n" ] ; then
> - VERSION=0.5.0-82
> - SOURCE=$SPELL-$VERSION.tar.bz2
> -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> - SOURCE_URL[0]=$SOURCEFORGE_URL/ayttm/$SOURCE
> - SOURCE_GPG="gurus.gpg:$SOURCE.sig"
> -else [ "$CVS" = "y" ]
> +if [[ "$CVS" == "y" ]]; then
> VERSION=cvs
> FORCE_DOWNLOAD=1
> SOURCE=$SPELL-cvs.tar.bz2
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
>
> SOURCE_URL[0]=cvs://:pserver:anonymous AT ayttm.cvs.sourceforge.net:/cvsroot/$SPELL:$SPELL
> SOURCE_IGNORE=volatile
> +else
> + VERSION=0.5.0-111
> + SOURCE=$SPELL-$VERSION.tar.bz2
> +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> + SOURCE_URL[0]=$SOURCEFORGE_URL/ayttm/$SOURCE
> + SOURCE_GPG="gurus.gpg:$SOURCE.sig"
> fi
> WEB_SITE=http://ayttm.sourceforge.net
> ENTERED=20030504
> diff --git a/chat-im/ayttm/HISTORY b/chat-im/ayttm/HISTORY
> index 05c4a0e..566a57f 100644
> --- a/chat-im/ayttm/HISTORY
> +++ b/chat-im/ayttm/HISTORY
> @@ -1,3 +1,11 @@
> +2009-08-05 George Sherwood <gsherwood AT sourcemage.org>
> + * DETAILS: Updated to version 0.5.0-111. Fixed order of if-then
> + * BUILD: Removed. Not needed
> + * CONFLICTS: Removed. Everybuddy not in grimoire.
> + * PRE_BUILD: Added.
> + * ayttm-libproxy: Added to patch Makefile.in to fix
> + conflict with gnome's libproxy
> +
> 2008-11-10 George Sherwood <gsherwood AT sourcemage.org>
> * DETAILS: Updated to version 0.5.0-82
>
> diff --git a/chat-im/ayttm/PRE_BUILD b/chat-im/ayttm/PRE_BUILD
> new file mode 100755
> index 0000000..36299b9
> --- /dev/null
> +++ b/chat-im/ayttm/PRE_BUILD
> @@ -0,0 +1,11 @@
> +default_pre_build &&
> +
> +cd $SOURCE_DIRECTORY &&
> +
> +patch -p0 < $SCRIPT_DIRECTORY/ayttm-libproxy.patch &&
> +
> +if [ "$CVS" == "y" ]; then
> + CD $SOURCE_DIRECTORY &&
>
>

CD or cd ir even useless ?
I just tested CVS version, this patch doesn't work, none Makefile.in.

--
Ladislav Hagara

> diff --git a/chat-im/ayttm/ayttm-libproxy.patch
> b/chat-im/ayttm/ayttm-libproxy.patch
> new file mode 100644
> index 0000000..d2d2692
> --- /dev/null
> +++ b/chat-im/ayttm/ayttm-libproxy.patch
> @@ -0,0 +1,11 @@
> +--- src/Makefile.in.orig 2009-08-05 09:05:12.000000000 -0500
> ++++ src/Makefile.in 2009-08-05 09:05:33.000000000 -0500
> +@@ -270,7 +270,7 @@
> + LIBICONV = @LIBICONV@
> + LIBINTL = @LIBINTL@
> + LIBOBJS = @LIBOBJS@
> +-LIBS = @LIBS@ $(EB_LIBS) -lproxy $(GNOME_LIBDIR) $(GNOME_APPLETS_LIBS)
> -L/usr/local/lib/pth/ $(WIN32_LIBS)
> ++LIBS = @LIBS@ $(EB_LIBS) ../libproxy/libproxy.a $(GNOME_LIBDIR)
> $(GNOME_APPLETS_LIBS) -L/usr/local/lib/pth/ $(WIN32_LIBS)
> + LIBTOOL = @LIBTOOL@
> + LIPO = @LIPO@
> + LN_S = @LN_S@





Archive powered by MHonArc 2.6.24.

Top of Page