Date: Fri, 16 May 2014 18:18:17 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354251 - in head/security/clamav: . files Message-ID: <201405161818.s4GIIH9L007241@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Fri May 16 18:18:16 2014 New Revision: 354251 URL: http://svnweb.freebsd.org/changeset/ports/354251 QAT: https://qat.redports.org/buildarchive/r354251/ Log: . Drop pkg-install and move directories to pkg-plist . Use USERS and GROUPS . Remove old check for FreeBSD > 7.x Deleted: head/security/clamav/files/pkg-install.in Modified: head/security/clamav/Makefile head/security/clamav/pkg-plist Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Fri May 16 18:12:40 2014 (r354250) +++ head/security/clamav/Makefile Fri May 16 18:18:16 2014 (r354251) @@ -58,7 +58,11 @@ PORTDOCS= * DBDIR= /var/db/clamav LOGDIR= /var/log/clamav RUNDIR= /var/run/clamav -PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} +PLIST_SUB+= DBDIR=${DBDIR} \ + LOGDIR=${LOGDIR} \ + RUNDIR=${RUNDIR} \ + CLAMAVUSER=${CLAMAVUSER} \ + CLAMAVGROUP=${CLAMAVGROUP} PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads USE_AUTOTOOLS= libltdl OPTIONS_SUB= yes @@ -90,16 +94,14 @@ CLAMAVGROUP?= clamav CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd.sock CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock -SUB_FILES= pkg-install pkg-deinstall +SUB_FILES= pkg-deinstall SUB_LIST+= DBDIR=${DBDIR} \ LOGDIR=${LOGDIR} \ RUNDIR=${RUNDIR} \ CLAMAVUSER=${CLAMAVUSER} \ CLAMAVGROUP=${CLAMAVGROUP} \ CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \ - CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} \ - CHMOD=${CHMOD} \ - CHOWN=${CHOWN} + CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \ -e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \ @@ -120,6 +122,14 @@ PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ .include <bsd.port.options.mk> +.if ${CLAMAVUSER} == "clamav" +USERS= clamav +.endif + +.if ${CLAMAVGROUP} == "clamav" +GROUPS= clamav mail +.endif + .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) CONFIGURE_ARGS+=--enable-llvm . if ${PORT_OPTIONS:MTESTS} @@ -179,7 +189,7 @@ pre-configure: fi .endif -.if ${PORT_OPTIONS:MTESTS} && ${OSVERSION} >= 700000 +.if ${PORT_OPTIONS:MTESTS} post-build: @if [ ! -f "${PY_NO_THREAD}" ]; then \ ${GMAKE} -C ${WRKSRC} check; \ @@ -188,7 +198,10 @@ post-build: post-install: ${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html + @${MKDIR} ${STAGEDIR}${DOCSDIR}/html \ + ${STAGEDIR}${DBDIR} \ + ${STAGEDIR}${LOGDIR} \ + ${STAGEDIR}${RUNDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html Modified: head/security/clamav/pkg-plist ============================================================================== --- head/security/clamav/pkg-plist Fri May 16 18:12:40 2014 (r354250) +++ head/security/clamav/pkg-plist Fri May 16 18:18:16 2014 (r354251) @@ -37,3 +37,11 @@ man/man8/clamd.8.gz @sample etc/clamd.conf.sample @sample etc/freshclam.conf.sample %%MILTER%%@sample etc/clamav-milter.conf.sample +@cwd / +@owner %%CLAMAVUSER%% +@group %%CLAMAVGROUP%% +@dirrmtry %%DBDIR%% +@dirrmtry %%LOGDIR%% +@dirrmtry %%RUNDIR%% +@group +@owner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405161818.s4GIIH9L007241>