Date: Tue, 10 Apr 2007 07:50:09 GMT From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/111373: [maintainer] mail/dkim-milter requires openssl 0.9.8 or later to support rsa-sha256 Message-ID: <200704100750.l3A7o9dL035953@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/111373; it has been noted by GNATS.
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/111373: [maintainer] mail/dkim-milter requires openssl 0.9.8 or later to support rsa-sha256
Date: Tue, 10 Apr 2007 16:48:12 +0900
OSVERSION check should be moved after bsd.port.pre.mk
here's another one.
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 6 Apr 2007 17:41:00 -0000 1.19
+++ Makefile 10 Apr 2007 07:47:43 -0000
@@ -14,6 +14,7 @@
PORTNAME= dkim-milter
PORTVERSION= 0.6.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -57,6 +58,15 @@ SITE+= ${FILESDIR}/site.config.m4.milte
.include <bsd.port.pre.mk>
+OPENSSL_PORT?= security/openssl
+.if ( ${OSVERSION} >= 600100 )
+LIB_DEPENDS+= ssl.5:${PORTSDIR}/${OPENSSL_PORT}
+.else
+LIB_DEPENDS+= ssl.4:${PORTSDIR}/${OPENSSL_PORT}
+.endif
+OPENSSLINC?= ${LOCALBASE}/include
+OPENSSLLIB?= ${LOCALBASE}/lib
+
SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
@@ -93,6 +103,8 @@ post-patch:
${WRKSRC}/devtools/OS/FreeBSD
@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+ -e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
+ -e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g" \
${SITE} > ${WCONF}/site.config.m4
.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
cvs diff: Diffing files
Index: files/site.config.m4
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4,v
retrieving revision 1.1
diff -u -p -r1.1 site.config.m4
--- files/site.config.m4 11 Jan 2006 13:50:22 -0000 1.1
+++ files/site.config.m4 10 Apr 2007 07:47:43 -0000
@@ -4,3 +4,5 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/
define(`confUBINDIR',`%%PREFIX%%/libexec')
define(`confLIBDIR',`%%PREFIX%%/lib')
define(`confDONT_INSTALL_CATMAN',`True')
+APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
+APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704100750.l3A7o9dL035953>