Date: Sat, 22 Nov 2014 11:35:04 +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: r373048 - head/www/c-icap Message-ID: <201411221135.sAMBZ4b4012521@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Nov 22 11:35:03 2014 New Revision: 373048 URL: https://svnweb.freebsd.org/changeset/ports/373048 QAT: https://qat.redports.org/buildarchive/r373048/ Log: - Fix substitution in rc script - Allow staging as a regular user - Cleanup plist Modified: head/www/c-icap/Makefile head/www/c-icap/pkg-plist Modified: head/www/c-icap/Makefile ============================================================================== --- head/www/c-icap/Makefile Sat Nov 22 10:51:58 2014 (r373047) +++ head/www/c-icap/Makefile Sat Nov 22 11:35:03 2014 (r373048) @@ -3,7 +3,7 @@ PORTNAME= c-icap PORTVERSION= 0.3.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.x/ @@ -95,6 +95,7 @@ LOG_DIR= /var/log/c-icap RUN_DIR= /var/run/c-icap PLIST_SUB+= LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR} \ CICAP_USER=${CICAP_USER} CICAP_GROUP=${CICAP_GROUP} +SUB_LIST+= RUN_DIR=${RUN_DIR} CICAP_USER=${CICAP_USER} post-patch: @${REINPLACE_CMD} \ @@ -112,7 +113,5 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}/${LOG_DIR} ${STAGEDIR}/${RUN_DIR} - @${CHOWN} ${CICAP_USER}:${CICAP_GROUP} \ - ${STAGEDIR}/${LOG_DIR} ${STAGEDIR}/${RUN_DIR} .include <bsd.port.mk> Modified: head/www/c-icap/pkg-plist ============================================================================== --- head/www/c-icap/pkg-plist Sat Nov 22 10:51:58 2014 (r373047) +++ head/www/c-icap/pkg-plist Sat Nov 22 11:35:03 2014 (r373048) @@ -39,7 +39,6 @@ include/c_icap/txtTemplate.h include/c_icap/txt_format.h include/c_icap/types_ops.h include/c_icap/util.h -@dirrm include/c_icap %%BDB%%lib/c_icap/bdb_tables.so lib/c_icap/dnsbl_tables.so %%LDAP%%lib/c_icap/ldap_module.so @@ -47,7 +46,6 @@ lib/c_icap/dnsbl_tables.so lib/c_icap/srv_echo.so lib/c_icap/srv_ex206.so lib/c_icap/sys_logger.so -@dirrm lib/c_icap lib/libicapapi.so lib/libicapapi.so.3 lib/libicapapi.so.3.0.5 @@ -57,8 +55,5 @@ man/man8/c-icap-libicapapi-config.8.gz man/man8/c-icap-mkbdb.8.gz man/man8/c-icap-stretch.8.gz man/man8/c-icap.8.gz -@dirrmtry etc/c-icap -@cwd / -@exec chown %%CICAP_USER%%:%%CICAP_GROUP%% %%RUN_DIR%% %%LOG_DIR%% -@dirrmtry %%RUN_DIR%% -@dirrmtry %%LOG_DIR%% +@dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%RUN_DIR%% +@dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%LOG_DIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411221135.sAMBZ4b4012521>