diff options
| author |   Bart Verwilst <verwilst@gentoo.org> | 2002-11-12 21:58:56 +0000 |
|---|---|---|
| committer | Bart Verwilst <verwilst@gentoo.org> | 2002-11-12 21:58:56 +0000 |
| commit | cf9fceaac89f7e91765d4b243551713a5715ec95 (patch) | |
| tree | 1e41a9981d9bde5b628e1bca59bfc48fe5048321 /net-im | |
| parent | Masked broken java source ebuilds (diff) | |
| download | historical-cf9fceaac89f7e91765d4b243551713a5715ec95.tar.gz historical-cf9fceaac89f7e91765d4b243551713a5715ec95.tar.bz2 historical-cf9fceaac89f7e91765d4b243551713a5715ec95.zip | |
updates
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabber-server/files/pth.patch | 29 | ||||
| -rw-r--r-- | net-im/jabber-server/jabber-server-1.4.2-r2.ebuild | 20 |
2 files changed, 40 insertions, 9 deletions
diff --git a/net-im/jabber-server/files/pth.patch b/net-im/jabber-server/files/pth.patch new file mode 100644 index 000000000000..7539462e4e9f --- /dev/null +++ b/net-im/jabber-server/files/pth.patch @@ -0,0 +1,29 @@ +--- jabber-1.4.2/configure.orig 2002-02-04 17:05:37.000000000 -0600 ++++ jabber-1.4.2/configure 2002-10-19 09:54:16.000000000 -0500 +@@ -81,13 +81,13 @@ + PTH_LDFLAGS=`pth-config --ldflags` + PTH_LIBS=`pth-config --libs` + PTH_LIBDIR=`pth-config --libdir` +-if [ -n "$PTH_CFLAGS" ]; then +- CFLAGS="$CFLAGS $PTH_CFLAGS"; +- LDFLAGS="$LDFLAGS $PTH_LDFLAGS"; +- LIBS="$LIBS $PTH_LIBS"; +- SLIBS="$SLIBS $PTH_LIBDIR/libpth.a"; +- printf " Done.\n"; +-else ++#if [ -n "$PTH_CFLAGS" ]; then ++ #CFLAGS="$CFLAGS $PTH_CFLAGS"; ++ #LDFLAGS="$LDFLAGS $PTH_LDFLAGS"; ++ #LIBS="$LIBS $PTH_LIBS"; ++ #SLIBS="$SLIBS $PTH_LIBDIR/libpth.a"; ++ #printf " Done.\n"; ++#else + if [ -d "jabberd/pth-1.4.1" ]; then + opwd=`pwd` + cd jabberd/pth-1.4.1; +@@ -100,7 +100,7 @@ + else + printf " Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/"; + fi +-fi ++#fi diff --git a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild index 502c191e11c9..78a5459df874 100644 --- a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild +++ b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.1 2002/11/12 21:30:02 verwilst Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.2 2002/11/12 21:58:56 verwilst Exp $ IUSE="ssl" @@ -26,6 +26,7 @@ src_unpack() { unpack jabber-${PV}.tar.gz cd ${S} patch -p0 < ${FILESDIR}/mio_ssl.c.patch + patch -p0 < ${FILESDIR}/ tar -xjf ${FILESDIR}/config-1.4.2.tar.bz2 unpack msn-transport-stable-20011217.tar.gz unpack aim-transport-stable-20021112.tar.gz @@ -46,23 +47,24 @@ src_compile() { mv jabberd/jabberd.c jabberd/jabberd.c.orig sed 's:pstrdup(jabberd__runtime,HOME):"/usr/bin":' jabberd/jabberd.c.orig > jabberd/jabberd.c rm -f jabberd/jabberd.c.orig - ./configure ${myconf} || die + ./configure --with-pth-includes=../jabberd/pth-1.4.0 ${myconf} || die make || die cd ${S}/aim-transport - ./autogen.sh || die - make || die + ./autogen.sh --with-pth-includes=../jabberd/pth-1.4.0 || die + make CFLAGS="-Ijabberd/pth-1.4.0 -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" " || die cd ${S}/msn-transport - ./bootstrap || die - ./configure || die - make || die + ./bootstrap || die + ./configure --with-pth-includes=../jabberd/pth-1.4.0 || die + make CFLAGS="-Ijabberd/pth-1.4.0" || die cd ${S}/mu-conference + pass cd ${S}/yahoo-transport-2 - CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./autogen.sh || die - make || die + CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd -I../jabberd/pth-1.4.0" ./autogen.sh || die + make || die } |