Fri May 28 07:26:48 2010 UTC ()
Create required directory in pre-start stage,
/var/run may be cleared at boot.


(obache)
diff -r1.5 -r1.6 pkgsrc/mail/enma/Makefile
diff -r1.2 -r1.3 pkgsrc/mail/enma/files/enma.sh
cvs diff -r1.5 -r1.6 pkgsrc/mail/enma/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/enma/Makefile 2010/05/16 00:46:34 1.5
+++ pkgsrc/mail/enma/Makefile 2010/05/28 07:26:48 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2010/05/16 00:46:34 obache Exp $ 1# $NetBSD: Makefile,v 1.6 2010/05/28 07:26:48 obache Exp $
2# 2#
3 3
4DISTNAME= enma-1.1.0 4DISTNAME= enma-1.1.0
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enma/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enma/}
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://enma.sourceforge.net/ 10HOMEPAGE= http://enma.sourceforge.net/
11COMMENT= Sender authentication milter supporting SPF and Sender ID 11COMMENT= Sender authentication milter supporting SPF and Sender ID
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
@@ -39,26 +39,29 @@ PKG_USERS= ${ENMA_USER}:${ENMA_GROUP} @@ -39,26 +39,29 @@ PKG_USERS= ${ENMA_USER}:${ENMA_GROUP}
39 39
40SUBST_CLASSES+= varbase 40SUBST_CLASSES+= varbase
41SUBST_STAGE.varbase= post-configure 41SUBST_STAGE.varbase= post-configure
42SUBST_FILES.varbase= enma/etc/enma.conf.sample 42SUBST_FILES.varbase= enma/etc/enma.conf.sample
43SUBST_FILES.varbase+= enma/man/enma.1 enma/man/enma.ja.1 43SUBST_FILES.varbase+= enma/man/enma.1 enma/man/enma.ja.1
44SUBST_FILES.varbase+= enma/src/enma_config.c 44SUBST_FILES.varbase+= enma/src/enma_config.c
45SUBST_SED.varbase= -e 's;/var/;${VARBASE}/;g' 45SUBST_SED.varbase= -e 's;/var/;${VARBASE}/;g'
46 46
47SUBST_CLASSES+= daemon 47SUBST_CLASSES+= daemon
48SUBST_STAGE.daemon= post-configure 48SUBST_STAGE.daemon= post-configure
49SUBST_FILES.daemon= enma/etc/enma.conf.sample 49SUBST_FILES.daemon= enma/etc/enma.conf.sample
50SUBST_SED.daemon= -e 's;daemon;${ENMA_USER};g' 50SUBST_SED.daemon= -e 's;daemon;${ENMA_USER};g'
51 51
 52FILES_SUBST+= ENMA_USER=${ENMA_USER:Q}
 53FILES_SUBST+= ENMA_GROUP=${ENMA_GROUP:Q}
 54
52OWN_DIRS_PERMS+= ${VARBASE}/run/enma ${ENMA_USER} ${ENMA_GROUP} 0700 55OWN_DIRS_PERMS+= ${VARBASE}/run/enma ${ENMA_USER} ${ENMA_GROUP} 0700
53 56
54INSTALLATION_DIRS+= share/examples/enma 57INSTALLATION_DIRS+= share/examples/enma
55 58
56post-install: 59post-install:
57 ${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample \ 60 ${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample \
58 ${DESTDIR}${PREFIX}/share/examples/enma/enma.conf.sample 61 ${DESTDIR}${PREFIX}/share/examples/enma/enma.conf.sample
59 62
60.include "../../mail/libmilter/buildlink3.mk" 63.include "../../mail/libmilter/buildlink3.mk"
61.include "../../net/libbind/buildlink3.mk" 64.include "../../net/libbind/buildlink3.mk"
62.include "../../security/openssl/buildlink3.mk" 65.include "../../security/openssl/buildlink3.mk"
63.include "../../mk/pthread.buildlink3.mk" 66.include "../../mk/pthread.buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/mail/enma/files/enma.sh (expand / switch to unified diff)

--- pkgsrc/mail/enma/files/enma.sh 2009/04/09 02:25:37 1.2
+++ pkgsrc/mail/enma/files/enma.sh 2010/05/28 07:26:48 1.3
@@ -1,19 +1,31 @@ @@ -1,19 +1,31 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: enma.sh,v 1.2 2009/04/09 02:25:37 obache Exp $ 3# $NetBSD: enma.sh,v 1.3 2010/05/28 07:26:48 obache Exp $
4# 4#
5# PROVIDE: enma 5# PROVIDE: enma
6# REQUIRE: NETWORK 6# REQUIRE: NETWORK
7# 7#
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="enma" 11name="enma"
12rcvar=${name} 12rcvar=${name}
13command="@PREFIX@/libexec/enma" 13command="@PREFIX@/libexec/enma"
14pidfile="@VARBASE@/run/enma/${name}.pid" 14pidfile="@VARBASE@/run/enma/${name}.pid"
15required_files="@PKG_SYSCONFDIR@/enma.conf" 15required_files="@PKG_SYSCONFDIR@/enma.conf"
16command_args="-c @PKG_SYSCONFDIR@/enma.conf" 16command_args="-c @PKG_SYSCONFDIR@/enma.conf"
17 17
 18start_precmd="${name}_prestart"
 19
 20enma_prestart()
 21{
 22 if [ ! -d @VARBASE@/run/enma ]; then
 23 @MKDIR@ @VARBASE@/run/enma
 24 @CHOWN@ @ENMA_USER@ @VARBASE@/run/enma
 25 @CHGRP@ @ENMA_GROUP@ @VARBASE@/run/enma
 26 @CHMOD@ 0700 @VARBASE@/run/enma
 27 fi
 28}
 29
18load_rc_config ${name} 30load_rc_config ${name}
19run_rc_command "$1" 31run_rc_command "$1"