diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile index 80578207e7ae..21d05bdaf492 100644 --- a/security/drweb-sendmail/Makefile +++ b/security/drweb-sendmail/Makefile @@ -16,8 +16,6 @@ MAINTAINER= anton@urc.ac.ru RUN_DEPENDS= ${LOCALBASE}/drweb/drwebd:${PORTSDIR}/security/drweb -IS_INTERACTIVE= yes # require sendmail rebuilding - WRKSRC= ${WRKDIR}/${DISTNAME}/clients/drwebdc MAKEFILE= Makefile.unix @@ -49,9 +47,6 @@ post-extract: cd ${WRKDIR}/${DISTNAME} && ${TAR} -xzf ${WRKDIR}/${DISTNAME}/${DISTNAME}.tar.gz clients/drwebdc clients/sendmail pre-build: - @${CAT} pkg-message - @echo - @read -p "Press Enter to continue or ^C to abort: " x ${MKDIR} ${WRKSRC}/libmilter ${CP} ${FILESDIR}/Makefile ${WRKSRC}/libmilter .if ${SENDMAIL_VERSION} == "8.11.1" @@ -73,7 +68,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/drweb-smf ${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/../sendmail/readme.sendmail ${DOC_DIR} ${INSTALL_DATA} ${WRKSRC}/../sendmail/readme.sendmail.rus ${DOC_DIR} - ${SED} 's#!!PREFIX!!#${PREFIX}#' < ${FILESDIR}/drweb-smf.sh >${WRKSRC}/drweb-smf.sh + ${SED} 's#!!PREFIX!!#${PREFIX}#' < ${FILESDIR}/drweb-smf.sh >${WRKSRC}/drwebsmf.sh ${INSTALL_SCRIPT} ${WRKSRC}/drweb-smf.sh ${PREFIX}/etc/rc.d + @${CAT} pkg-message .include diff --git a/security/drweb-sendmail/files/Makefile b/security/drweb-sendmail/files/Makefile index 7a596c37c349..b891e9bc2b9d 100644 --- a/security/drweb-sendmail/files/Makefile +++ b/security/drweb-sendmail/files/Makefile @@ -4,7 +4,7 @@ SENDMAIL_DIR=/usr/src/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libmilter CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL +CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL -D_FFR_MILTER=1 # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} diff --git a/security/drweb-sendmail/pkg-plist b/security/drweb-sendmail/pkg-plist index 93f0bd494ea8..aca60561952f 100644 --- a/security/drweb-sendmail/pkg-plist +++ b/security/drweb-sendmail/pkg-plist @@ -1,4 +1,4 @@ -etc/rc.d/drweb-smf.sh +etc/rc.d/drwebsmf.sh sbin/drweb-smf share/doc/drweb-sendmail/readme.sendmail share/doc/drweb-sendmail/readme.sendmail.rus