diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2006-11-07 20:20:10 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2006-11-07 20:20:10 +0000 |
| commit | dcf156d45f3eb05494a600243bc0b02e386f1ded (patch) | |
| tree | e0e9e3ae416745bacc5feb4af7a13644cf06accc /mail/dk-milter | |
| parent | 6381cc03ddcd5ce58bfed3f31c77646082a1d216 (diff) | |
| download | ports-dcf156d45f3eb05494a600243bc0b02e386f1ded.tar.gz ports-dcf156d45f3eb05494a600243bc0b02e386f1ded.zip | |
Install gentxt as gentxt-dk
Use "mailnull" as default user
Always chown piddir
Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp>
Notes
Notes:
svn path=/head/; revision=176743
Diffstat (limited to 'mail/dk-milter')
| -rw-r--r-- | mail/dk-milter/Makefile | 2 | ||||
| -rw-r--r-- | mail/dk-milter/files/milter-dk.sh.in | 7 | ||||
| -rw-r--r-- | mail/dk-milter/pkg-install | 18 | ||||
| -rw-r--r-- | mail/dk-milter/pkg-plist | 2 |
4 files changed, 5 insertions, 24 deletions
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 31ec43478d55..91a7ed428912 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -78,7 +78,7 @@ pre-configure: post-install: -${STRIP_CMD} ${PREFIX}/libexec/dk-filter ${INSTALL_SCRIPT} ${WRKSRC}/dk-filter/gentxt.csh \ - ${PREFIX}/sbin/gentxt + ${PREFIX}/sbin/gentxt-dk .for i in ${MAN8} @${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz ${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/ diff --git a/mail/dk-milter/files/milter-dk.sh.in b/mail/dk-milter/files/milter-dk.sh.in index f4aa86b539ac..0f7b2ff1ffd0 100644 --- a/mail/dk-milter/files/milter-dk.sh.in +++ b/mail/dk-milter/files/milter-dk.sh.in @@ -38,7 +38,7 @@ load_rc_config $name # DO NOT CHANGE THESE DEFAULT VALUES HERE # milterdk_enable=${milterdk_enable:-"NO"} -milterdk_uid=${milterdk_uid:-"dkfilter"} +milterdk_uid=${milterdk_uid:-"mailnull"} milterdk_profiles=${milterdk_profiles:-} milterdk_socket=${milterdk_socket:-"unix:/var/run/milterdk/filter"} milterdk_domain=${milterdk_domain:-"example.com"} @@ -100,10 +100,9 @@ dk_prepcmd () elif [ -S ${milterdk_socket##unix:} ] ; then rm -f ${milterdk_socket##unix:} fi - if [ -d ${_piddir} ] ; then - return; + if [ ! -d ${_piddir} ] ; then + mkdir -p ${_piddir} fi - mkdir -p ${_piddir} if [ -n "${milterdk_uid}" ] ; then chown ${milterdk_uid} ${_piddir} fi diff --git a/mail/dk-milter/pkg-install b/mail/dk-milter/pkg-install deleted file mode 100644 index 7fa7126c99e8..000000000000 --- a/mail/dk-milter/pkg-install +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ] -then - exit 0; -fi - -# check if dkfilter user exists -pw user show dkfilter > /dev/null 2>&1 - -if [ $? != 0 ] -then - echo "===> Adding user dkfilter" - pw useradd dkfilter -c "milter-dk" -s /sbin/nologin \ - -d /nonexistent -else - echo "===> Using existing user dkfilter" -fi diff --git a/mail/dk-milter/pkg-plist b/mail/dk-milter/pkg-plist index 7dad930eefde..e6cf82c79cbc 100644 --- a/mail/dk-milter/pkg-plist +++ b/mail/dk-milter/pkg-plist @@ -1,5 +1,5 @@ libexec/dk-filter -sbin/gentxt +sbin/gentxt-dk %%PORTDOCS%%%%DOCSDIR%%/FEATURES %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS |