ports/151873: [maintainer] mail/enma fix build under CURRENT and unbreak

[Hirohisa Yamaguchi]

The patch previously submitted was corrupted.
reattaching it again

At Mon, 1 Nov 2010 17:40:09 GMT,
FreeBSD-gnats-submit at FreeBSD.org wrote:
> http://www.freebsd.org/cgi/query-pr.cgi?pr=151873
> 
> >Category:       ports
> >Responsible:    freebsd-ports-bugs
> >Synopsis:       [maintainer] mail/enma fix build under CURRENT and =
> >Arrival-Date:   Mon Nov 01 17:40:09 UTC 2010

-- 

	Hirohisa Yamaguchi
	  <umq at ueo.co.jp>

diff -Npru ports/mail/enma/Makefile ports.orig/mail/enma/Makefile
--- ports/mail/enma/Makefile	2010-04-19 04:14:55.000000000 +0900
+++ ports.orig/mail/enma/Makefile	2010-10-21 08:29:36.000000000 +0900
@@ -13,7 +13,7 @@ MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORT
 MAINTAINER=	umq at ueo.co.jp
 COMMENT=	A sender authentication milter supporting SPF and Sender ID
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/dns/bind95:checksum
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/dns/libbind: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
@@ -24,7 +24,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/postf
 .endif
 .endif
 
-BIND_PATH_CMD=	cd ${PORTSDIR}/dns/bind95 && ${MAKE} -V WRKSRC
+BIND_PATH_CMD=	cd ${PORTSDIR}/dns/libbind && ${MAKE} -V WRKSRC
 BIND_SRC_DIR=	${BASENAME} $$(${BIND_PATH_CMD})
 
 HAS_CONFIGURE=	yes
@@ -32,6 +32,8 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --ma
 			--with-libbind=${WRKSRC}/build/tmp_build
 USE_RC_SUBR=	milter-enma
 USE_GMAKE=	yes
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
 MANLANG=	"" ja_JP.UTF-8
 MAN1=		enma.1
 MANCOMPRESSED=	no
@@ -42,10 +44,6 @@ SUB_FILES=	milter-enma
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if ${OSVERSION} >= 900007
-BROKEN=		does not build
-.endif
-
 USE_OPENSSL=	yes
 .if ${OSVERSION} < 700000
 WITH_OPENSSL_PORT=	yes
@@ -53,9 +51,9 @@ WITH_OPENSSL_PORT=	yes
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 
 pre-configure:
-	cd ${PORTSDIR}/dns/bind95 && ${MAKE} -DBATCH patch && \
+	cd ${PORTSDIR}/dns/libbind && ${MAKE} -DBATCH patch && \
 	${LN} -s $$(${BIND_PATH_CMD}) ${WRKSRC}/build && \
-	cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/bind && \
+	cd ${WRKSRC}/build/$$(${BIND_SRC_DIR}) && \
 	./configure --prefix=${WRKSRC}/build/tmp_build --enable-threads && ${MAKE} && ${MAKE} install
 	$$(${CONF_SUB})
 
@@ -67,7 +65,7 @@ post-install:
 	${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}
+	@${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 -Npru ports/mail/enma/files/patch-enma_src_addr_util.c ports.orig/mail/enma/files/patch-enma_src_addr_util.c
--- ports/mail/enma/files/patch-enma_src_addr_util.c	1970-01-01 09:00:00.000000000 +0900
+++ ports.orig/mail/enma/files/patch-enma_src_addr_util.c	2010-10-21 09:28:46.000000000 +0900
@@ -0,0 +1,10 @@
+--- ./enma/src/addr_util.c.orig	2009-03-27 15:06:08.000000000 +0900
++++ ./enma/src/addr_util.c	2010-10-21 09:28:43.000000000 +0900
+@@ -18,6 +18,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>