svn commit: r465279 - head/net-im/ejabberd

[Dmitry Marakasov]

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 <bsd.port.pre.mk>
-
 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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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/