5 files changed, 35 insertions, 43 deletions
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 5db860fa9520..16410230739a 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	enma
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.0
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	A sender authentication milter supporting SPF and Sender ID
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/dns/bind94:fetch \
-		${NONEXISTENT}:${PORTSDIR}/mail/sendmail:fetch
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/dns/bind95:checksum
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 CONF_SUB=	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' ${WRKSRC}/enma/etc/enma.conf.sample
@@ -25,36 +24,43 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
 .endif
 .endif
 
-BIND_SRC_CMD=	cd ${PORTSDIR}/dns/bind94 && ${MAKE} -V DISTFILES | ${CUT} -d ' ' -f 1
-SENDMAIL_SRC_CMD=	cd ${PORTSDIR}/mail/sendmail && make -V DISTFILES
+BIND_PATH_CMD=	cd ${PORTSDIR}/dns/bind95 && ${MAKE} -V WRKSRC
+BIND_SRC_DIR=	${BASENAME} $$(${BIND_PATH_CMD})
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/man \
+			--with-libbind=${WRKSRC}/build/tmp_build
+USE_OPENSSL=	yes
 USE_RC_SUBR=	milter-enma
 USE_GMAKE=	yes
+MANLANG=	"" ja_JP.UTF-8
 MAN1=		enma.1
 MANCOMPRESSED=	no
-PLIST_FILES=	bin/enma bin/sidfquery etc/enma.conf.sample
+PLIST_FILES=	libexec/enma bin/sidfquery etc/enma.conf.sample
 PORTDOCS=	ChangeLog INSTALL LICENSE README TODO
 SUB_FILES=	milter-enma
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
+CONFIGURE_ARGS+=	--with-libmilter=${MILTERBASE} \
+			--with-ssl=${OPENSSLBASE}
 
 pre-configure:
-	${LN} -s ${DISTDIR}/$$(${BIND_SRC_CMD}) ${WRKSRC}/build
-	${LN} -s ${DISTDIR}/$$(${SENDMAIL_SRC_CMD}) ${WRKSRC}/build
+	cd ${PORTSDIR}/dns/bind95 && ${MAKE} -DBATCH patch && \
+	${LN} -s $$(${BIND_PATH_CMD}) ${WRKSRC}/build && \
+	cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/bind && \
+	./configure --prefix=${WRKSRC}/build/tmp_build --enable-threads && ${MAKE} && ${MAKE} install
 	$$(${CONF_SUB})
 
-do-build:
-	cd ${WRKSRC}/build && ./build_all.sh --prefix=${PREFIX}
-
-do-install:
-	cd ${WRKSRC}/build && ./build_all.sh install
-
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample ${PREFIX}/etc
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
+	@${ECHO_CMD} "@unexec rmdir %D/man/ja_JP.UTF-8/man1 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/man/ja_JP.UTF-8 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/mail/enma/distinfo b/mail/enma/distinfo
index b5908fb32d5f..d693c848504f 100644
--- a/mail/enma/distinfo
+++ b/mail/enma/distinfo
@@ -1,3 +1,3 @@
-MD5 (enma-1.0.0.tar.gz) = d447cb470176cf0f1c7599ade11af404
-SHA256 (enma-1.0.0.tar.gz) = facfb7dcad5d3a8eb1ad33cdb936828b6b4358e2b11cbb5cdbb4224b803ead92
-SIZE (enma-1.0.0.tar.gz) = 161566
+MD5 (enma-1.1.0.tar.gz) = 445c8b0bd45793b542c9cf454865a8a4
+SHA256 (enma-1.1.0.tar.gz) = d56cebe60bb7af9560381c7bbf3712375e7e0ebcf0483005800a0e15dd92ef18
+SIZE (enma-1.1.0.tar.gz) = 238176
diff --git a/mail/enma/files/milter-enma.in b/mail/enma/files/milter-enma.in
index 488c02ee0ba9..b56f11a046ab 100644
--- a/mail/enma/files/milter-enma.in
+++ b/mail/enma/files/milter-enma.in
@@ -33,15 +33,10 @@ rcvar=`set_rcvar`
 
 load_rc_config $name
 
-if [ -f "${milterenma_cfgfile}" ];then
-    milterenma_cfgfile="-c ${milterenma_cfgfile}"
-else
-    echo "milterenma_cfgfile is not correctly set"
-    exit 1
-fi
 pidfile=${milterenma_pid}
-command="%%PREFIX%%/bin/enma"
-command_args="${milterenma_cfgfile}"
+required_files=${milterenma_cfgfile}
+command="%%PREFIX%%/libexec/enma"
+command_args="-c ${milterenma_cfgfile}"
 start_precmd="enma_precmd"
 stop_postcmd="enma_postcmd"
 _piddir=$(dirname ${pidfile})
diff --git a/mail/enma/files/patch-build_build_all.sh b/mail/enma/files/patch-build_build_all.sh
deleted file mode 100644
index f247a783eb2a..000000000000
--- a/mail/enma/files/patch-build_build_all.sh
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./build/build_all.sh.orig	2008-08-26 15:14:49.000000000 +0900
-+++ ./build/build_all.sh	2008-09-07 01:09:10.000000000 +0900
-@@ -100,6 +100,7 @@
-         ./configure \
-             --prefix=${WORK}/tmp_install \
-             --enable-threads \
-+            --mandir=${PREFIX}/man \
-             ${CONFIGURE_OPTION} && \
-         ${MAKE_CMD} && \
-         ${MAKE_CMD} install
-@@ -135,6 +136,7 @@
-         cd ../ && \
-         ./configure \
-             --prefix=${PREFIX} \
-+            --mandir=${PREFIX}/man \
-             --with-libmilter=${WORK}/tmp_install \
-             --with-libbind=${WORK}/tmp_install \
-             ${CONFIGURE_OPTION} && \
diff --git a/mail/enma/files/patch-enma_etc_enma.conf.sample b/mail/enma/files/patch-enma_etc_enma.conf.sample
index 28b2ca490fbc..852edb401945 100644
--- a/mail/enma/files/patch-enma_etc_enma.conf.sample
+++ b/mail/enma/files/patch-enma_etc_enma.conf.sample
@@ -11,3 +11,12 @@
  milter.chdir:   /var/tmp
  milter.timeout: 7210
  milter.loglevel:   0
+@@ -16,7 +16,7 @@
+
+ ## Syslog ##
+ syslog.ident:       enma
+-syslog.facility:    local4
++syslog.facility:    mail
+ syslog.logmask:     info
+
+