From owner-svn-ports-head@freebsd.org Sun Nov 19 09:05:20 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 208A5DF00EF; Sun, 19 Nov 2017 09:05:20 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 EC68D70F02; Sun, 19 Nov 2017 09:05:19 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAJ95JGX057564; Sun, 19 Nov 2017 09:05:19 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAJ95Ihp057561; Sun, 19 Nov 2017 09:05:18 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201711190905.vAJ95Ihp057561@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sun, 19 Nov 2017 09:05:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454480 - in head/net-im/ejabberd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ashish X-SVN-Commit-Paths: in head/net-im/ejabberd: . files X-SVN-Commit-Revision: 454480 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Nov 2017 09:05:20 -0000 Author: ashish Date: Sun Nov 19 09:05:18 2017 New Revision: 454480 URL: https://svnweb.freebsd.org/changeset/ports/454480 Log: - Fix CAPTCHA functionality Reported by: Martin Meyer Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/files/pkg-message.in head/net-im/ejabberd/pkg-plist Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Sun Nov 19 09:00:14 2017 (r454479) +++ head/net-im/ejabberd/Makefile Sun Nov 19 09:05:18 2017 (r454480) @@ -2,6 +2,7 @@ PORTNAME= ejabberd PORTVERSION= 17.09 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \ http://distfiles.pirateparty.in/ashish/:deps \ @@ -86,6 +87,9 @@ DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes post-extract: @${LN} -s ${WRKDIR}/deps ${WRKSRC}/ +post-patch: + @${REINPLACE_CMD} -e 's,^convert,${LOCALBASE}/bin/convert,' ${WRKSRC}/tools/captcha.sh + pre-configure: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ @@ -106,5 +110,9 @@ post-install-PAM-on: post-install: @${FIND} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR} -type f \ -name '*.so' -exec ${STRIP_CMD} {} \; + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/captcha.sh \ + ${STAGEDIR}${DATADIR} + @${REINPLACE_CMD} -r -e '/captcha_cmd:/s,"[^"]+","${DATADIR}/captcha.sh",' ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.example .include Modified: head/net-im/ejabberd/files/pkg-message.in ============================================================================== --- head/net-im/ejabberd/files/pkg-message.in Sun Nov 19 09:00:14 2017 (r454479) +++ head/net-im/ejabberd/files/pkg-message.in Sun Nov 19 09:05:18 2017 (r454480) @@ -12,5 +12,6 @@ Congratulations, you have installed %%PORTNAME%%! o PLEASE NOTE! "ejabberd" user UID and GID have changed from version 2.0.3 of this port! Users are advised to check all configuration files and data in /var/spool/ejabberd to ensure everything has the correct owner/group. + o To start using CAPTCHA functionality, please install ImageMagick port. ------------------------------------------------------------------------ Modified: head/net-im/ejabberd/pkg-plist ============================================================================== --- head/net-im/ejabberd/pkg-plist Sun Nov 19 09:00:14 2017 (r454479) +++ head/net-im/ejabberd/pkg-plist Sun Nov 19 09:05:18 2017 (r454480) @@ -730,6 +730,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/zh.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/lite.sql sbin/%%PORTNAME%%ctl +%%DATADIR%%/captcha.sh %%PORTDOCS%%%%DOCSDIR%%/COPYING @dir /var/log/%%PORTNAME%% @dir /var/run/%%PORTNAME%%ctl