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

[Yamaguchi Hirohisa]

>Number:         151873
>Category:       ports
>Synopsis:       [maintainer] mail/enma fix build under CURRENT and =
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 01 17:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD 9c-test.****.org 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Fri =
Oct 22 09:08:28 JST 2010 =
root at 9c-test.****.org:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	For over a half year, mail/enma does not build under CURRENT.
	=
http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.9.20100319084642/=
enma-1.1.0.log
>How-To-Repeat:
	ommitted
>Fix:

	The patch follows:

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=3D	SF/${PORTNAME}/ENMA/${PORT
 MAINTAINER=3D	umq at ueo.co.jp
 COMMENT=3D	A sender authentication milter supporting SPF and Sender =
ID
=20
-BUILD_DEPENDS=3D	${NONEXISTENT}:${PORTSDIR}/dns/bind95:checksum
+BUILD_DEPENDS=3D	${NONEXISTENT}:${PORTSDIR}/dns/libbind:checksum
=20
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || =
defined(WITH_POSTFIX_CURRENT)
 CONF_SUB=3D	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' =
${WRKSRC}/enma/etc/enma.conf.sample
@@ -24,7 +24,7 @@ RUN_DEPENDS+=3D	${LOCALBASE}/libexec/postf
 .endif
 .endif
=20
-BIND_PATH_CMD=3D	cd ${PORTSDIR}/dns/bind95 && ${MAKE} -V WRKSRC
+BIND_PATH_CMD=3D	cd ${PORTSDIR}/dns/libbind && ${MAKE} -V WRKSRC
 BIND_SRC_DIR=3D	${BASENAME} $$(${BIND_PATH_CMD})
=20
 HAS_CONFIGURE=3D	yes
@@ -32,6 +32,8 @@ CONFIGURE_ARGS+=3D	--prefix=3D${PREFIX} --ma
 			--with-libbind=3D${WRKSRC}/build/tmp_build
 USE_RC_SUBR=3D	milter-enma
 USE_GMAKE=3D	yes
+LICENSE=3D	BSD
+LICENSE_FILE=3D	${WRKSRC}/LICENSE
 MANLANG=3D	"" ja_JP.UTF-8
 MAN1=3D		enma.1
 MANCOMPRESSED=3D	no
@@ -42,10 +44,6 @@ SUB_FILES=3D	milter-enma
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
=20
-.if ${OSVERSION} >=3D 900007
-BROKEN=3D		does not build
-.endif
-
 USE_OPENSSL=3D	yes
 .if ${OSVERSION} < 700000
 WITH_OPENSSL_PORT=3D	yes
@@ -53,9 +51,9 @@ WITH_OPENSSL_PORT=3D	yes
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
=20
 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=3D${WRKSRC}/build/tmp_build =
--enable-threads && ${MAKE} && ${MAKE} install
 	$$(${CONF_SUB})
=20
@@ -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}
=20
 .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>


>Release-Note:
>Audit-Trail:
>Unformatted:
 unbreak