Attachment #21207 for bug #37207

View | Details | Raw Unified | Return to bug 37207
Collapse All | Expand All




#

PORTNAME=	jabber
PORTVERSION=	1.4.2
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	http://jabberd.jabberstudio.org/downloads/ \
		http://download.jabber.org/dists/1.4/final/
DISTNAME=	${PORTNAME}-${PORTVERSION}
DIST_SUBDIR=	jabber
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

MAINTAINER=	sean@chittenden.org

LIB_DEPENDS=	pth.14:${PORTSDIR}/devel/pth

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_OPENSSL=	yes


rc=${PREFIX}/etc/rc.d

#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-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"

post-install:
	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc}

.include <bsd.port.mk>

Lines 1-8 Link Here

(-)net/jabber/distinfo (-8 / +1 lines)
1	MD5 (jabber-1.4.1.tar.gz) = fc7afba8969e53c5e3b662156d1cdeae	1	MD5 (jabber/jabber-1.4.2.tar.gz) = 10780dbdb93926ea5bb360e1186b939c
2	MD5 (aim-transport-0.9.24c.tar.gz) = a3c18654d41ebfaa3c74117004bf7d93
3	MD5 (conference-0.4.1.tar.gz) = 01b825d9f917674f25fdba29255d081b
4	MD5 (icq-transport-0.9.tar.gz) = ffa69ae19ac18395c87470c1729dcc59
5	MD5 (irc-transport-0.1.1-1.4.linux.tar.gz) = a08ef678fa8d768d7696af5bb85d1e34
6	MD5 (jud-0.4.tar.gz) = a057e8dd5966fa0d26ded03697ba395a
7	MD5 (msn-transport-1.1.tar.gz) = 251cd4b6cfc6c52a0f15c3ff2bfbfff9
8	MD5 (yahoo-transport-0.8-1.4.linux.tar.gz) = 0850f8d36d7b1e8df656fa84d03c82ba




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
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
@dirrm include/jabber/lib
@dirrm include/jabber
@dirrm lib/jabber/conference
@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




    echo "$0: Cannot determine the PREFIX" >&2
    exit 1
fi
user=jabber
rundir=/tmp
out=/var/log/jabber.log
hostname=`/bin/hostname`

USER="jabber"
RUNDIR="/var/tmp"
LOG="/var/log/jabber.log"
HOSTNAME=`/bin/hostname`

test -x ${PREFIX}/sbin/jabberd || exit 1

export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
umask 077

echo -n " jabberd "
cd ${RUNDIR} || exit
cd ${rundir} || exit

case ${1:-start} in
case $arg in
start)
    su -f -m ${USER} -c "jabberd -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" >${LOG} 2>&1 &;;

stop)
    killall jabberd;
    rm -f ${RUNDIR}/jabber.pid;
esac




--- 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="`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}";
 
 
 




--- 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
+INSTALL_DATA=`cat .install_data-freebsd`
+INSTALL_DIR=install -d
+INSTALL_PROGRAM=`cat .install_program-freebsd`
+INSTALL_SCRIPT=`cat .install_data-freebsd`
+SUBDIRS+=jud
+SUBDIRS+=msn-transport
+SUBDIRS+=yahoo-transport
+
+
 
 all: all-recursive
 
@@ -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_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}
+	
+	@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
 
 all-local:

Return to bug 37207

Lines 6-31 Link Here

