diff options
| author | antoine <antoine@FreeBSD.org> | 2014-11-22 19:35:03 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-11-22 19:35:03 +0800 |
| commit | 851ca39770675f5fae40abd67c89d3dc068684e9 (patch) | |
| tree | 1fdea050cec88e197ed58541146b0d172de7e942 | |
| parent | 7ffdbf3758222b98484c158e3b642050c73d0f61 (diff) | |
| download | freebsd-ports-gnome-851ca39770675f5fae40abd67c89d3dc068684e9.tar.gz freebsd-ports-gnome-851ca39770675f5fae40abd67c89d3dc068684e9.tar.zst freebsd-ports-gnome-851ca39770675f5fae40abd67c89d3dc068684e9.zip | |
- Fix substitution in rc script
- Allow staging as a regular user
- Cleanup plist
| -rw-r--r-- | www/c-icap/Makefile | 5 | ||||
| -rw-r--r-- | www/c-icap/pkg-plist | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index a4dea4d1446e..12f571e12c7a 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -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> diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist index a6386f631fea..99b0335fab22 100644 --- a/www/c-icap/pkg-plist +++ b/www/c-icap/pkg-plist @@ -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%% |