From owner-svn-ports-all@freebsd.org Thu Mar 22 09:33:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD0C0F546D1; Thu, 22 Mar 2018 09:33:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C10D6A515; Thu, 22 Mar 2018 09:33:22 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BDD67B07; Thu, 22 Mar 2018 09:33:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2M9XMFK067284; Thu, 22 Mar 2018 09:33:22 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2M9XMWr067282; Thu, 22 Mar 2018 09:33:22 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201803220933.w2M9XMWr067282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 22 Mar 2018 09:33:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465279 - head/net-im/ejabberd X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/net-im/ejabberd X-SVN-Commit-Revision: 465279 X-SVN-Commit-Repository: ports 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.25 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: Thu, 22 Mar 2018 09:33:23 -0000 Author: amdmi3 Date: Thu Mar 22 09:33:22 2018 New Revision: 465279 URL: https://svnweb.freebsd.org/changeset/ports/465279 Log: - Remove unneeded bsd.port.pre.mk inclusion - Unsilence installation commands amd use correct INSTALL_xxx where applicable - Update WWW Approved by: portmgr blanket Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/pkg-descr Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Thu Mar 22 09:22:41 2018 (r465278) +++ head/net-im/ejabberd/Makefile Thu Mar 22 09:33:22 2018 (r465279) @@ -81,8 +81,6 @@ ICONV_USES= iconv:wchar_t ICONV_LDFLAGS= ${ICONV_LIB} DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes -.include - post-extract: @${LN} -s ${WRKDIR}/deps ${WRKSRC}/ @@ -102,9 +100,9 @@ post-install-GRAPHICS-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/eimp-1.0.2/priv/bin/eimp post-install-PAM-on: - @${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd \ + ${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd \ ${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd - @${INSTALL} -m 0750 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/epam-1.0.3/priv/bin/epam \ + ${INSTALL} -m 0750 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/epam-1.0.3/priv/bin/epam \ ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/epam @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/epam-1.0.3/priv/bin/epam \ ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/epam @@ -113,10 +111,10 @@ 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 \ + ${INSTALL_SCRIPT} ${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 @${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/fs-3.4.0/priv/kqueue @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/fs-3.4.0/priv/kqueue -.include +.include Modified: head/net-im/ejabberd/pkg-descr ============================================================================== --- head/net-im/ejabberd/pkg-descr Thu Mar 22 09:22:41 2018 (r465278) +++ head/net-im/ejabberd/pkg-descr Thu Mar 22 09:33:22 2018 (r465279) @@ -20,4 +20,4 @@ Key features include: - Multi-lingual web administration interface - Full IPv6 support -WWW: http://www.ejabberd.im/ +WWW: https://www.ejabberd.im/