(-)net/jabber/Makefile (-37 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= jabber	8	PORTNAME= jabber
9	PORTVERSION= 1.4.1	9	PORTVERSION= 1.4.2
10	PORTREVISION= 2
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://download.jabber.org/dists/1.4/final/ \	11	MASTER_SITES= http://jabberd.jabberstudio.org/downloads/ \
13	http://download.jabber.org/dists/transports/aim-transport/ \	12	http://download.jabber.org/dists/1.4/final/
14	http://download.jabber.org/dists/transports/yahoo-transport/ \	13	DISTNAME= ${PORTNAME}-${PORTVERSION}
15	http://download.jabber.org/dists/transports/irc-transport/	14	DIST_SUBDIR= jabber
16	DISTFILES+= jabber-1.4.1.tar.gz \
17	aim-transport-0.9.24c.tar.gz \
18	conference-0.4.1.tar.gz \
19	icq-transport-0.9.tar.gz \
20	irc-transport-0.1.1-1.4.linux.tar.gz \
21	jud-0.4.tar.gz \
22	msn-transport-1.1.tar.gz \
23	yahoo-transport-0.8-1.4.linux.tar.gz
24		15
25	MAINTAINER= sean@chittenden.org	16	MAINTAINER= sean@chittenden.org
26		17
27	LIB_DEPENDS= pth.14:${PORTSDIR}/devel/pth
28
29	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
30	USE_GMAKE= yes	19	USE_GMAKE= yes
31	USE_OPENSSL= yes	20	USE_OPENSSL= yes
Lines 34-62 Link Here
34		23
35	rc=${PREFIX}/etc/rc.d	24	rc=${PREFIX}/etc/rc.d
36		25
37	JABDIR= ${PORTNAME}-${PORTVERSION}	26	#JABDIR= ${PORTNAME}-${PORTVERSION}
38	post-extract:	27	# Save this data for use later: jabber doesn't have an install target
39	@mv ${WRKDIR}/aim-transport-0.9.24c ${WRKDIR}/${JABDIR}/aim-transport	28	# or a sane set of defaults.
40	@mv ${WRKDIR}/conference-0.4.1 ${WRKDIR}/${JABDIR}/conference	29	post-patch:
41	@mv ${WRKDIR}/icq-transport-0.9 ${WRKDIR}/${JABDIR}/icq-transport	30	@echo "${WRKSRC}" > ${WRKSRC}/.wrksrc-freebsd
42	@mv ${WRKDIR}/irc-transport-0.1.1-1.40 ${WRKDIR}/${JABDIR}/irc-transport	31	@echo "${PREFIX}" > ${WRKSRC}/.prefix-freebsd
43	@mv ${WRKDIR}/jud-0.4 ${WRKDIR}/${JABDIR}/jud	32	@echo "${INSTALL_DATA}" > ${WRKSRC}/.install_data-freebsd
44	@mv ${WRKDIR}/msn-transport-1.1 ${WRKDIR}/${JABDIR}/msn-transport	33	@echo "${INSTALL_SCRIPT}" > ${WRKSRC}/.install_script-freebsd
45	@mv ${WRKDIR}/yahoo-transport-0.8-1.4 ${WRKDIR}/${JABDIR}/yahoo-transport	34	@echo "${INSTALL_PROGRAM}" > ${WRKSRC}/.install_program-freebsd
46
47	post-configure:
48	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
49	CPPFLAGS="`pth-config --cflags` `libxode-config --cflags`" \
50	LDFLAGS="`pth-config --ldflags` `libxode-config --ldflags`" \
51	LIBS="`pth-config --libs` `libxode-config --libs`" ${SHELL} -c \
52	"cd ${WRKDIR}/${JABDIR}/aim-transport; ./configure --with-jabberd=${WRKDIR}/${JABDIR}/jabberd; \
53	cd ${WRKDIR}/${JABDIR}/irc-transport; \
54	./configure --includedir=${WRKDIR}/${JABDIR}/jabberd; \
55	cd ${WRKDIR}/${JABDIR}/yahoo-transport; \
56	./configure --includedir=${WRKDIR}/${JABDIR}/jabberd"
57		35
58	post-install:	36	post-install:
59	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	37	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
60	@${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc}	38	${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${rc}
61		39
62	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-30 Link Here

(-)net/jabber/pkg-plist (-15 / +9 lines)
1	bin/jabberd	1	sbin/jabberd
2	@unexec if cmp -s %D/etc/jabber.xml.sample %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi	2	@unexec if cmp -s %D/etc/jabber.xml.sample %D/etc/jabber.xml; then rm -f %D/etc/jabber.xml; fi
3	etc/jabber.xml.sample	3	etc/jabber.xml.sample
4	etc/rc.d/jabberd.sh	4	etc/rc.d/jabberd.sh
5	lib/jabber/aim-transport/aimtrans.so	5	include/jabber/
6	lib/jabber/conference/conference.so	6	include/jabber/lib/lib.h
		7	include/jabber/lib/xmlparse.h
		8	include/jabber/platform-settings
		9	include/jabber/jabberd.h
		10	include/jabberd/pth.h
7	lib/jabber/dialback/dialback.so	11	lib/jabber/dialback/dialback.so
8	lib/jabber/dnsrv/dnsrv.so	12	lib/jabber/dnsrv/dnsrv.so
9	lib/jabber/icq-transport/icqtrans.so
10	lib/jabber/irc-transport/irc_transport.so
11	lib/jabber/jsm/jsm.so	13	lib/jabber/jsm/jsm.so
12	lib/jabber/jud/jud.so
13	lib/jabber/msn-transport/msntrans.so
14	lib/jabber/pthsock/pthsock_client.so	14	lib/jabber/pthsock/pthsock_client.so
15	lib/jabber/xdb_file/xdb_file.so	15	lib/jabber/xdb_file/xdb_file.so
16	lib/jabber/yahoo-transport/yahootrans.so	16	@dirrm include/jabber/lib
17	@dirrm lib/jabber/aim-transport	17	@dirrm include/jabber
18	@dirrm lib/jabber/conference
19	@dirrm lib/jabber/dialback	18	@dirrm lib/jabber/dialback
20	@dirrm lib/jabber/dnsrv	19	@dirrm lib/jabber/dnsrv
21	@dirrm lib/jabber/icq-transport
22	@dirrm lib/jabber/irc-transport
23	@dirrm lib/jabber/jsm	20	@dirrm lib/jabber/jsm
24	@dirrm lib/jabber/jud
25	@dirrm lib/jabber/msn-transport
26	@dirrm lib/jabber/pthsock	21	@dirrm lib/jabber/pthsock
27	@dirrm lib/jabber/xdb_file	22	@dirrm lib/jabber/xdb_file
28	@dirrm lib/jabber/yahoo-transport
29	@dirrm lib/jabber	23	@dirrm lib/jabber
30	@unexec rmdir /var/spool/jabber 2>/dev/null \|\| true	24	@unexec rmdir /var/spool/jabber 2>/dev/null \|\| true

Lines 4-30 Link Here

(-)net/jabber/files/jabberd.sh (-14 / +12 lines)
4	echo "$0: Cannot determine the PREFIX" >&2	4	echo "$0: Cannot determine the PREFIX" >&2
5	exit 1	5	exit 1
6	fi	6	fi
7	user=jabber
8	rundir=/tmp
9	out=/var/log/jabber.log
10	hostname=`/bin/hostname`
11		7
12	# Load PTH libraries	8	USER="jabber"
13	ldconfig -m `${PREFIX}/bin/pth-config --libdir`	9	RUNDIR="/var/tmp"
		10	LOG="/var/log/jabber.log"
		11	HOSTNAME=`/bin/hostname`
14		12
15	export PATH=/bin:/usr/bin:${PREFIX}/bin	13	test -x ${PREFIX}/sbin/jabberd \|\| exit 1
		14
		15	export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
16	umask 077	16	umask 077
17		17
18	test -x ${PREFIX}/bin/jabberd \|\| exit 1	18	echo -n " jabberd "
19	echo -n " jabberd"	19	cd ${RUNDIR} \|\| exit
20	cd ${rundir} \|\| exit
21		20
22	arg=${1:-start}	21	case ${1:-start} in
23	case $arg in
24	start)	22	start)
25	su -f -m ${user} -c "jabberd -h ${hostname} -c ${PREFIX}/etc/jabber.xml" >${out} 2>&1 &;;	23	su -f -m ${USER} -c "jabberd -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" >${LOG} 2>&1 &;;
26		24
27	stop)	25	stop)
28	killall jabberd;	26	killall jabberd;
29	rm -f /var/tmp/jabber.pid;	27	rm -f ${RUNDIR}/jabber.pid;
30	esac	28	esac

Lines 1-11 Link Here

(-)net/jabber/files/patch-aa (-4 / +50 lines)
1	--- configure.orig Sat Feb 3 05:06:24 2001	1	--- configure.orig Mon Feb 11 11:14:06 2002
2	+++ configure Sat Feb 10 23:46:59 2001	2	+++ configure Sun Apr 14 18:38:40 2002
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,8 @@
4	LDFLAGS="$LDFLAGS"	4	LDFLAGS="$LDFLAGS"
5	LIBS="$LIBS"	5	LIBS="$LIBS"
6	XLDFLAGS="$XLDFLAGS "	6	XLDFLAGS="$XLDFLAGS "
7	-JHOME=`pwd`	7	-JHOME=`pwd`
8	+JHOME='${PREFIX}/lib/jabber'	8	+JHOME="`cat .prefix-freebsd`/lib/jabber"
		9	+WRKSRC="`cat .wrksrc-freebsd`"
9		10
10	##	11	##
11	# Print a cool header	12	# Print a cool header
		13	@@ -76,31 +77,19 @@
		14	##
		15	# Pth check
		16	##
		17	-printf "Getting pth settings..."
		18	-PTH_CFLAGS=`pth-config --cflags`
		19	-PTH_LDFLAGS=`pth-config --ldflags`
		20	-PTH_LIBS=`pth-config --libs`
		21	-PTH_LIBDIR=`pth-config --libdir`
		22	-if [ -n "$PTH_CFLAGS" ]; then
		23	- CFLAGS="$CFLAGS $PTH_CFLAGS";
		24	- LDFLAGS="$LDFLAGS $PTH_LDFLAGS";
		25	- LIBS="$LIBS $PTH_LIBS";
		26	- SLIBS="$SLIBS $PTH_LIBDIR/libpth.a";
		27	- printf " Done.\n";
		28	-else
		29	- if [ -d "jabberd/pth-1.4.0" ]; then
		30	- opwd=`pwd`
		31	- cd jabberd/pth-1.4.0;
		32	- ./configure \|\| (printf "Error Configuring pth"; exit 1);
		33	- cd $opwd;
		34	- PSUBDIR="pth-1.4.0";
		35	- PTHP=`pwd`"/jabberd/pth-1.4.0";
		36	- PLINK="$PTHP/pth_*.o";
		37	- CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0";
		38	- else
		39	- printf " Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/";
		40	- fi
		41	-fi
		42	+echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible"
		43	+opwd=`pwd`
		44	+cd jabberd/pth-1.4.0;
		45	+echo "Configuring jabber pth-1.4.0..."
		46	+./configure \|\| (echo "Error Configuring pth"; exit 1);
		47	+echo "Building pth-1.4.0..."
		48	+gmake
		49	+cd $opwd;
		50	+PSUBDIR="pth-1.4.0";
		51	+PTHP="`pwd`/jabberd/pth-1.4.0";
		52	+PLINK="$PTHP/pth_*.o";
		53	+CFLAGS="$CFLAGS -I${PTHP}";
		54	+LDFLAGS="$LDFLAGS -L${PTHP}";
		55
		56
		57

