ports/127211: [maintainer] mail/enma compile option fix

[Hirohisa Yamaguchi]

>Number:         127211
>Category:       ports
>Synopsis:       [maintainer] mail/enma compile option fix
>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 Sep 08 15:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #17: Thu Jul 10 06:27:38 JST 2008 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	some changes for mail/enma port:
	 1. the build option for libmilter ``SM_CONF_POLL'' was ignored
	 2. add to CFLAGS ``-DNETINET6'' for libmilter included
	 3. prefer ``mail'' log facility for the default configuration
	 4. add an option for choosing bind version

>How-To-Repeat:
	N/A

>Fix:

	the patch follows:

diff -Npru ports.orig/mail/enma/Makefile ports/mail/enma/Makefile
--- ports.orig/mail/enma/Makefile	2008-09-08 01:05:21.000000000 +0900
+++ ports/mail/enma/Makefile	2008-09-08 23:46:47.000000000 +0900
@@ -7,14 +7,15 @@
 
 PORTNAME=	enma
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	umq at 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=	${BIND_SRC}:${PORTSDIR}/dns/${BIND_VER}:checksum \
+		${SENDMAIL_SRC}:${PORTSDIR}/mail/sendmail: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,8 +26,11 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/postf
 .endif
 .endif
 
-BIND_SRC_CMD=	cd ${PORTSDIR}/dns/bind94 && ${MAKE} -V DISTFILES | ${CUT} -d ' ' -f 1
+BIND_VER?=	bind94
+BIND_SRC_CMD=	cd ${PORTSDIR}/dns/${BIND_VER} && ${MAKE} -V DISTFILES | ${CUT} -d ' ' -f 1
+BIND_SRC=	"${DISTDIR}/$$(${BIND_SRC_CMD})"
 SENDMAIL_SRC_CMD=	cd ${PORTSDIR}/mail/sendmail && make -V DISTFILES
+SENDMAIL_SRC=	"${DISTDIR}/$$(${SENDMAIL_SRC_CMD})"
 
 USE_RC_SUBR=	milter-enma
 USE_GMAKE=	yes
@@ -39,8 +43,8 @@ SUB_FILES=	milter-enma
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${LN} -s ${DISTDIR}/$$(${BIND_SRC_CMD}) ${WRKSRC}/build
-	${LN} -s ${DISTDIR}/$$(${SENDMAIL_SRC_CMD}) ${WRKSRC}/build
+	${LN} -s ${BIND_SRC} ${WRKSRC}/build
+	${LN} -s ${SENDMAIL_SRC} ${WRKSRC}/build
 	$$(${CONF_SUB})
 
 do-build:
diff -Npru ports.orig/mail/enma/files/milter-enma.in ports/mail/enma/files/milter-enma.in
--- ports.orig/mail/enma/files/milter-enma.in	2008-09-08 01:05:21.000000000 +0900
+++ ports/mail/enma/files/milter-enma.in	2008-09-08 23:29:33.000000000 +0900
@@ -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}
+required_files=${milterenma_cfgfile}
 command="%%PREFIX%%/bin/enma"
-command_args="${milterenma_cfgfile}"
+command_args="-c ${milterenma_cfgfile}"
 start_precmd="enma_precmd"
 stop_postcmd="enma_postcmd"
 _piddir=$(dirname ${pidfile})
diff -Npru ports.orig/mail/enma/files/patch-build_site.config.m4.poll-generic ports/mail/enma/files/patch-build_site.config.m4.poll-generic
--- ports.orig/mail/enma/files/patch-build_site.config.m4.poll-generic	1970-01-01 09:00:00.000000000 +0900
+++ ports/mail/enma/files/patch-build_site.config.m4.poll-generic	2008-09-08 22:39:57.000000000 +0900
@@ -0,0 +1,9 @@
+--- ./build/site.config.m4.poll-generic.orig	2008-08-18 14:01:17.000000000 +0900
++++ ./build/site.config.m4.poll-generic	2008-09-08 22:25:57.000000000 +0900
+@@ -11,5 +11,5 @@
+ 
+ APPENDDEF(`confINCDIRS', `-I at prefix@/bind/include')
+ APPENDDEF(`confLIBS', `@prefix@/lib/libbind.a')
+-APPENDDEF(`confENVDIF', `-DSM_CONF_POLL=1')
++APPENDDEF(`confENVDEF', `-DNETINET6 -DSM_CONF_POLL=1')
+ APPENDDEF(`confOPTIMIZE', `-g')
diff -Npru ports.orig/mail/enma/files/patch-enma_etc_enma.conf.sample ports/mail/enma/files/patch-enma_etc_enma.conf.sample
--- ports.orig/mail/enma/files/patch-enma_etc_enma.conf.sample	2008-09-08 01:05:21.000000000 +0900
+++ ports/mail/enma/files/patch-enma_etc_enma.conf.sample	2008-09-08 22:24:34.000000000 +0900
@@ -1,5 +1,5 @@
 --- ./enma/etc/enma.conf.sample.orig	2008-08-08 14:57:14.000000000 +0900
-+++ ./enma/etc/enma.conf.sample	2008-09-07 01:09:31.000000000 +0900
++++ ./enma/etc/enma.conf.sample	2008-09-08 22:23:52.000000000 +0900
 @@ -6,8 +6,8 @@
  
  ## Milter ##
@@ -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
+ 
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: