http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.5
Works for me on i386, both with erlang R12 and R13
Should I @comment the .beforesubst files, or find and delete them?
--
viq
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ejabberd/Makefile,v
retrieving revision 1.16
diff -u -d -r1.16 Makefile
--- Makefile 11 Apr 2010 10:07:10 -0000 1.16
+++ Makefile 17 Aug 2010 22:46:48 -0000
@@ -2,7 +2,7 @@
COMMENT= jabber server written in Erlang
-V= 2.1.3
+V= 2.1.5
DISTNAME= ejabberd-$V
CATEGORIES= net
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ejabberd/distinfo,v
retrieving revision 1.7
diff -u -d -r1.7 distinfo
--- distinfo 11 Apr 2010 10:07:10 -0000 1.7
+++ distinfo 17 Aug 2010 22:46:48 -0000
@@ -1,5 +1,5 @@
-MD5 (ejabberd-2.1.3.tar.gz) = 5ch+2lMSpuilPfD5tIRLaQ==
-RMD160 (ejabberd-2.1.3.tar.gz) = xXZyko4w9x7GZjbdXnatuALxewM=
-SHA1 (ejabberd-2.1.3.tar.gz) = d/3xjAuzslz5BF4Mgzuk2C8YBGk=
-SHA256 (ejabberd-2.1.3.tar.gz) = YCxuTnQsTKuFlOnwSfCNC/ISX6hK9JHgzrbW8vOFTvY=
-SIZE (ejabberd-2.1.3.tar.gz) = 2243874
+MD5 (ejabberd-2.1.5.tar.gz) = ICnOykVYTXBMqCGncdbZKA==
+RMD160 (ejabberd-2.1.5.tar.gz) = er1rxKA/aNA+E+6MH/Ol/uYJjcY=
+SHA1 (ejabberd-2.1.5.tar.gz) = iWbWdSIZyThvSKW44fL4+w50d64=
+SHA256 (ejabberd-2.1.5.tar.gz) = MaRiKMaTPXwkQ1dTMApNKuLoRWimCXF13F1OVTKZ3Z0=
+SIZE (ejabberd-2.1.5.tar.gz) = 2278008
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/net/ejabberd/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -d -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Apr 2010 10:07:10 -0000 1.1
+++ patches/patch-src_Makefile_in 17 Aug 2010 22:46:48 -0000
@@ -1,9 +1,9 @@
No need to install release notes.
$OpenBSD: patch-src_Makefile_in,v 1.1 2010/04/11 10:07:10 sthen Exp $
---- src/Makefile.in.orig Fri Mar 12 11:40:41 2010
-+++ src/Makefile.in Sun Mar 14 02:57:29 2010
-@@ -111,7 +111,7 @@ MSGSDIR = $(PRIVDIR)/msgs
+--- src/Makefile.in.orig Mon Aug 2 18:33:20 2010
++++ src/Makefile.in Wed Aug 18 00:36:10 2010
+@@ -118,7 +118,7 @@ MSGSDIR = $(PRIVDIR)/msgs
SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
# /var/lock/ejabberdctl
@@ -12,11 +12,11 @@
# /var/lib/ejabberd/.erlang.cookie
COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
-@@ -249,7 +249,6 @@ install: all
- install -d $(DOCDIR)
+@@ -257,7 +257,6 @@ install: all
+ install -m 644 ../doc/dev.html $(DOCDIR)
install -m 644 ../doc/guide.html $(DOCDIR)
install -m 644 ../doc/*.png $(DOCDIR)
- install -m 644 ../doc/*.txt $(DOCDIR)
-
- uninstall: uninstall-binary
-
+ [ -f ../doc/guide.pdf ] \
+ && install -m 644 ../doc/guide.pdf $(DOCDIR) \
+ || echo "No ../doc/guide.pdf was built"
Index: patches/patch-src_ejabberdctl_template
===================================================================
RCS file: /cvs/ports/net/ejabberd/patches/patch-src_ejabberdctl_template,v
retrieving revision 1.3
diff -u -d -r1.3 patch-src_ejabberdctl_template
--- patches/patch-src_ejabberdctl_template 11 Apr 2010 10:07:10 -0000
1.3
+++ patches/patch-src_ejabberdctl_template 17 Aug 2010 22:46:48 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_ejabberdctl_template,v 1.3 2010/04/11 10:07:10 sthen Exp $
---- src/ejabberdctl.template.orig Fri Mar 12 11:40:41 2010
-+++ src/ejabberdctl.template Sat Apr 3 20:49:01 2010
+--- src/ejabberdctl.template.orig Mon Aug 2 18:33:20 2010
++++ src/ejabberdctl.template Wed Aug 18 00:30:24 2010
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -72,12 +72,12 @@
# export global variables
export EJABBERD_CONFIG_PATH
-@@ -234,7 +234,7 @@ ctl ()
+@@ -237,7 +237,7 @@ ctl ()
# using flock if available. Expects a linux-style
# flock that can lock a file descriptor.
MAXCONNID=100
- connlockd...@localstatedir@/lock/ejabberdctl
+ CONNLOCKDIR=/tmp
FLOCK='/usr/bin/flock'
- if [ ! -x "$FLOCK" ] ; then
+ if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
JOT='/usr/bin/jot'
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ejabberd/pkg/PLIST,v
retrieving revision 1.6
diff -u -d -r1.6 PLIST
--- pkg/PLIST 11 Apr 2010 10:07:10 -0000 1.6
+++ pkg/PLIST 17 Aug 2010 22:46:48 -0000
@@ -31,7 +31,6 @@
lib/ejabberd/ebin/ejabberd_commands.beam
lib/ejabberd/ebin/ejabberd_config.beam
lib/ejabberd/ebin/ejabberd_ctl.beam
-lib/ejabberd/ebin/ejabberd_debug.beam
lib/ejabberd/ebin/ejabberd_frontend_socket.beam
lib/ejabberd/ebin/ejabberd_hooks.beam
lib/ejabberd/ebin/ejabberd_http.beam
@@ -65,6 +64,7 @@
lib/ejabberd/ebin/ejd2odbc.beam
lib/ejabberd/ebin/eldap.beam
lib/ejabberd/ebin/eldap_filter.beam
+lib/ejabberd/ebin/eldap_filter_yecc.beam
lib/ejabberd/ebin/eldap_pool.beam
lib/ejabberd/ebin/eldap_utils.beam
lib/ejabberd/ebin/extauth.beam
@@ -118,6 +118,7 @@
lib/ejabberd/ebin/mod_vcard.beam
lib/ejabberd/ebin/mod_vcard_ldap.beam
lib/ejabberd/ebin/mod_vcard_odbc.beam
+lib/ejabberd/ebin/mod_vcard_xupdate.beam
lib/ejabberd/ebin/mod_version.beam
lib/ejabberd/ebin/node_buddy.beam
lib/ejabberd/ebin/node_club.beam
@@ -182,6 +183,7 @@
lib/ejabberd/priv/bin/
lib/ejabberd/priv/bin/captcha.sh
lib/ejabberd/priv/lib/
+lib/ejabberd/priv/lib/sha_drv.so
lib/ejabberd/priv/msgs/
lib/ejabberd/priv/msgs/ca.msg
lib/ejabberd/priv/msgs/cs.msg
@@ -208,14 +210,16 @@
lib/ejabberd/priv/msgs/wa.msg
lib/ejabberd/priv/msgs/zh.msg
sbin/ejabberdctl
-...@comment sbin/ejabberdctl.bak
+...@comment sbin/ejabberdctl.beforesubst
share/doc/ejabberd/
+share/doc/ejabberd/COPYING
share/doc/ejabberd/README.OpenBSD
@comment share/doc/ejabberd/api/
share/doc/ejabberd/dev.html
share/doc/ejabberd/discorus.png
share/doc/ejabberd/features.html
share/doc/ejabberd/guide.html
+share/doc/ejabberd/guide.pdf
share/doc/ejabberd/logo.png
share/doc/ejabberd/webadmmain.png
share/doc/ejabberd/webadmmainru.png
@@ -224,7 +228,7 @@
@sample ${SYSCONFDIR}/ejabberd/
share/examples/ejabberd/ejabberd.cfg
@sample ${SYSCONFDIR}/ejabberd/ejabberd.cfg
-...@comment share/examples/ejabberd/ejabberd.cfg.bak
+...@comment share/examples/ejabberd/ejabberd.cfg.beforesubst
share/examples/ejabberd/ejabberdctl.cfg
@sample ${SYSCONFDIR}/ejabberd/ejabberdctl.cfg
share/examples/ejabberd/extauth/
pgp7njrCZvXEj.pgp
Description: PGP signature