Lines 1-55 Link Here

(-)net/jabber/files/patch-ab (-40 / +29 lines)
1	--- Makefile.orig Sun Jan 21 14:32:48 2001	1	--- Makefile.orig Sat Jan 20 21:32:48 2001
2	+++ Makefile Tue Jan 22 23:55:05 2002	2	+++ Makefile Sun Apr 14 23:30:36 2002
3	@@ -4,6 +4,15 @@	3	@@ -4,6 +4,10 @@
4	include platform-settings	4	include platform-settings
5		5
6	SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd	6	SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd
7	+SUBDIRS+=aim-transport	7	+INSTALL_DATA=`cat .install_data-freebsd`
8	+SUBDIRS+=conference	8	+INSTALL_DIR=install -d
9	+SUBDIRS+=icq-transport	9	+INSTALL_PROGRAM=`cat .install_program-freebsd`
10	+SUBDIRS+=irc-transport	10	+INSTALL_SCRIPT=`cat .install_data-freebsd`
11	+SUBDIRS+=jud
12	+SUBDIRS+=msn-transport
13	+SUBDIRS+=yahoo-transport
14	+
15	+
16		11
17	all: all-recursive	12	all: all-recursive
18		13
19	@@ -13,8 +22,35 @@	14	@@ -13,8 +17,29 @@
20		15
21	single: single-recursive	16	single: single-recursive
22		17
23	+LIBDIR=${PREFIX}/lib/jabber	18	+LIBDIR=${PREFIX}/lib/jabber
		19	+INCDIR=${PREFIX}/include/jabber
