ports/164664: [maintainer] mail/enma update to 1.2.0
Hirohisa Yamaguchi
umq at ueo.co.jp
Tue Jan 31 14:10:11 UTC 2012
>Number: 164664
>Category: ports
>Synopsis: [maintainer] mail/enma update to 1.2.0
>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: Tue Jan 31 14:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Hirohisa Yamaguchi
>Release: FreeBSD 8.1-RELEASE amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
The new version of mail/enma 1.2.0 is now available.
Release-announcement: http://sourceforge.net/mailarchive/message.php?msg_id=28763140
>How-To-Repeat:
N/A
>Fix:
The patch follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/enma/Makefile,v
retrieving revision 1.9
diff -p -u -r1.9 Makefile
--- Makefile 22 Feb 2011 15:02:08 -0000 1.9
+++ Makefile 31 Jan 2012 13:21:20 -0000
@@ -6,63 +6,58 @@
#
PORTNAME= enma
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/ENMA/${PORTVERSION}
MAINTAINER= umq at ueo.co.jp
COMMENT= A sender authentication milter supporting SPF and Sender ID
-BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/dns/bind97: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
-.if defined(WITH_POSTFIX_CURRENT)
-RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
-.else
-RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
-.endif
-.endif
+LICENSE= BSD
+LICENSE_FILE= ${WRKSRC}/LICENSE
-BIND_PATH_CMD= cd ${PORTSDIR}/dns/bind97 && ${MAKE} -V WRKSRC
-BIND_SRC_DIR= ${BASENAME} $$(${BIND_PATH_CMD})
+OPTIONS = \
+ LIBBIND "Link against dns/libbind instead of dns/ldns" Off
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/man \
- --with-libbind=${WRKSRC}/build/tmp_build
+ --with-ssl-incdir=${OPENSSLINC} --with-ssl-libdir=${OPENSSLLIB}
USE_RC_SUBR= milter-enma
USE_GMAKE= yes
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
USE_PERL5_BUILD=yes
-LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/LICENSE
MANLANG= "" ja_JP.UTF-8
MAN1= enma.1
MANCOMPRESSED= no
-PLIST_FILES= libexec/enma bin/sidfquery etc/enma.conf.sample
-PORTDOCS= ChangeLog INSTALL LICENSE README TODO
+PLIST_FILES= bin/sidfquery etc/enma.conf.sample lib/libsauth.a lib/libsauth.la \
+ lib/libsauth.so lib/libsauth.so.0 libexec/enma
+PORTDOCS= ChangeLog INSTALL LICENSE README
SUB_FILES= milter-enma
+.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
+. if defined(WITH_POSTFIX_CURRENT)
+RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
+. else
+RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
+. endif
+.endif
+
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
-USE_OPENSSL= yes
-.if ${OSVERSION} < 700000
-WITH_OPENSSL_PORT= yes
+.if defined(WITH_LIBBIND)
+CONFIGURE_ARGS+= --with-resolver=libbind \
+ --with-libbind-incdir=${LOCALBASE}/include/bind \
+ --with-libbind-libdir=${LOCALBASE}/lib
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libbind.a:${PORTSDIR}/dns/libbind
+.else
+CONFIGURE_ARGS+= --with-resolver=ldns
+LIB_DEPENDS+= ldns.1:${PORTSDIR}/dns/ldns
.endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
pre-configure:
- cd ${PORTSDIR}/dns/bind97 && ${MAKE} -DBATCH patch && \
- ${LN} -s $$(${BIND_PATH_CMD}) ${WRKSRC}/build && \
- cd ${WRKSRC}/build/$$(${BIND_SRC_DIR}) && \
- ./configure --prefix=${WRKSRC}/build/tmp_build --enable-threads && \
- cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/dns && \
- ${MAKE} include/dns/enumtype.h include/dns/enumclass.h && \
- cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/bind9 && \
- ${MAKE} && ${MAKE} install
- ${REINPLACE_CMD} -e 's/-lbind/-lbind9/' ${WRKSRC}/configure \
- ${WRKSRC}/enma/bin/Makefile.in ${WRKSRC}/enma/src/Makefile.in
$$(${CONF_SUB})
post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/enma/distinfo,v
retrieving revision 1.3
diff -p -u -r1.3 distinfo
--- distinfo 3 Jul 2011 13:52:49 -0000 1.3
+++ distinfo 31 Jan 2012 13:21:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (enma-1.1.0.tar.gz) = d56cebe60bb7af9560381c7bbf3712375e7e0ebcf0483005800a0e15dd92ef18
-SIZE (enma-1.1.0.tar.gz) = 238176
+SHA256 (enma-1.2.0.tar.gz) = 34a07a8929498c67285a1af550b7e49cd4765f18dbe300edb98772cefe53a308
+SIZE (enma-1.2.0.tar.gz) = 411233
Index: files/patch-enma_etc_enma.conf.sample
===================================================================
RCS file: /home/ncvs/ports/mail/enma/files/patch-enma_etc_enma.conf.sample,v
retrieving revision 1.2
diff -p -u -r1.2 patch-enma_etc_enma.conf.sample
--- files/patch-enma_etc_enma.conf.sample 14 May 2009 12:47:06 -0000 1.2
+++ files/patch-enma_etc_enma.conf.sample 31 Jan 2012 13:21:20 -0000
@@ -11,12 +11,3 @@
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
-
-
Index: files/patch-enma_src_addr_util.c
===================================================================
RCS file: files/patch-enma_src_addr_util.c
diff -N files/patch-enma_src_addr_util.c
--- files/patch-enma_src_addr_util.c 1 Nov 2010 23:15:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- ./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:
More information about the freebsd-ports-bugs
mailing list