From owner-svn-ports-all@FreeBSD.ORG Sat Mar 21 21:53:35 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87851419; Sat, 21 Mar 2015 21:53:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 722A0FA7; Sat, 21 Mar 2015 21:53:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2LLrZkq053156; Sat, 21 Mar 2015 21:53:35 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2LLrY1S053152; Sat, 21 Mar 2015 21:53:34 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201503212153.t2LLrY1S053152@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sat, 21 Mar 2015 21:53:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381868 - in head/net-im/ejabberd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Mar 2015 21:53:35 -0000 Author: ashish Date: Sat Mar 21 21:53:33 2015 New Revision: 381868 URL: https://svnweb.freebsd.org/changeset/ports/381868 QAT: https://qat.redports.org/buildarchive/r381868/ Log: - Update to 15.02[1] - Fix issue with upgrading port[2] where directory permissions get reset - Add CPE information - Cleanup pkg-plist PR: 198587[1] Submitted by: samm at os2.kiev.ua[1] Reported by: Igor Karpov (via private email)[2] Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/distinfo head/net-im/ejabberd/files/patch-Makefile.in head/net-im/ejabberd/pkg-plist Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Sat Mar 21 20:50:59 2015 (r381867) +++ head/net-im/ejabberd/Makefile Sat Mar 21 21:53:33 2015 (r381868) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ejabberd -PORTVERSION= 14.12 +PORTVERSION= 15.02 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \ http://distfiles.pirateparty.in/%SUBDIR%/:deps \ @@ -26,9 +26,10 @@ USERS= ejabberd GROUPS= ${USERS} GNU_CONFIGURE= yes -USES= gmake pkgconfig +USES= cpe gmake pkgconfig USE_RC_SUBR= ${PORTNAME} NOPRECIOUSMAKEVARS= yes +CPE_VENDOR= process-one OPTIONS_DEFINE= ODBC PAM DOCS JSON MYSQL PGSQL LAGER ICONV RIAK OPTIONS_DEFAULT= LAGER ICONV Modified: head/net-im/ejabberd/distinfo ============================================================================== --- head/net-im/ejabberd/distinfo Sat Mar 21 20:50:59 2015 (r381867) +++ head/net-im/ejabberd/distinfo Sat Mar 21 21:53:33 2015 (r381868) @@ -1,4 +1,4 @@ -SHA256 (ejabberd-14.12.tgz) = 88c481e6e81e6e81100cdfae8e77bc6ffd6faed62f1938cf1e90ed7504c8785a -SIZE (ejabberd-14.12.tgz) = 3261685 +SHA256 (ejabberd-15.02.tgz) = 58cc6b9b512f2f495993be735a8313a8a0591157e0f35a9a3702b59ff9eb6beb +SIZE (ejabberd-15.02.tgz) = 3281316 SHA256 (ejabberd-deps-2.tar.xz) = 0f5604c0ce40c499f082170b457c4238fac570df71b4b03b9d5fa525abb15847 SIZE (ejabberd-deps-2.tar.xz) = 12475132 Modified: head/net-im/ejabberd/files/patch-Makefile.in ============================================================================== --- head/net-im/ejabberd/files/patch-Makefile.in Sat Mar 21 20:50:59 2015 (r381867) +++ head/net-im/ejabberd/files/patch-Makefile.in Sat Mar 21 21:53:33 2015 (r381868) @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- Makefile.in.orig -+++ Makefile.in -@@ -15,7 +15,7 @@ +--- Makefile.in.orig 2015-02-12 00:14:57.000000000 +0100 ++++ Makefile.in 2015-03-14 23:50:41.000000000 +0100 +@@ -18,7 +18,7 @@ SBINDIR = $(DESTDIR)@sbindir@ # /lib/ejabberd/ @@ -12,7 +9,7 @@ $FreeBSD$ # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -41,10 +41,10 @@ +@@ -44,10 +44,10 @@ MSGSDIR = $(PRIVDIR)/msgs # /var/lib/ejabberd/ @@ -26,7 +23,7 @@ $FreeBSD$ # /var/lib/ejabberd/.erlang.cookie COOKIEFILE = $(SPOOLDIR)/.erlang.cookie -@@ -113,25 +113,22 @@ +@@ -116,9 +116,7 @@ # # Configuration files $(INSTALL) -d -m 750 $(G_USER) $(ETCDIR) @@ -36,7 +33,8 @@ $FreeBSD$ + $(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR) $(SED) -e "s*{{rootdir}}*@prefix@*" \ -e "s*{{installuser}}*@INSTALLUSER@*" \ - -e "s*{{libdir}}*@libdir@*" \ + -e "s*{{bindir}}*@bindir@*" \ +@@ -126,16 +124,15 @@ -e "s*{{sysconfdir}}*@sysconfdir@*" \ -e "s*{{localstatedir}}*@localstatedir@*" \ -e "s*{{docdir}}*@docdir@*" \ @@ -47,7 +45,7 @@ $FreeBSD$ - || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg - $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc + -e "s*{{erl}}*@ERL@*" \ -+ -e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \ ++ -e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \ + ejabberdctl.template > ejabberdctl.example + $(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR) + $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example @@ -56,10 +54,10 @@ $FreeBSD$ [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) - $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl + $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl - # - # Init script - $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \ -@@ -184,6 +181,7 @@ + # Elixir binaries + [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) + -[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex +@@ -196,6 +193,7 @@ chmod -R 750 $(LOGDIR) # # Documentation @@ -67,7 +65,7 @@ $FreeBSD$ $(INSTALL) -d $(DOCDIR) [ -f doc/dev.html ] \ && $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \ -@@ -196,6 +194,7 @@ +@@ -208,6 +206,7 @@ || echo "No doc/guide.pdf was built" $(INSTALL) -m 644 doc/*.png $(DOCDIR) $(INSTALL) -m 644 COPYING $(DOCDIR) Modified: head/net-im/ejabberd/pkg-plist ============================================================================== --- head/net-im/ejabberd/pkg-plist Sat Mar 21 20:50:59 2015 (r381867) +++ head/net-im/ejabberd/pkg-plist Sat Mar 21 21:53:33 2015 (r381868) @@ -3,7 +3,7 @@ %%ETCDIR%%/inetrc.example @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.defaults.example %D/%%ETCDIR%%/%%PORTNAME%%.defaults; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.defaults; fi @unexec if cmp -s %D/%%ETCDIR%%/inetrc.example %D/%%ETCDIR%%/inetrc; then rm -f %D/%%ETCDIR%%/inetrc; fi -@exec [ ! -f %D/%%ETCDIR%%/inetrc ] && cp %D/%%ETCDIR%%/inetrc.example %D/%%ETCDIR%%/inetrc +@exec [ ! -f %D/%%ETCDIR%%/inetrc ] && cp %D/%%ETCDIR%%/inetrc.example %D/%%ETCDIR%%/inetrc || /usr/bin/true %%PAM%%etc/pam.d/%%PORTNAME%% lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam @@ -396,15 +396,6 @@ sbin/%%PORTNAME%%ctl %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin -@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -@dirrmtry %%ETCDIR%% -@dirrmtry /var/spool/ejabberd -@dirrmtry /var/run/ejabberdctl -@dirrmtry /var/log/ejabberd +@dir /var/spool/ejabberd +@dir /var/run/ejabberdctl +@dir /var/log/ejabberd