sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 1.1 [1]

Browse source 
- Fix rc.d script
- Change UID and GID of ejabberd user and group, to prevent conflicts with
  another applications

PR:		ports/96001, ports/94163, ports/91555
Submitted by:	maintainer, garga [1]
Approved by:	maintainer [1]
This commit is contained in:
Renato Botelho 2006-04-25 17:48:48 +00:00
parent d990ae19c3
commit 61a4f1ab1d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=160453
7 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net-im/ejabberd/Makefile
View file

@ -6,11 +6,9 @@
# #
PORTNAME= ejabberd PORTNAME= ejabberd
PORTVERSION= 1.0.0 PORTVERSION= 1.1.0
PORTREVISION= 2
CATEGORIES= net-im CATEGORIES= net-im
MASTER_SITES= http://www.jabber.ru/files/ejabberd/ \ MASTER_SITES= http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/
http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/
MAINTAINER= shaun@inerd.com MAINTAINER= shaun@inerd.com
COMMENT= Free and Open Source distributed fault-tolerant Jabber server COMMENT= Free and Open Source distributed fault-tolerant Jabber server

6
net-im/ejabberd/distinfo
View file

@ -1,3 +1,3 @@
MD5 (ejabberd-1.0.0.tar.gz) = bc0bfdad2e5e48e42fcc5d09384be74f MD5 (ejabberd-1.1.0.tar.gz) = abd310557da32e520c4a3d4f3c97aab1
SHA256 (ejabberd-1.0.0.tar.gz) = 5893fe92665fde5ad7af97c8974d39c07a3b36483be35b1f5b6d3f4ec3b6cbb4 SHA256 (ejabberd-1.1.0.tar.gz) = 4c317323eb826ad92fae3b349ea340a931c006cc01f1d8db0cbe19ed324b2593
SIZE (ejabberd-1.0.0.tar.gz) = 726315 SIZE (ejabberd-1.1.0.tar.gz) = 801984

19
net-im/ejabberd/files/ejabberd.sh.in
View file

@ -43,12 +43,7 @@ ejabberd_status()
ejabberd_start() ejabberd_start()
{ {
echo -n "Starting $name: " echo -n "Starting $name: "
if ejabberd_status; then su $EJABBERDUSER -c "$EJABBERD -s -noshell -detached"
echo " already running."
exit 1
else
su $EJABBERDUSER -c "$EJABBERD -noshell -detached"
fi
echo "$name." echo "$name."
} }
@ -56,16 +51,8 @@ ejabberd_stop()
{ {
echo -n "Stopping $name: " echo -n "Stopping $name: "
if su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` stop"; then if su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` stop"; then
cnt=0 sleep 2
while ejabberd_status; do killall -u ejabberd -kill
cnt=`expr $cnt + 1`
if [ $cnt -gt 60 ]; then
echo -n " failed "
break
fi
sleep 1
echo -n "."
done
else else
echo -n " failed " echo -n " failed "
fi fi

25
net-im/ejabberd/files/patch-src-Makefile.in
View file

@ -1,24 +1,27 @@
--- Makefile.in.orig Tue May 24 01:52:43 2005 --- Makefile.in.orig Sat Apr 1 13:06:36 2006
+++ Makefile.in Wed Jul 13 11:09:49 2005 +++ Makefile.in Tue Apr 25 07:43:19 2006
@@ -17,14 +17,14 @@ @@ -32,15 +32,15 @@
SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @eldap@ @web@ stringprep @tls@ @odbc@ SOURCES = $(wildcard *.erl)
ERLSHLIBS = expat_erl.so BEAMS = $(SOURCES:.erl=.beam)
-DESTDIR = -DESTDIR =
-
-EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd
+DESTDIR = @prefix@ +DESTDIR = @prefix@
+
-EJABBERDDIR = $(DESTDIR)/var/lib/ejabberd
+EJABBERDDIR = $(DESTDIR)/lib/erlang/lib/ejabberd-$(PORTVERSION) +EJABBERDDIR = $(DESTDIR)/lib/erlang/lib/ejabberd-$(PORTVERSION)
BEAMDIR = $(EJABBERDDIR)/ebin BEAMDIR = $(EJABBERDDIR)/ebin
PRIVDIR = $(EJABBERDDIR)/priv PRIVDIR = $(EJABBERDDIR)/priv
SODIR = $(PRIVDIR)/lib SODIR = $(PRIVDIR)/lib
MSGSDIR = $(PRIVDIR)/msgs MSGSDIR = $(PRIVDIR)/msgs
-LOGDIR = $(DESTDIR)/var/log/ejabberd -LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
-ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
+LOGDIR = /var/log/ejabberd +LOGDIR = /var/log/ejabberd
ETCDIR = $(DESTDIR)/etc/ejabberd +ETCDIR = $(DESTDIR)/etc/ejabberd
all: $(ERLSHLIBS) compile-beam all-recursive ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
@@ -60,7 +60,7 @@
@@ -82,7 +82,7 @@
install -d $(MSGSDIR) install -d $(MSGSDIR)
install -m 644 msgs/*.msg $(MSGSDIR) install -m 644 msgs/*.msg $(MSGSDIR)
install -d $(ETCDIR) install -d $(ETCDIR)

8
net-im/ejabberd/files/patch-src::configure
View file

@ -1,10 +1,10 @@
--- configure.orig Sat Jul 3 14:58:07 2004 --- configure.orig Sun Apr 23 16:06:17 2006
+++ configure Sat Jul 3 15:01:49 2004 +++ configure Tue Apr 25 07:15:42 2006
@@ -2180,7 +2180,7 @@ @@ -2471,7 +2471,7 @@
fi fi
- if test "z$ERLC" == "z" || test "z$ERL" == "z"; then - if test "z$ERLC" = "z" || test "z$ERL" = "z"; then
+ if test -z "$ERLC" || test -z "$ERL"; then + if test -z "$ERLC" || test -z "$ERL"; then
{ { echo "$as_me:$LINENO: error: erlang not found" >&5 { { echo "$as_me:$LINENO: error: erlang not found" >&5
echo "$as_me: error: erlang not found" >&2;} echo "$as_me: error: erlang not found" >&2;}

2
net-im/ejabberd/pkg-install
View file

@ -6,7 +6,7 @@ fi
USER=ejabberd USER=ejabberd
GROUP=${USER} GROUP=${USER}
UID=522 UID=544
GID=${UID} GID=${UID}
USERS_HOME="/var/spool/ejabberd" USERS_HOME="/var/spool/ejabberd"

14
net-im/ejabberd/pkg-plist
View file

@ -11,6 +11,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_app.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_app.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_anonymous.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_external.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_external.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_internal.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_internal.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_ldap.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_ldap.beam
@ -33,12 +34,16 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_service.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_update.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web_admin.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web_admin.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_zlib.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/adhoc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam
@ -50,6 +55,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/iconv.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/idna.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/idna.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jd2ejd.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jd2ejd.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jlib.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jlib.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure2.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure2.beam
@ -60,6 +66,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_irc_connection.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_room.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_room.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_odbc.beam
@ -85,6 +92,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/tls.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/expat_erl.so lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/expat_erl.so
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/iconv_erl.so lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/iconv_erl.so
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/stringprep_drv.so lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/stringprep_drv.so
@ -100,14 +108,15 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ru.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/sv.msg lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/sv.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/uk.msg lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/uk.msg
%%PORTDOCS%%%%DOCSDIR%%/Makefile %%PORTDOCS%%%%DOCSDIR%%/Makefile
%%PORTDOCS%%%%DOCSDIR%%/dev.html
%%PORTDOCS%%%%DOCSDIR%%/dev.tex %%PORTDOCS%%%%DOCSDIR%%/dev.tex
%%PORTDOCS%%%%DOCSDIR%%/disco.png %%PORTDOCS%%%%DOCSDIR%%/disco.png
%%PORTDOCS%%%%DOCSDIR%%/discorus.png %%PORTDOCS%%%%DOCSDIR%%/discorus.png
%%PORTDOCS%%%%DOCSDIR%%/features.tex %%PORTDOCS%%%%DOCSDIR%%/features.tex
%%PORTDOCS%%%%DOCSDIR%%/features2.tex
%%PORTDOCS%%%%DOCSDIR%%/flow.dot %%PORTDOCS%%%%DOCSDIR%%/flow.dot
%%PORTDOCS%%%%DOCSDIR%%/guide.html %%PORTDOCS%%%%DOCSDIR%%/guide.html
%%PORTDOCS%%%%DOCSDIR%%/guide.tex %%PORTDOCS%%%%DOCSDIR%%/guide.tex
%%PORTDOCS%%%%DOCSDIR%%/guide.tex.flc
%%PORTDOCS%%%%DOCSDIR%%/hevea.sty %%PORTDOCS%%%%DOCSDIR%%/hevea.sty
%%PORTDOCS%%%%DOCSDIR%%/introduction.tex %%PORTDOCS%%%%DOCSDIR%%/introduction.tex
%%PORTDOCS%%%%DOCSDIR%%/logo.png %%PORTDOCS%%%%DOCSDIR%%/logo.png
@ -115,12 +124,13 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/uk.msg
%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.0.0.txt
%%PORTDOCS%%%%DOCSDIR%%/version.tex %%PORTDOCS%%%%DOCSDIR%%/version.tex
%%PORTDOCS%%%%DOCSDIR%%/webadmmain.png %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
%%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
%%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png
%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm etc/%%PORTNAME%% @dirrmtry etc/%%PORTNAME%%
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv