Date: Thu, 31 Jul 2014 11:27:40 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363573 - in head/net-im/ejabberd: . files Message-ID: <201407311127.s6VBReJH035171@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Thu Jul 31 11:27:40 2014 New Revision: 363573 URL: http://svnweb.freebsd.org/changeset/ports/363573 QAT: https://qat.redports.org/buildarchive/r363573/ Log: - Update to 14.07 - Remove STUN option, as it is removed upstream - Clean up CONFIGURE_ARGS, as some of the arguments are not supported - Do not display pkg-message in post-install[1] - Strip libraries[1] - Add missing @dirrmtry entries to pkg-plist[1] - Replace /var/lock (not in mtree) with /var/run[1] PR: 192011[1] Submitted by: olgeni[1] Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/distinfo head/net-im/ejabberd/files/patch-Makefile.in head/net-im/ejabberd/files/patch-ejabberdctl.template head/net-im/ejabberd/pkg-plist Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Thu Jul 31 10:50:58 2014 (r363572) +++ head/net-im/ejabberd/Makefile Thu Jul 31 11:27:40 2014 (r363573) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= ejabberd -PORTVERSION= 14.05 +PORTVERSION= 14.07 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \ http://distfiles.pirateparty.in/%SUBDIR%/:deps \ ${MASTER_SITE_LOCAL:S/$/:deps/} MASTER_SITE_SUBDIR= ashish/:deps -DISTFILES+= ${PORTNAME}-${PORTVERSION}.tgz:p1 ejabberd-deps-0.tar.xz:deps +DISTFILES+= ${PORTNAME}-${PORTVERSION}.tgz:p1 ejabberd-deps-1.tar.xz:deps MAINTAINER= ashish@FreeBSD.org COMMENT= Free and Open Source distributed fault-tolerant Jabber server @@ -30,11 +30,11 @@ USES= gmake pkgconfig USE_RC_SUBR= ${PORTNAME} NOPRECIOUSMAKEVARS= yes -OPTIONS_DEFINE= ODBC PAM DOCS HTTP STUN JSON MYSQL PGSQL LAGER ICONV +OPTIONS_DEFINE= ODBC PAM DOCS HTTP JSON MYSQL PGSQL LAGER ICONV OPTIONS_DEFAULT= LAGER ICONV MAKE_ENV= PORTVERSION=${PORTVERSION} -CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE} --with-expat=${LOCALBASE} +CONFIGURE_ARGS+=--localstatedir=/var MAKE_ARGS= "CPPFLAGS=${CPPFLAGS}" "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include @@ -49,14 +49,12 @@ SUB_LIST= PORTNAME=${PORTNAME} PORTVERSI OPTIONS_SUB= yes HTTP_DESC= HTTP support -STUN_DESC= STUN support LAGER_DESC= LAGER logger PAM_CONFIGURE_ENABLE= pam ODBC_CONFIGURE_ENABLE= odbc LAGER_CONFIGURE_ENABLE= lager HTTP_CONFIGURE_ENABLE= http JSON_CONFIGURE_ENABLE= json -STUN_CONFIGURE_ENABLE= stun MYSQL_CONFIGURE_ENABLE= mysql PGSQL_CONFIGURE_ENABLE= pgsql ICONV_CONFIGURE_ENABLE= iconv @@ -78,6 +76,8 @@ post-install: .if ${PORT_OPTIONS:MPAM} ${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd .endif - @${CAT} ${PKGMESSAGE} +.for _file in p1_tls_drv.so expat_erl.so p1_yaml.so esip_drv.so p1_sha.so jiffy.so ezlib_drv.so iconv.so stringprep.so + -@[ -f ${STAGEDIR}${PREFIX}/lib/erlang/lib/ejabberd-${PORTVERSION}/priv/lib/${_file} ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/erlang/lib/ejabberd-${PORTVERSION}/priv/lib/${_file} +.endfor .include <bsd.port.post.mk> Modified: head/net-im/ejabberd/distinfo ============================================================================== --- head/net-im/ejabberd/distinfo Thu Jul 31 10:50:58 2014 (r363572) +++ head/net-im/ejabberd/distinfo Thu Jul 31 11:27:40 2014 (r363573) @@ -1,4 +1,4 @@ -SHA256 (ejabberd-14.05.tgz) = 1f97b1625bab99c7328010ad576810e70ae5d5c89c701b92cbc8d1999e4014cd -SIZE (ejabberd-14.05.tgz) = 2143652 -SHA256 (ejabberd-deps-0.tar.xz) = be2def83af3dee383a6d1e20348d628588898fda4aba4f4210beb966708fa620 -SIZE (ejabberd-deps-0.tar.xz) = 9939900 +SHA256 (ejabberd-14.07.tgz) = 60d2a7c2010f6fec3a6cbe9516d56d4b580833353bc8200107f1029c102162fb +SIZE (ejabberd-14.07.tgz) = 3200975 +SHA256 (ejabberd-deps-1.tar.xz) = 3be239cb6b881b5b49c50d1a68bed2ea2dd860ef579d826f15e1cae18fd7d2a4 +SIZE (ejabberd-deps-1.tar.xz) = 9952828 Modified: head/net-im/ejabberd/files/patch-Makefile.in ============================================================================== --- head/net-im/ejabberd/files/patch-Makefile.in Thu Jul 31 10:50:58 2014 (r363572) +++ head/net-im/ejabberd/files/patch-Makefile.in Thu Jul 31 11:27:40 2014 (r363573) @@ -12,15 +12,20 @@ $FreeBSD$ # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -41,7 +41,7 @@ +@@ -41,10 +41,10 @@ MSGSDIR = $(PRIVDIR)/msgs # /var/lib/ejabberd/ -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd +SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd - # /var/lock/ejabberdctl - CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl +-# /var/lock/ejabberdctl +-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl ++# /var/run/ejabberdctl ++CTLLOCKDIR = $(DESTDIR)@localstatedir@/run/ejabberdctl + + # /var/lib/ejabberd/.erlang.cookie + COOKIEFILE = $(SPOOLDIR)/.erlang.cookie @@ -109,25 +109,22 @@ # # Configuration files @@ -54,15 +59,6 @@ $FreeBSD$ # # Init script $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \ -@@ -151,6 +148,8 @@ - # Binary C programs - $(INSTALL) -d $(PBINDIR) - $(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR) -+ -[ -f deps/p1_pam/priv/bin/epam ] \ -+ && $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR) - # - # Binary system libraries - $(INSTALL) -d $(SODIR) @@ -177,6 +176,7 @@ chmod -R 750 $(LOGDIR) # Modified: head/net-im/ejabberd/files/patch-ejabberdctl.template ============================================================================== --- head/net-im/ejabberd/files/patch-ejabberdctl.template Thu Jul 31 10:50:58 2014 (r363572) +++ head/net-im/ejabberd/files/patch-ejabberdctl.template Thu Jul 31 11:27:40 2014 (r363573) @@ -3,20 +3,20 @@ $FreeBSD$ --- ejabberdctl.template.orig +++ ejabberdctl.template -@@ -68,10 +68,10 @@ - EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml +@@ -67,10 +67,10 @@ + EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi if [ "$LOGS_DIR" = "" ] ; then - LOGS_DIR={{localstatedir}}/log/ejabberd -+ LOGS_DIR=/var/log/ejabberd ++ LOGS_DIR=/var/log/ejabberd fi - if [ "$SPOOLDIR" = "" ] ; then -- SPOOLDIR={{localstatedir}}/lib/ejabberd -+ SPOOLDIR=/var/spool/ejabberd + if [ "$SPOOL_DIR" = "" ] ; then +- SPOOL_DIR={{localstatedir}}/lib/ejabberd ++ SPOOLDIR=/var/spool/ejabberd fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH={{docdir}} -@@ -85,10 +85,10 @@ +@@ -84,10 +84,10 @@ EJABBERDDIR={{libdir}}/ejabberd fi if [ "$EJABBERD_EBIN_PATH" = "" ] ; then @@ -29,3 +29,12 @@ $FreeBSD$ fi if [ "$EJABBERD_BIN_PATH" = "" ] ; then EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin +@@ -281,7 +281,7 @@ + # using flock if available. Expects a linux-style + # flock that can lock a file descriptor. + MAXCONNID=100 +- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl ++ CONNLOCKDIR={{localstatedir}}/run/ejabberdctl + FLOCK='/usr/bin/flock' + if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then + JOT='/usr/bin/jot' Modified: head/net-im/ejabberd/pkg-plist ============================================================================== --- head/net-im/ejabberd/pkg-plist Thu Jul 31 10:50:58 2014 (r363572) +++ head/net-im/ejabberd/pkg-plist Thu Jul 31 11:27:40 2014 (r363573) @@ -30,6 +30,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSIO lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_ldap.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_pam.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_riak.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s_config.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_captcha.beam @@ -51,6 +52,8 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSIO lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_rdbms.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_receiver.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_regexp.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_riak.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_riak_sup.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s_in.beam @@ -229,7 +232,6 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSIO %%NO_LAGER%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_logger_h.beam %%NO_LAGER%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_logger_sup.beam %%NO_LAGER%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_loglevel.beam -lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mnesia.beam %%MYSQL%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mysql.app %%MYSQL%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mysql.beam %%MYSQL%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mysql_app.beam @@ -239,14 +241,16 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSIO %%MYSQL%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mysql_sup.beam %%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_pam.app %%PGSQL%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_pgsql.app +%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_prof.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_server.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_sha.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_stringprep.app -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_stun.app +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_stun.app lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_tls.app lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_tls.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_tls_app.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_tls_sup.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_utils.app lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_xml.app lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_yaml.app lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_yaml.beam @@ -270,21 +274,21 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSIO lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep_app.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep_sup.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_app.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_codec.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_listener.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_shaper.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_sup.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_test.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_tmp_sup.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_treap.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_app.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_codec.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_listener.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_shaper.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_sup.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_test.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_tmp_sup.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stun_treap.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/tcp_serv.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/treap.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/turn.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/turn_sm.beam -%%STUN%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/turn_tmp_sup.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/turn.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/turn_sm.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/turn_tmp_sup.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/url_util.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/win32_dns.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam @@ -371,39 +375,12 @@ sbin/%%PORTNAME%%ctl %%PORTDOCS%%%%DOCSDIR%%/dev.html %%PORTDOCS%%%%DOCSDIR%%/discorus.png %%PORTDOCS%%%%DOCSDIR%%/guide.html +%%PORTDOCS%%%%DOCSDIR%%/guide.pdf %%PORTDOCS%%%%DOCSDIR%%/logo.png %%PORTDOCS%%%%DOCSDIR%%/msrl-dit-deep.png %%PORTDOCS%%%%DOCSDIR%%/msrl-dit-flat.png %%PORTDOCS%%%%DOCSDIR%%/msrl-roster-deep.png %%PORTDOCS%%%%DOCSDIR%%/msrl-roster-flat.png -%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.0.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.3.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.4.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.3.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.4.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.5.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.3.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.4.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.5.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.6.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.7.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.8.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.9.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.10.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.11.txt -%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.12.txt %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png @@ -416,3 +393,6 @@ sbin/%%PORTNAME%%ctl @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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407311127.s6VBReJH035171>