Attachment #44572 for bug #68967

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




# Date created:				29 December 2003
# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD: ports/net/jabberd/Makefile,v 1.15 2004/06/14 10:01:47 demon Exp $
#

PORTNAME=	jabberd
PORTVERSION=	2.0.3
CATEGORIES=	net
MASTER_SITES=	http://www.jabberstudio.org/files/jabberd2/
DISTNAME=	${PORTNAME}-2.0s3
DIST_SUBDIR=	jabber

MAINTAINER=	ports@FreeBSD.org

GNU_CONFIGURE=	yes
USE_OPENSSL=	yes
USE_ICONV=	yes
USE_RC_SUBR=	yes
CONFIGURE_ARGS= --localstatedir=/var \
		--enable-ssl \
		--with-extra-include-path=${LOCALBASE}/include:${LOCALBASE}/include/mysql \
		--with-extra-library-path=${LOCALBASE}/lib:${LOCALBASE}/lib/mysql
		--enable-authreg='${AUTHREG}'

CONFIGURE_ARGS+=--enable-fs
AUTHREG+=	anon pipe

.if !defined(WITHOUT_DEBUG)
CONFIGURE_ARGS+=--enable-debug


.if defined(WITH_POSTGRESQL)
LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
CONFIGURE_ARGS+=--enable-pgsql
STORAGE+=	pgsql
AUTHREG+=	pgsql
.endif

.if defined(WITH_MYSQL)
USE_MYSQL=	yes
CONFIGURE_ARGS+=--enable-mysql
.else
CONFIGURE_ARGS+=--disable-mysql
.endif

.if defined(WITH_BDB)
LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
CONFIGURE_ARGS+=--enable-db
STORAGE+=	db
AUTHREG+=	db
.endif

.if defined(WITH_LDAP)
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=--enable-ldap
AUTHREG+=	ldap
.endif

.if defined(WITH_PAM)
CONFIGURE_ARGS+=--enable-pam
AUTHREG+=	pam
.endif

MAN8=		c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8

	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

post-install:
	${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
	${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
		${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
		${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
	fi
	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660

Lines 1-2 Link Here

(-)net/jabberd/distinfo (-2 / +2 lines)
1	MD5 (jabber/jabberd-2.0s2.tar.gz) = 0f794b00e480a7b4c36d858d4d0095bf	1	MD5 (jabber/jabberd-2.0s3.tar.gz) = c15f8f07cb2ee499cd21c0b883b9f353
2	SIZE (jabber/jabberd-2.0s2.tar.gz) = 780944	2	SIZE (jabber/jabberd-2.0s3.tar.gz) = 705819




#!/bin/sh

# Start or stop jabberd
# $FreeBSD: $
    exit 1
fi

# PROVIDE: jabberd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD shutdown
#
prefix=/usr/local

# Define these jabberd_* variables in one of these files:
#       /etc/rc.conf
#       /etc/rc.conf.local
#       /etc/rc.conf.d/gkrellmd
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
jabberd_chdir="/var/jabberd/pid"
jabberd_enable="NO"
jabberd_flags=""
jabberd_user="jabber"

. /etc/rc.subr

name="jabberd"
rcvar=`set_rcvar`
command="/usr/local/bin/jabberd"
command_args="&"
procname="/usr/local/bin/router"

load_rc_config $name

pidfile="${jabberd_chdir}/router.pid"
umask 077

cd ${RUNDIR} || exit

case "$1" in
	stop)
		echo "Stopping Jabber2"
		killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
		for file in c2s resolver router s2s sm; do
			rm -f ${jabberd_chdir}/$file.pid
		done
	;;
	*)
		run_rc_command "$1"
	;;
    echo -n ' jabberd'
    ;;
*)
    echo "Usage: `basename $0` {start|stop}" >&2
    ;;
esac

exit 0




--- configure.orig	Mon Jul 12 10:15:17 2004
+++ configure	Mon Jul 12 10:15:26 2004
@@ -20575,7 +20575,7 @@
 done
       esac
 
     if test "x-$ac_cv_header_db_h" = "x-yes" ; then
-        for lib in db-4.2 db-4.1 db-4 db4 db ; do
+        for lib in db-4.2 db-4.1 db-4 db4 db41 ; do
             if test "x-$have_db_version" != "x-yes" ; then
                 echo "$as_me:$LINENO: checking for db_create in -l$lib" >&5
 echo $ECHO_N "checking for db_create in -l$lib... $ECHO_C" >&6

Line 0 Link Here

(-)net/jabberd/files/patch-util.h (+10 lines)
	1	--- util/util.h.orig Mon May 31 16:31:06 2004
	2	+++ util/util.h Mon Jul 12 10:29:58 2004
	3	@@ -30,6 +30,7 @@
	4	#include <time.h>
	5	#include <errno.h>
	6	#include <assert.h>
	7	+#include <sys/socket.h>
	8
	9	#ifdef HAVE_NETINET_IN_H
	10	# include <netinet/in.h>

Lines 20-27 Link Here

(-)net/jabberd/pkg-plist (-2 / +2 lines)
20	etc/jabberd/sm.xml.dist	20	etc/jabberd/sm.xml.dist
21	@unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi	21	@unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
22	etc/jabberd/templates/roster.xml.dist	22	etc/jabberd/templates/roster.xml.dist
23	@unexec if cmp -s %D/etc/rc.d/jabberd.sh %D/etc/rc.d/jabberd.sh-dist; then rm -f %D/etc/rc.d/jabberd.sh; fi	23	@unexec if cmp -s %D/etc/rc.d/jabberd.sh %D/etc/rc.d/jabberd.sh; then rm -f %D/etc/rc.d/jabberd.sh; fi
24	etc/rc.d/jabberd.sh-dist	24	etc/rc.d/jabberd.sh
25	share/jabberd/db-setup.mysql	25	share/jabberd/db-setup.mysql
26	share/jabberd/db-setup.pgsql	26	share/jabberd/db-setup.pgsql
27	@dirrm share/jabberd	27	@dirrm share/jabberd

Return to bug 68967

Lines 2-15 Link Here

(-)net/jabberd/Makefile (-27 / +17 lines)
2	# Date created: 29 December 2003	2	# Date created: 29 December 2003
3	# Whom: Dmitry Sivachenko <demon@FreeBSD.org>	3	# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
4	#	4	#
5	# $FreeBSD: ports/net/jabberd/Makefile,v 1.16 2004/07/12 16:41:43 demon Exp $	5	# $FreeBSD: ports/net/jabberd/Makefile,v 1.15 2004/06/14 10:01:47 demon Exp $
6	#	6	#
7		7
8	PORTNAME= jabberd	8	PORTNAME= jabberd
9	PORTVERSION= 2.0.2	9	PORTVERSION= 2.0.3
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/	11	MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/
12	DISTNAME= ${PORTNAME}-2.0s2	12	DISTNAME= ${PORTNAME}-2.0s3
13	DIST_SUBDIR= jabber	13	DIST_SUBDIR= jabber
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
Lines 18-31 Link Here
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	USE_OPENSSL= yes	19	USE_OPENSSL= yes
20	USE_ICONV= yes	20	USE_ICONV= yes
		21	USE_RC_SUBR= yes
21	CONFIGURE_ARGS= --localstatedir=/var \	22	CONFIGURE_ARGS= --localstatedir=/var \
22	--with-libiconv-prefix=${LOCALBASE} \	23	--enable-ssl \
23	--with-openssl=${OPENSSLBASE} \	24	--with-extra-include-path=${LOCALBASE}/include:${LOCALBASE}/include/mysql \
24	--enable-storage='${STORAGE}' \	25	--with-extra-library-path=${LOCALBASE}/lib:${LOCALBASE}/lib/mysql
25	--enable-authreg='${AUTHREG}'
26		26
27	STORAGE+= fs	27	CONFIGURE_ARGS+=--enable-fs
28	AUTHREG+= anon pipe
29		28
30	.if !defined(WITHOUT_DEBUG)	29	.if !defined(WITHOUT_DEBUG)
31	CONFIGURE_ARGS+=--enable-debug	30	CONFIGURE_ARGS+=--enable-debug
Lines 33-66 Link Here
33		32
34	.if defined(WITH_POSTGRESQL)	33	.if defined(WITH_POSTGRESQL)
35	LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7	34	LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
36	CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/include:${LOCALBASE}/lib	35	CONFIGURE_ARGS+=--enable-pgsql
37	STORAGE+= pgsql
38	AUTHREG+= pgsql
39	.endif	36	.endif
40		37
41	.if defined(WITH_MYSQL)	38	.if defined(WITH_MYSQL)
42	USE_MYSQL= yes	39	USE_MYSQL= yes
43	CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}/include/mysql:${LOCALBASE}/lib/mysql	40	CONFIGURE_ARGS+=--enable-mysql
44	STORAGE+= mysql	41	.else
45	AUTHREG+= mysql	42	CONFIGURE_ARGS+=--disable-mysql
46	.endif	43	.endif
47		44
48	.if defined(WITH_BDB)	45	.if defined(WITH_BDB)
49	LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41	46	LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
50	CONFIGURE_ARGS+=--with-berkeley-db=${LOCALBASE}/include/db41:${LOCALBASE}/lib	47	CONFIGURE_ARGS+=--enable-db
51	STORAGE+= db
52	AUTHREG+= db
53	.endif	48	.endif
54		49
55	.if defined(WITH_LDAP)	50	.if defined(WITH_LDAP)
56	USE_OPENLDAP= yes	51	USE_OPENLDAP= yes
57	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}	52	CONFIGURE_ARGS+=--enable-ldap
58	AUTHREG+= ldap
59	.endif	53	.endif
60		54
61	.if defined(WITH_PAM)	55	.if defined(WITH_PAM)
62	CONFIGURE_ARGS+=--with-pam	56	CONFIGURE_ARGS+=--enable-pam
63	AUTHREG+= pam
64	.endif	57	.endif
65		58
66	MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8	59	MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8
Lines 79-89 Link Here
79	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	72	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
80		73
81	post-install:	74	post-install:
82	${INSTALL_DATA} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh-dist	75	${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
83	@if [ ! -f ${PREFIX}/etc/rc.d/jabberd.sh ]; then \	76	${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
84	${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."; \
85	${INSTALL_SCRIPT} ${FILESDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh; \
86	fi
87	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd	77	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
88	@${FIND} ${PREFIX}/etc/jabberd -type d \| ${XARGS} ${CHMOD} 750	78	@${FIND} ${PREFIX}/etc/jabberd -type d \| ${XARGS} ${CHMOD} 750
89	@${FIND} ${PREFIX}/etc/jabberd -type f \| ${XARGS} ${CHMOD} 660	79	@${FIND} ${PREFIX}/etc/jabberd -type f \| ${XARGS} ${CHMOD} 660

Lines 1-37 Link Here

(-)net/jabberd/files/jabberd.sh (-30 / +41 lines)
1	#! /bin/sh	1	#!/bin/sh
2		2
3	if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/jabberd\.sh\$"); then	3	# Start or stop jabberd
4	echo "$0: Cannot determine the PREFIX" >&2	4	# $FreeBSD: $
5	exit 1
6	fi
7		5
8	USER="jabber"	6	# PROVIDE: jabberd
9	RUNDIR="/var/jabberd/pid"	7	# REQUIRE: DAEMON
10	HOSTNAME=`/bin/hostname`	8	# BEFORE: LOGIN
		9	# KEYWORD: FreeBSD shutdown
		10	#
		11	prefix=/usr/local
		12
		13	# Define these jabberd_* variables in one of these files:
		14	# /etc/rc.conf
		15	# /etc/rc.conf.local
		16	# /etc/rc.conf.d/gkrellmd
		17	#
		18	# DO NOT CHANGE THESE DEFAULT VALUES HERE
		19	#
		20	jabberd_chdir="/var/jabberd/pid"
		21	jabberd_enable="NO"
		22	jabberd_flags=""
		23	jabberd_user="jabber"
		24
		25	. /etc/rc.subr
		26
		27	name="jabberd"
		28	rcvar=`set_rcvar`
		29	command="/usr/local/bin/jabberd"
		30	command_args="&"
		31	procname="/usr/local/bin/router"
11		32
12	test -x ${PREFIX}/bin/jabberd \|\| exit 1	33	load_rc_config $name
13		34
14	export PATH=/sbin:/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin	35	pidfile="${jabberd_chdir}/router.pid"
15	umask 077
16
17	cd ${RUNDIR} \|\| exit
18		36
19	case "$1" in	37	case "$1" in
20	start)	38	stop)
21	su -f -m ${USER} -c ${PREFIX}/bin/jabberd &	39	echo "Stopping Jabber2"
22	echo -n ' jabberd'	40	killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
23	;;	41	for file in c2s resolver router s2s sm; do
24	stop)	42	rm -f ${jabberd_chdir}/$file.pid
25	killall -u ${USER} jabberd c2s resolver router s2s sm	43	done
26	for file in c2s resolver router s2s sm	44	;;
27	do	45	*)
28	rm -f ${RUNDIR}/$file.pid	46	run_rc_command "$1"
29	done	47	;;
30	echo -n ' jabberd'
31	;;
32	*)
33	echo "Usage: `basename $0` {start\|stop}" >&2
34	;;
35	esac	48	esac
36
37	exit 0

Lines 1-11 Link Here

(-)net/jabberd/files/patch-configure (-10 / +10 lines)
1	--- configure.orig Sun Feb 22 13:14:13 2004	1	--- configure.orig Mon Jul 12 10:15:17 2004
2	+++ configure Sun Feb 22 13:14:42 2004	2	+++ configure Mon Jul 12 10:15:26 2004
3	@@ -23709,7 +23709,7 @@	3	@@ -20575,7 +20575,7 @@
4	;;	4	done
5	esac
6		5
7	- for db_libname in db-4.2 db-4.1 db-4 db4 db; do	6	if test "x-$ac_cv_header_db_h" = "x-yes" ; then
8	+ for db_libname in db-4.2 db-4.1 db-4 db4 db41 db; do	7	- for lib in db-4.2 db-4.1 db-4 db4 db ; do
9	# We generate a separate cache variable for each prefix and libname	8	+ for lib in db-4.2 db-4.1 db-4 db4 db41 ; do
10	# we search under. That way, we avoid caching information that	9	if test "x-$have_db_version" != "x-yes" ; then
11	# changes if the user runs `configure' with a different set of	10	echo "$as_me:$LINENO: checking for db_create in -l$lib" >&5
		11	echo $ECHO_N "checking for db_create in -l$lib... $ECHO_C" >&6