diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-04-18 16:12:04 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-04-18 16:12:04 +0000 |
commit | 7bf03cf6604b6beda6ef7ebe57c3d9b91269ad1d (patch) | |
tree | 645af6fe4aaf2161b0131fd208fe875140c61aee /net-im/jabber | |
parent | upgrade to 1.8.5 (diff) |
upgrade to 1.4.2
PR: 37207
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=57852
Diffstat (limited to 'net-im/jabber')
-rw-r--r-- | net-im/jabber/Makefile | 52 | ||||
-rw-r--r-- | net-im/jabber/distinfo | 9 | ||||
-rw-r--r-- | net-im/jabber/files/jabberd.sh | 26 | ||||
-rw-r--r-- | net-im/jabber/files/patch-aa | 54 | ||||
-rw-r--r-- | net-im/jabber/files/patch-ab | 69 | ||||
-rw-r--r-- | net-im/jabber/files/patch-ae | 19 | ||||
-rw-r--r-- | net-im/jabber/files/patch-af | 19 | ||||
-rw-r--r-- | net-im/jabber/files/patch-ag | 12 | ||||
-rw-r--r-- | net-im/jabber/pkg-plist | 24 |
9 files changed, 116 insertions, 168 deletions
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index 98e754a73709..2dbec7608b82 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -6,26 +6,15 @@ # PORTNAME= jabber -PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTVERSION= 1.4.2 CATEGORIES= net -MASTER_SITES= http://download.jabber.org/dists/1.4/final/ \ - http://download.jabber.org/dists/transports/aim-transport/ \ - http://download.jabber.org/dists/transports/yahoo-transport/ \ - http://download.jabber.org/dists/transports/irc-transport/ -DISTFILES+= jabber-1.4.1.tar.gz \ - aim-transport-0.9.24c.tar.gz \ - conference-0.4.1.tar.gz \ - icq-transport-0.9.tar.gz \ - irc-transport-0.1.1-1.4.linux.tar.gz \ - jud-0.4.tar.gz \ - msn-transport-1.1.tar.gz \ - yahoo-transport-0.8-1.4.linux.tar.gz +MASTER_SITES= http://jabberd.jabberstudio.org/downloads/ \ + http://download.jabber.org/dists/1.4/final/ +DISTNAME= ${PORTNAME}-${PORTVERSION} +DIST_SUBDIR= jabber MAINTAINER= sean@chittenden.org -LIB_DEPENDS= pth.14:${PORTSDIR}/devel/pth - GNU_CONFIGURE= yes USE_GMAKE= yes USE_OPENSSL= yes @@ -34,29 +23,18 @@ CONFIGURE_ARGS+= --enable-ssl rc=${PREFIX}/etc/rc.d -JABDIR= ${PORTNAME}-${PORTVERSION} -post-extract: - @mv ${WRKDIR}/aim-transport-0.9.24c ${WRKDIR}/${JABDIR}/aim-transport - @mv ${WRKDIR}/conference-0.4.1 ${WRKDIR}/${JABDIR}/conference - @mv ${WRKDIR}/icq-transport-0.9 ${WRKDIR}/${JABDIR}/icq-transport - @mv ${WRKDIR}/irc-transport-0.1.1-1.40 ${WRKDIR}/${JABDIR}/irc-transport - @mv ${WRKDIR}/jud-0.4 ${WRKDIR}/${JABDIR}/jud - @mv ${WRKDIR}/msn-transport-1.1 ${WRKDIR}/${JABDIR}/msn-transport - @mv ${WRKDIR}/yahoo-transport-0.8-1.4 ${WRKDIR}/${JABDIR}/yahoo-transport - -post-configure: - ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \ - CPPFLAGS="`pth-config --cflags` `libxode-config --cflags`" \ - LDFLAGS="`pth-config --ldflags` `libxode-config --ldflags`" \ - LIBS="`pth-config --libs` `libxode-config --libs`" ${SHELL} -c \ - "cd ${WRKDIR}/${JABDIR}/aim-transport; ./configure --with-jabberd=${WRKDIR}/${JABDIR}/jabberd; \ - cd ${WRKDIR}/${JABDIR}/irc-transport; \ - ./configure --includedir=${WRKDIR}/${JABDIR}/jabberd; \ - cd ${WRKDIR}/${JABDIR}/yahoo-transport; \ - ./configure --includedir=${WRKDIR}/${JABDIR}/jabberd" +#JABDIR= ${PORTNAME}-${PORTVERSION} +# Save this data for use later: jabber doesn't have an install target +# or a sane set of defaults. +post-patch: + @echo "${WRKSRC}" > ${WRKSRC}/.wrksrc-freebsd + @echo "${PREFIX}" > ${WRKSRC}/.prefix-freebsd + @echo "${INSTALL_DATA}" > ${WRKSRC}/.install_data-freebsd + @echo "${INSTALL_SCRIPT}" > ${WRKSRC}/.install_script-freebsd + @echo "${INSTALL_PROGRAM}" > ${WRKSRC}/.install_program-freebsd post-install: @PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc} + ${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc} .include <bsd.port.mk> diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo index 68e323c8a17c..1951752a27c8 100644 --- a/net-im/jabber/distinfo +++ b/net-im/jabber/distinfo @@ -1,8 +1 @@ -MD5 (jabber-1.4.1.tar.gz) = fc7afba8969e53c5e3b662156d1cdeae -MD5 (aim-transport-0.9.24c.tar.gz) = a3c18654d41ebfaa3c74117004bf7d93 -MD5 (conference-0.4.1.tar.gz) = 01b825d9f917674f25fdba29255d081b -MD5 (icq-transport-0.9.tar.gz) = ffa69ae19ac18395c87470c1729dcc59 -MD5 (irc-transport-0.1.1-1.4.linux.tar.gz) = a08ef678fa8d768d7696af5bb85d1e34 -MD5 (jud-0.4.tar.gz) = a057e8dd5966fa0d26ded03697ba395a -MD5 (msn-transport-1.1.tar.gz) = 251cd4b6cfc6c52a0f15c3ff2bfbfff9 -MD5 (yahoo-transport-0.8-1.4.linux.tar.gz) = 0850f8d36d7b1e8df656fa84d03c82ba +MD5 (jabber/jabber-1.4.2.tar.gz) = 10780dbdb93926ea5bb360e1186b939c diff --git a/net-im/jabber/files/jabberd.sh b/net-im/jabber/files/jabberd.sh index b32951192940..91773820c519 100644 --- a/net-im/jabber/files/jabberd.sh +++ b/net-im/jabber/files/jabberd.sh @@ -4,27 +4,25 @@ if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then echo "$0: Cannot determine the PREFIX" >&2 exit 1 fi -user=jabber -rundir=/tmp -out=/var/log/jabber.log -hostname=`/bin/hostname` -# Load PTH libraries -ldconfig -m `${PREFIX}/bin/pth-config --libdir` +USER="jabber" +RUNDIR="/var/tmp" +LOG="/var/log/jabber.log" +HOSTNAME=`/bin/hostname` -export PATH=/bin:/usr/bin:${PREFIX}/bin +test -x ${PREFIX}/sbin/jabberd || exit 1 + +export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin umask 077 -test -x ${PREFIX}/bin/jabberd || exit 1 -echo -n " jabberd" -cd ${rundir} || exit +echo -n " jabberd " +cd ${RUNDIR} || exit -arg=${1:-start} -case $arg in +case ${1:-start} in start) - su -f -m ${user} -c "jabberd -h ${hostname} -c ${PREFIX}/etc/jabber.xml" >${out} 2>&1 &;; + su -f -m ${USER} -c "jabberd -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" >${LOG} 2>&1 &;; stop) killall jabberd; - rm -f /var/tmp/jabber.pid; + rm -f ${RUNDIR}/jabber.pid; esac diff --git a/net-im/jabber/files/patch-aa b/net-im/jabber/files/patch-aa index 46021cd44f7b..80239a100c69 100644 --- a/net-im/jabber/files/patch-aa +++ b/net-im/jabber/files/patch-aa @@ -1,11 +1,57 @@ ---- configure.orig Sat Feb 3 05:06:24 2001 -+++ configure Sat Feb 10 23:46:59 2001 -@@ -32,7 +32,7 @@ +--- configure.orig Mon Feb 11 11:14:06 2002 ++++ configure Sun Apr 14 18:38:40 2002 +@@ -32,7 +32,8 @@ LDFLAGS="$LDFLAGS" LIBS="$LIBS" XLDFLAGS="$XLDFLAGS " -JHOME=`pwd` -+JHOME='${PREFIX}/lib/jabber' ++JHOME="`cat .prefix-freebsd`/lib/jabber" ++WRKSRC="`cat .wrksrc-freebsd`" ## # Print a cool header +@@ -76,31 +77,19 @@ + ## + # Pth check + ## +-printf "Getting pth settings..." +-PTH_CFLAGS=`pth-config --cflags` +-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 [ -d "jabberd/pth-1.4.0" ]; then +- opwd=`pwd` +- cd jabberd/pth-1.4.0; +- ./configure || (printf "Error Configuring pth"; exit 1); +- cd $opwd; +- PSUBDIR="pth-1.4.0"; +- PTHP=`pwd`"/jabberd/pth-1.4.0"; +- PLINK="$PTHP/pth_*.o"; +- CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0"; +- else +- printf " Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/"; +- fi +-fi ++echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible" ++opwd=`pwd` ++cd jabberd/pth-1.4.0; ++echo "Configuring jabber pth-1.4.0..." ++./configure || (echo "Error Configuring pth"; exit 1); ++echo "Building pth-1.4.0..." ++gmake ++cd $opwd; ++PSUBDIR="pth-1.4.0"; ++PTHP="`pwd`/jabberd/pth-1.4.0"; ++PLINK="$PTHP/pth_*.o"; ++CFLAGS="$CFLAGS -I${PTHP}"; ++LDFLAGS="$LDFLAGS -L${PTHP}"; + + + diff --git a/net-im/jabber/files/patch-ab b/net-im/jabber/files/patch-ab index 214993d4645b..589e6646ceee 100644 --- a/net-im/jabber/files/patch-ab +++ b/net-im/jabber/files/patch-ab @@ -1,55 +1,44 @@ ---- Makefile.orig Sun Jan 21 14:32:48 2001 -+++ Makefile Tue Jan 22 23:55:05 2002 -@@ -4,6 +4,15 @@ +--- Makefile.orig Sat Jan 20 21:32:48 2001 ++++ Makefile Sun Apr 14 23:30:36 2002 +@@ -4,6 +4,10 @@ include platform-settings SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd -+SUBDIRS+=aim-transport -+SUBDIRS+=conference -+SUBDIRS+=icq-transport -+SUBDIRS+=irc-transport -+SUBDIRS+=jud -+SUBDIRS+=msn-transport -+SUBDIRS+=yahoo-transport -+ -+ ++INSTALL_DATA=`cat .install_data-freebsd` ++INSTALL_DIR=install -d ++INSTALL_PROGRAM=`cat .install_program-freebsd` ++INSTALL_SCRIPT=`cat .install_data-freebsd` all: all-recursive -@@ -13,8 +22,35 @@ +@@ -13,8 +17,29 @@ single: single-recursive +LIBDIR=${PREFIX}/lib/jabber ++INCDIR=${PREFIX}/include/jabber install: - printf "\n\nNo actual make install, you just run it out of the directory!\n" -+ @install -c jabberd/jabberd ${PREFIX}/bin -+ @install -c jabber.xml ${PREFIX}/etc/jabber.xml.sample -+ @install -d ${LIBDIR}/jsm -+ @install -c jsm/jsm.so ${LIBDIR}/jsm -+ @install -d ${LIBDIR}/jud -+ @install -c jud/jud.so ${LIBDIR}/jud -+ @install -d ${LIBDIR}/xdb_file -+ @install -c xdb_file/xdb_file.so ${LIBDIR}/xdb_file -+ @install -d ${LIBDIR}/pthsock -+ @install -c pthsock/pthsock_client.so ${LIBDIR}/pthsock -+ @install -d ${LIBDIR}/dnsrv -+ @install -c dnsrv/dnsrv.so ${LIBDIR}/dnsrv -+ @install -d ${LIBDIR}/dialback -+ @install -c dialback/dialback.so ${LIBDIR}/dialback -+ -+ @install -d ${LIBDIR}/aim-transport -+ @install -c aim-transport/src/aimtrans.so ${LIBDIR}/aim-transport -+ @install -d ${LIBDIR}/conference -+ @install -c conference/conference.so ${LIBDIR}/conference -+ @install -d ${LIBDIR}/icq-transport -+ @install -c icq-transport/icqtrans.so ${LIBDIR}/icq-transport -+ @install -d ${LIBDIR}/irc-transport -+ @install -c irc-transport/src/irc_transport.so ${LIBDIR}/irc-transport -+ @install -d ${LIBDIR}/msn-transport -+ @install -c msn-transport/msntrans.so ${LIBDIR}/msn-transport -+ @install -d ${LIBDIR}/yahoo-transport -+ @install -c yahoo-transport/src/yahootrans.so ${LIBDIR}/yahoo-transport ++ ${INSTALL_PROGRAM} jabberd/jabberd ${PREFIX}/sbin ++ ${INSTALL_DATA} jabber.xml ${PREFIX}/etc/jabber.xml.sample ++ ${INSTALL_DIR} ${LIBDIR}/jsm ++ ${INSTALL_DATA} jsm/jsm.so ${LIBDIR}/jsm ++ ${INSTALL_DIR} ${LIBDIR}/xdb_file ++ ${INSTALL_DATA} xdb_file/xdb_file.so ${LIBDIR}/xdb_file ++ ${INSTALL_DIR} ${LIBDIR}/pthsock ++ ${INSTALL_DATA} pthsock/pthsock_client.so ${LIBDIR}/pthsock ++ ${INSTALL_DIR} ${LIBDIR}/dnsrv ++ ${INSTALL_DATA} dnsrv/dnsrv.so ${LIBDIR}/dnsrv ++ ${INSTALL_DIR} ${LIBDIR}/dialback ++ ${INSTALL_DATA} dialback/dialback.so ${LIBDIR}/dialback ++ ${INSTALL_DIR} ${INCDIR} ++ ${INSTALL_DATA} platform-settings ${INCDIR} ++ ${INSTALL_DATA} jabberd/jabberd.h ${INCDIR} ++ ${INSTALL_DIR} ${INCDIR}/lib ++ ${INSTALL_DATA} jabberd/lib/lib.h ${INCDIR}/lib ++ ${INSTALL_DATA} jabberd/lib/xmlparse.h ${INCDIR}/lib ++ ${INSTALL_DATA} jabberd/pth-1.4.0/pth.h ${INCDIR} ++ all-local: diff --git a/net-im/jabber/files/patch-ae b/net-im/jabber/files/patch-ae deleted file mode 100644 index c07658cca85c..000000000000 --- a/net-im/jabber/files/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ ---- irc-transport/src/Makefile.in.orig Wed Feb 7 18:31:02 2001 -+++ irc-transport/src/Makefile.in Sat Jun 16 13:38:46 2001 -@@ -31,6 +31,7 @@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include -+localinclude = /usr/local/include - - DESTDIR = - -@@ -72,7 +73,7 @@ - VERSION = @VERSION@ - - CFLAGS = -g -fPIC -shared --INCLUDES = -I$(JABBERD_INC) -I$(top_builddir)/include -+INCLUDES = -I$(JABBERD_INC) -I$(top_builddir)/include -I$(includedir) -I$(localinclude) - bin_PROGRAMS = irc_transport.so - - irc_transport_so_SOURCES = util.c init.c irc_in.c irc_out.c diff --git a/net-im/jabber/files/patch-af b/net-im/jabber/files/patch-af deleted file mode 100644 index 78b739541596..000000000000 --- a/net-im/jabber/files/patch-af +++ /dev/null @@ -1,19 +0,0 @@ ---- yahoo-transport/src/Makefile.in.orig Wed Feb 7 18:15:42 2001 -+++ yahoo-transport/src/Makefile.in Sat Jun 16 14:17:47 2001 -@@ -31,6 +31,7 @@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include -+localinclude = /usr/local/include - - DESTDIR = - -@@ -72,7 +73,7 @@ - - CC = gcc - CFLAGS = -g -Wall -fPIC --INCLUDES = -I$(JABBERD_INC) -I$(includedir) -I$(top_builddir)/include -+INCLUDES = -I$(JABBERD_INC) -I$(top_builddir)/include -I$(includedir) -I$(localinclude) - - bin_PROGRAMS = yahootrans.so - diff --git a/net-im/jabber/files/patch-ag b/net-im/jabber/files/patch-ag deleted file mode 100644 index f855814c10ff..000000000000 --- a/net-im/jabber/files/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ ---- msn-transport/Makefile.orig Mon Feb 5 09:25:59 2001 -+++ msn-transport/Makefile Tue Sep 4 08:12:05 2001 -@@ -1,7 +1,7 @@ - include ../platform-settings - --CC=gcc --CFLAGS:=$(CFLAGS) $(DEFINES) -I../jabberd/ -Wall -g -O2 -+#CC=gcc -+CFLAGS:=$(CFLAGS) $(DEFINES) -I../jabberd/ # -Wall -g -O2 - - msntrans_HEADERS=msntrans.h ../jabberd/jabberd.h - diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist index 9dcb38939957..a8f57d1df18c 100644 --- a/net-im/jabber/pkg-plist +++ b/net-im/jabber/pkg-plist @@ -1,30 +1,24 @@ -bin/jabberd +sbin/jabberd @unexec if cmp -s %D/etc/jabber.xml.sample %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi etc/jabber.xml.sample etc/rc.d/jabberd.sh -lib/jabber/aim-transport/aimtrans.so -lib/jabber/conference/conference.so +include/jabber/ +include/jabber/lib/lib.h +include/jabber/lib/xmlparse.h +include/jabber/platform-settings +include/jabber/jabberd.h +include/jabberd/pth.h lib/jabber/dialback/dialback.so lib/jabber/dnsrv/dnsrv.so -lib/jabber/icq-transport/icqtrans.so -lib/jabber/irc-transport/irc_transport.so lib/jabber/jsm/jsm.so -lib/jabber/jud/jud.so -lib/jabber/msn-transport/msntrans.so lib/jabber/pthsock/pthsock_client.so lib/jabber/xdb_file/xdb_file.so -lib/jabber/yahoo-transport/yahootrans.so -@dirrm lib/jabber/aim-transport -@dirrm lib/jabber/conference +@dirrm include/jabber/lib +@dirrm include/jabber @dirrm lib/jabber/dialback @dirrm lib/jabber/dnsrv -@dirrm lib/jabber/icq-transport -@dirrm lib/jabber/irc-transport @dirrm lib/jabber/jsm -@dirrm lib/jabber/jud -@dirrm lib/jabber/msn-transport @dirrm lib/jabber/pthsock @dirrm lib/jabber/xdb_file -@dirrm lib/jabber/yahoo-transport @dirrm lib/jabber @unexec rmdir /var/spool/jabber 2>/dev/null || true |