24	install:	20	install:
25	- printf "\n\nNo actual make install, you just run it out of the directory!\n"	21	- printf "\n\nNo actual make install, you just run it out of the directory!\n"
26	+ @install -c jabberd/jabberd ${PREFIX}/bin	22	+ ${INSTALL_PROGRAM} jabberd/jabberd ${PREFIX}/sbin
27	+ @install -c jabber.xml ${PREFIX}/etc/jabber.xml.sample	23	+ ${INSTALL_DATA} jabber.xml ${PREFIX}/etc/jabber.xml.sample
28	+ @install -d ${LIBDIR}/jsm	24	+ ${INSTALL_DIR} ${LIBDIR}/jsm
29	+ @install -c jsm/jsm.so ${LIBDIR}/jsm	25	+ ${INSTALL_DATA} jsm/jsm.so ${LIBDIR}/jsm
30	+ @install -d ${LIBDIR}/jud	26	+ ${INSTALL_DIR} ${LIBDIR}/xdb_file
31	+ @install -c jud/jud.so ${LIBDIR}/jud	27	+ ${INSTALL_DATA} xdb_file/xdb_file.so ${LIBDIR}/xdb_file
32	+ @install -d ${LIBDIR}/xdb_file	28	+ ${INSTALL_DIR} ${LIBDIR}/pthsock
33	+ @install -c xdb_file/xdb_file.so ${LIBDIR}/xdb_file	29	+ ${INSTALL_DATA} pthsock/pthsock_client.so ${LIBDIR}/pthsock
34	+ @install -d ${LIBDIR}/pthsock	30	+ ${INSTALL_DIR} ${LIBDIR}/dnsrv
35	+ @install -c pthsock/pthsock_client.so ${LIBDIR}/pthsock	31	+ ${INSTALL_DATA} dnsrv/dnsrv.so ${LIBDIR}/dnsrv
36	+ @install -d ${LIBDIR}/dnsrv	32	+ ${INSTALL_DIR} ${LIBDIR}/dialback
37	+ @install -c dnsrv/dnsrv.so ${LIBDIR}/dnsrv	33	+ ${INSTALL_DATA} dialback/dialback.so ${LIBDIR}/dialback
38	+ @install -d ${LIBDIR}/dialback	34	+ ${INSTALL_DIR} ${INCDIR}
39	+ @install -c dialback/dialback.so ${LIBDIR}/dialback	35	+ ${INSTALL_DATA} platform-settings ${INCDIR}
40	+	36	+ ${INSTALL_DATA} jabberd/jabberd.h ${INCDIR}
41	+ @install -d ${LIBDIR}/aim-transport	37	+ ${INSTALL_DIR} ${INCDIR}/lib
42	+ @install -c aim-transport/src/aimtrans.so ${LIBDIR}/aim-transport	38	+ ${INSTALL_DATA} jabberd/lib/lib.h ${INCDIR}/lib
43	+ @install -d ${LIBDIR}/conference	39	+ ${INSTALL_DATA} jabberd/lib/xmlparse.h ${INCDIR}/lib
44	+ @install -c conference/conference.so ${LIBDIR}/conference	40	+ ${INSTALL_DATA} jabberd/pth-1.4.0/pth.h ${INCDIR}
45	+ @install -d ${LIBDIR}/icq-transport	41	+
46	+ @install -c icq-transport/icqtrans.so ${LIBDIR}/icq-transport
47	+ @install -d ${LIBDIR}/irc-transport
48	+ @install -c irc-transport/src/irc_transport.so ${LIBDIR}/irc-transport
49	+ @install -d ${LIBDIR}/msn-transport
50	+ @install -c msn-transport/msntrans.so ${LIBDIR}/msn-transport
51	+ @install -d ${LIBDIR}/yahoo-transport
52	+ @install -c yahoo-transport/src/yahootrans.so ${LIBDIR}/yahoo-transport
53		42
54	all-local:	43	all-local: