Date: Wed, 12 Mar 2008 17:20:03 GMT From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/121529: portupgrade to mail/dkim-milter 2.5.0 failed Message-ID: <200803121720.m2CHK3RX071581@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/121529; it has been noted by GNATS.
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: dirk.meyer@dinoex.sub.org
Cc: umq@ueo.co.jp (Hirohisa Yamaguchi), hlh@restart.be,
bug-followup@FreeBSD.org
Subject: Re: ports/121529: portupgrade to mail/dkim-milter 2.5.0 failed
Date: Thu, 13 Mar 2008 02:12:43 +0900
Hello, Herr Meyer.
Thank you for your suggestion.
At Wed, 12 Mar 2008 08:51:43 +0100,
Dirk Meyer wrote:
> Would a new Option like:
> WITHOUT_MILTER_CFLAGS=yes
> Before including bsd.milter.mk help?
That sounds good.
I've tested with a patch attached, and it looks working both under
environmens where libmilter SHLIBVER is the same (e.g. 7.0-RELEASE)
and different (e.g. 5.5-RELEASE).
> I would add such an option in bsd.milter.mk.
Yes, please.
Btw, I'm preparing a pr that adds patches to fix bugs noted in sf.net
bug tracker.
Would it be fine to include the change in patch below?
Regards,
--
end
Hirohisa Yamaguchi
umq@ueo.co.jp
Index: dkim-milter/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- dkim-milter/Makefile 7 Mar 2008 13:26:39 -0000 1.43
+++ dkim-milter/Makefile 12 Mar 2008 16:55:05 -0000
@@ -136,6 +136,7 @@
.include <bsd.port.pre.mk>
+WITHOUT_MILTER_CFLAGS= yes
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
SITE+= ${FILESDIR}/site.config.m4
Index: sendmail/bsd.milter.mk
===================================================================
RCS file: /home/ncvs/ports/mail/sendmail/bsd.milter.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.milter.mk
--- sendmail/bsd.milter.mk 2 Feb 2007 20:17:17 -0000 1.2
+++ sendmail/bsd.milter.mk 12 Mar 2008 16:55:54 -0000
@@ -67,12 +67,13 @@
MILTERRPATH= ${MILTERBASE}/lib
MILTERLIB= -L${MILTERBASE}/lib -rpath=${MILTERRPATH}
+.if !defined(WITHOUT_MILTER_CFLAGS)
.if defined(CFLAGS)
CFLAGS+=${MILTERINC}
.else
CFLAGS=${MILTERINC}
.endif
-
+.endif
.if defined(SENDMAIL_WITHOUT_MILTER)
pre-everything::
@@ -90,11 +91,13 @@
MILTERLIB= -rpath=${MILTERRPATH}
.endif
+.if !defined(WITHOUT_MILTER_CFLAGS)
.if defined(LDFLAGS)
LDFLAGS+=${MILTERLIB}
.else
LDFLAGS=${MILTERLIB}
.endif
+.endif
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
MAKE_ENV+= LDFLAGS="${LDFLAGS}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803121720.m2CHK3RX071581>