Date: Wed, 13 May 2009 11:10:02 GMT From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/134465: [PATCH] mail/enma: update to 1.1.0 Message-ID: <200905131110.n4DBA2af066908@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/134465; it has been noted by GNATS.
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: bug-followup@FreeBSD.ORG, daisuke@kotachi.com
Cc:
Subject: Re: ports/134465: [PATCH] mail/enma: update to 1.1.0
Date: Wed, 13 May 2009 20:00:00 +0900
--Multipart_Wed_May_13_20:00:00_2009-2
Content-Type: multipart/signed;
boundary="pgp-sign-Multipart_Wed_May_13_20:00:00_2009-1"; micalg=pgp-sha1;
protocol="application/pgp-signature"
Content-Transfer-Encoding: 7bit
--pgp-sign-Multipart_Wed_May_13_20:00:00_2009-1
Content-Type: multipart/mixed;
boundary="Multipart_Wed_May_13_20:00:00_2009-1"
--Multipart_Wed_May_13_20:00:00_2009-1
Content-Type: text/plain; charset=US-ASCII
Hi,
the patch I previously sent lacks CONF_SUB line(i.e. any of
WITH_POSTFIX_* knobs does not affect enma.conf.sample).
Though it is not serious problem, I prefer attached one.
Regards,
--
Hirohisa Yamaguchi
umq@ueo.co.jp
--Multipart_Wed_May_13_20:00:00_2009-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="enma-1.1.0.patch"
Content-Transfer-Encoding: 7bit
diff -Nrpu 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 2009-05-12 08:14:33.000000000 +0900
@@ -6,15 +6,14 @@
#
PORTNAME= enma
-PORTVERSION= 1.0.0
+PORTVERSION= 1.1.0
CATEGORIES= mail
MASTER_SITES= SF
MAINTAINER= umq@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= ${NONEXISTENT}:${PORTSDIR}/dns/bind95: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,31 +24,36 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/postf
.endif
.endif
-BIND_SRC_CMD= cd ${PORTSDIR}/dns/bind94 && ${MAKE} -V DISTFILES | ${CUT} -d ' ' -f 1
-SENDMAIL_SRC_CMD= cd ${PORTSDIR}/mail/sendmail && make -V DISTFILES
+BIND_PATH_CMD= cd ${PORTSDIR}/dns/bind95 && ${MAKE} -V WRKSRC
+BIND_SRC_DIR= ${BASENAME} $$(${BIND_PATH_CMD})
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/man \
+ --with-libbind=${WRKSRC}/build/tmp_build
+USE_OPENSSL= yes
USE_RC_SUBR= milter-enma
USE_GMAKE= yes
+MANLANG= "" ja_JP.UTF-8
MAN1= enma.1
MANCOMPRESSED= no
-PLIST_FILES= bin/enma bin/sidfquery etc/enma.conf.sample
+PLIST_FILES= libexec/enma bin/sidfquery etc/enma.conf.sample
PORTDOCS= ChangeLog INSTALL LICENSE README TODO
SUB_FILES= milter-enma
.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
+CONFIGURE_ARGS+= --with-libmilter=${MILTERBASE} \
+ --with-ssl=${OPENSSLBASE}
pre-configure:
- ${LN} -s ${DISTDIR}/$$(${BIND_SRC_CMD}) ${WRKSRC}/build
- ${LN} -s ${DISTDIR}/$$(${SENDMAIL_SRC_CMD}) ${WRKSRC}/build
+ cd ${PORTSDIR}/dns/bind95 && ${MAKE} -DBATCH patch && \
+ ${LN} -s $$(${BIND_PATH_CMD}) ${WRKSRC}/build && \
+ cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/bind && \
+ ./configure --prefix=${WRKSRC}/build/tmp_build --enable-threads && ${MAKE} && ${MAKE} install
$$(${CONF_SUB})
-do-build:
- cd ${WRKSRC}/build && ./build_all.sh --prefix=${PREFIX}
-
-do-install:
- cd ${WRKSRC}/build && ./build_all.sh install
-
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample ${PREFIX}/etc
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
diff -Nrpu ports.orig/mail/enma/distinfo ports/mail/enma/distinfo
--- ports.orig/mail/enma/distinfo 2008-09-08 01:05:21.000000000 +0900
+++ ports/mail/enma/distinfo 2009-04-03 21:41:48.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (enma-1.0.0.tar.gz) = d447cb470176cf0f1c7599ade11af404
-SHA256 (enma-1.0.0.tar.gz) = facfb7dcad5d3a8eb1ad33cdb936828b6b4358e2b11cbb5cdbb4224b803ead92
-SIZE (enma-1.0.0.tar.gz) = 161566
+MD5 (enma-1.1.0.tar.gz) = 445c8b0bd45793b542c9cf454865a8a4
+SHA256 (enma-1.1.0.tar.gz) = d56cebe60bb7af9560381c7bbf3712375e7e0ebcf0483005800a0e15dd92ef18
+SIZE (enma-1.1.0.tar.gz) = 238176
diff -Nrpu 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 2009-05-12 08:02:14.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}
-command="%%PREFIX%%/bin/enma"
-command_args="${milterenma_cfgfile}"
+required_files=${milterenma_cfgfile}
+command="%%PREFIX%%/libexec/enma"
+command_args="-c ${milterenma_cfgfile}"
start_precmd="enma_precmd"
stop_postcmd="enma_postcmd"
_piddir=$(dirname ${pidfile})
diff -Nrpu ports.orig/mail/enma/files/patch-build_build_all.sh ports/mail/enma/files/patch-build_build_all.sh
--- ports.orig/mail/enma/files/patch-build_build_all.sh 2008-09-08 01:05:21.000000000 +0900
+++ ports/mail/enma/files/patch-build_build_all.sh 1970-01-01 09:00:00.000000000 +0900
@@ -1,18 +0,0 @@
---- ./build/build_all.sh.orig 2008-08-26 15:14:49.000000000 +0900
-+++ ./build/build_all.sh 2008-09-07 01:09:10.000000000 +0900
-@@ -100,6 +100,7 @@
- ./configure \
- --prefix=${WORK}/tmp_install \
- --enable-threads \
-+ --mandir=${PREFIX}/man \
- ${CONFIGURE_OPTION} && \
- ${MAKE_CMD} && \
- ${MAKE_CMD} install
-@@ -135,6 +136,7 @@
- cd ../ && \
- ./configure \
- --prefix=${PREFIX} \
-+ --mandir=${PREFIX}/man \
- --with-libmilter=${WORK}/tmp_install \
- --with-libbind=${WORK}/tmp_install \
- ${CONFIGURE_OPTION} && \
diff -Nrpu 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
+
+
--Multipart_Wed_May_13_20:00:00_2009-1--
--pgp-sign-Multipart_Wed_May_13_20:00:00_2009-1
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
Content-Description: OpenPGP Digital Signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (FreeBSD)
iQEcBAABAgAGBQJKCqgwAAoJEML/cja+Xi6+6yAH/15MZEUWBM5ZDU35XydaO1D4
6EFc2XRsZ4U1RX0JxjWNwNuLn4kjDfYK+jICeHzmnQL8I563tnzB4OV0CBZPJ9iy
NewpeymigqjKpFTf9qgLC9cZbThdY5HN/wN5ExBuWTf+gfAScncUmAo9Y4J30lBc
fXCSU3CsHcqSSeafzBp8GD7cgdLQI6+M2tl1qk6O7cTNYjlZHWfO8C7hxDGQBZ/A
wPJLmEFY317CxcJ6XYJLqDh5pimvrmfntlihmjDrrHANXQ3dShHuxy1rWsq8nrvZ
y8hcOFyCkHkpIfximYuSHrh3U+HfeWfbVQYxk7tSBKv0MrSf0XcqkQbJ6zR2J7g=
=6xzX
-----END PGP SIGNATURE-----
--pgp-sign-Multipart_Wed_May_13_20:00:00_2009-1--
--Multipart_Wed_May_13_20:00:00_2009-2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905131110.n4DBA2af066908>