cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Clean up plist user/group/mode handling [1]

Browse Source 
- Add DSPAM_SAMPLE_MODE variable

PR:		203200
Submitted by:	amdmi3 [1]
Approved by:	danny@dannywarren.com (maintainer)
This commit is contained in:
Dmitry Marakasov 2015-09-21 09:47:26 +00:00
parent f7fabd7b2b
commit 38e0554683
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=397481
2 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/dspam/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= dspam PORTNAME= dspam
PORTVERSION= 3.10.2 PORTVERSION= 3.10.2
PORTREVISION= 1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -109,6 +110,7 @@ DSPAM_HOME?= ${_VAR_DIR}/db/dspam
DSPAM_HOME_OWNER?= ${DSPAM_OWNER} DSPAM_HOME_OWNER?= ${DSPAM_OWNER}
DSPAM_HOME_GROUP?= ${DSPAM_GROUP} DSPAM_HOME_GROUP?= ${DSPAM_GROUP}
DSPAM_HOME_MODE?= 0770 DSPAM_HOME_MODE?= 0770
DSPAM_SAMPLE_MODE?= 0640
PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \ PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \
DSPAM_OWNER=${DSPAM_OWNER} \ DSPAM_OWNER=${DSPAM_OWNER} \
@ -116,7 +118,8 @@ PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \
DSPAM_MODE=${DSPAM_MODE} \ DSPAM_MODE=${DSPAM_MODE} \
DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \ DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \ DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
DSPAM_HOME_MODE=${DSPAM_HOME_MODE} DSPAM_HOME_MODE=${DSPAM_HOME_MODE} \
DSPAM_SAMPLE_MODE=${DSPAM_SAMPLE_MODE}
CONFIGURE_ARGS+= --sysconfdir=${DSPAM_ETC} CONFIGURE_ARGS+= --sysconfdir=${DSPAM_ETC}
CONFIGURE_ARGS+= --with-logdir=${LOG_DIR} CONFIGURE_ARGS+= --with-logdir=${LOG_DIR}

39
mail/dspam/pkg-plist
View File

@ -2,15 +2,7 @@
%%HASH%%bin/csscompress %%HASH%%bin/csscompress
%%HASH%%bin/cssconvert %%HASH%%bin/cssconvert
%%HASH%%bin/cssstat %%HASH%%bin/cssstat
@owner %%DSPAM_OWNER%% @(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%,%%DSPAM_MODE%%) bin/dspam
@group %%DSPAM_GROUP%%
@mode %%DSPAM_MODE%%
bin/dspam
@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
@exec chmod %%DSPAM_MODE%% %D/%F
@mode
@group wheel
@owner root
bin/dspamc bin/dspamc
bin/dspam_2sql bin/dspam_2sql
bin/dspam_admin bin/dspam_admin
@ -23,15 +15,7 @@ bin/dspam_notify
%%PGSQL%%bin/dspam_pg2int8 %%PGSQL%%bin/dspam_pg2int8
bin/dspam_stats bin/dspam_stats
bin/dspam_train bin/dspam_train
@mode 0640 @sample(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%,%%DSPAM_SAMPLE_MODE%%) etc/dspam.conf.sample
@owner %%DSPAM_OWNER%%
@group %%DSPAM_GROUP%%
@sample etc/dspam.conf.sample
@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
@exec chmod 0640 %D/%F
@group wheel
@owner root
@mode
include/dspam/buffer.h include/dspam/buffer.h
include/dspam/config.h include/dspam/config.h
include/dspam/config_shared.h include/dspam/config_shared.h
@ -222,17 +206,8 @@ libdata/pkgconfig/dspam.pc
%%WebUI%%%%WWWDIR%%/templates/ro/nav_preferences.html %%WebUI%%%%WWWDIR%%/templates/ro/nav_preferences.html
%%WebUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html %%WebUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html
%%WebUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html %%WebUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html
@cwd %%DSPAM_HOME%% %%DSPAM_HOME%%/firstrun.txt.sample
firstrun.txt.sample %%DSPAM_HOME%%/firstspam.txt.sample
firstspam.txt.sample %%DSPAM_HOME%%/quarantinefull.txt.sample
quarantinefull.txt.sample @dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%%
@cwd / @dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%LOG_DIR%%
@owner %%DSPAM_HOME_OWNER%%
@group %%DSPAM_HOME_GROUP%%
@mode %%DSPAM_HOME_MODE%%
@mode
@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%
@exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%%
@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%%
@group wheel
@owner root