From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 1 22:32:16 2010 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC64D106566C for ; Mon, 1 Nov 2010 22:32:16 +0000 (UTC) (envelope-from umq@ueo.co.jp) Received: from msa03a.plala.or.jp (msa03.plala.or.jp [58.93.240.3]) by mx1.freebsd.org (Postfix) with ESMTP id 594C48FC13 for ; Mon, 1 Nov 2010 22:32:16 +0000 (UTC) Received: from terpsichore.kaumoge.org ([114.188.33.149]) by msa01b.plala.or.jp with ESMTP id <20101101222355.QTSP1037.msa01b.plala.or.jp@terpsichore.kaumoge.org>; Tue, 2 Nov 2010 07:23:55 +0900 Received: from 9c-test.kaumoge.org (dhcp132.kaumoge.org [192.168.24.132]) by terpsichore.kaumoge.org (8.14.3/8.14.2/20080818) with ESMTP id oA1MNsBT066983; Tue, 2 Nov 2010 07:23:54 +0900 (JST) (envelope-from umq@ueo.co.jp) Date: Tue, 02 Nov 2010 07:23:54 +0900 Message-ID: <86iq0gznr9.wl%umq@ueo.co.jp> From: Hirohisa Yamaguchi To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org In-Reply-To: <201011011740.oA1He9Y7027503@freefall.freebsd.org> User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29qGyQoRCtXGyhC?=) APEL/10.8 Emacs/23.2 (amd64-portbld-freebsd9.0) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-VirusScan: Outbound; msa01b; Tue, 2 Nov 2010 07:23:55 +0900 Cc: Subject: Re: ports/151873: [maintainer] mail/enma fix build under CURRENT and unbreak X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2010 22:32:16 -0000 The patch previously submitted was corrupted. reattaching it again At Mon, 1 Nov 2010 17:40:09 GMT, FreeBSD-gnats-submit@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 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@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 .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 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 + #include + #include ++#include + #include + #include + #include