Date: Sun, 21 Dec 2014 12:14:20 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375157 - in head/net-im/jabber: . files Message-ID: <201412211214.sBLCEKMX093173@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Dec 21 12:14:19 2014 New Revision: 375157 URL: https://svnweb.freebsd.org/changeset/ports/375157 QAT: https://qat.redports.org/buildarchive/r375157/ Log: - Fix plist - Replace pkg-install/pkg-deinstall scripts with @dir Deleted: head/net-im/jabber/files/pkg-deinstall.in head/net-im/jabber/files/pkg-install.in Modified: head/net-im/jabber/Makefile head/net-im/jabber/pkg-plist Modified: head/net-im/jabber/Makefile ============================================================================== --- head/net-im/jabber/Makefile Sun Dec 21 11:44:15 2014 (r375156) +++ head/net-im/jabber/Makefile Sun Dec 21 12:14:19 2014 (r375157) @@ -3,7 +3,7 @@ PORTNAME= jabber PORTVERSION= 1.6.1.1 -PORTREVISION= 17 +PORTREVISION= 18 PORTEPOCH= 1 CATEGORIES= net-im ipv6 MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/ @@ -40,23 +40,28 @@ CPPFLAGS+= $$(pth-config --cflags) \ LDFLAGS+= $$(pth-config --ldflags) \ -L${LOCALBASE}/lib -SUB_FILES= pkg-install pkg-deinstall pkg-message +SUB_FILES= pkg-message SUB_LIST= JABBER_USER=${JABBER_USER} \ JABBER_GROUP=${JABBER_GROUP} \ JABBER_ETCDIR="${JABBER_ETCDIR}" \ JABBER_LOGDIR="${JABBER_LOGDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" +PLIST_SUB= JABBER_USER=${JABBER_USER} \ + JABBER_GROUP=${JABBER_GROUP} \ + JABBER_LOGDIR="${JABBER_LOGDIR}" \ + JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ + JABBER_RUNDIR="${JABBER_RUNDIR}" USERS= ${JABBER_USER} GROUPS= ${JABBER_GROUP} JABBER_USER= jabber JABBER_GROUP= jabber -JABBER_ETCDIR= "${PREFIX}/etc" -JABBER_RUNDIR= "/var/run/jabberd" -JABBER_SPOOLDIR="/var/spool/jabberd" -JABBER_LOGDIR= "/var/log/jabberd" +JABBER_ETCDIR= ${PREFIX}/etc +JABBER_RUNDIR= /var/run/jabberd +JABBER_SPOOLDIR=/var/spool/jabberd +JABBER_LOGDIR= /var/log/jabberd .include <bsd.port.options.mk> Modified: head/net-im/jabber/pkg-plist ============================================================================== --- head/net-im/jabber/pkg-plist Sun Dec 21 11:44:15 2014 (r375156) +++ head/net-im/jabber/pkg-plist Sun Dec 21 12:14:19 2014 (r375157) @@ -8,6 +8,7 @@ lib/jabber/libjabberd.so lib/jabber/libjabberd.so.2 lib/jabber/libjabberd.so.2.0.0 lib/jabber/libjabberddialback.so +lib/jabber/libjabberddialback.so.2 lib/jabber/libjabberddialback.so.2.0.0 lib/jabber/libjabberddnsrv.so lib/jabber/libjabberddnsrv.so.2 @@ -44,6 +45,6 @@ share/locale/nl/LC_MESSAGES/jabberd14.mo %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%PORTDOCS%%%%DOCSDIR%%/mysql.sql -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry lib/jabber -@dirrmtry include/jabber +@dir %%JABBER_LOGDIR%% +@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%% +@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_SPOOLDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412211214.sBLCEKMX093173>