diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-04-15 19:32:45 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-04-15 19:32:45 +0000 |
| commit | c6a5a6641d170d86a1d4bfc00736576cc9195fff (patch) | |
| tree | ea6d147b3840a3194cf67d5027d4e146e68e6b09 /mail/sendmail811 | |
| parent | e8cf14265657d9da9406dfea46e35d1374b3829d (diff) | |
| download | ports-c6a5a6641d170d86a1d4bfc00736576cc9195fff.tar.gz ports-c6a5a6641d170d86a1d4bfc00736576cc9195fff.zip | |
- allow "," in CFLAGS
- SENDMAIL_WITH_TLS now supports openssl in ports for > 4.1
Notes
Notes:
svn path=/head/; revision=79029
Diffstat (limited to 'mail/sendmail811')
| -rw-r--r-- | mail/sendmail811/Makefile | 17 | ||||
| -rw-r--r-- | mail/sendmail811/files/site.config.m4.ssl | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile index 0c1bdcb9e74a..ff0ba8ac9a42 100644 --- a/mail/sendmail811/Makefile +++ b/mail/sendmail811/Makefile @@ -62,12 +62,6 @@ SITE+= ${FILESDIR}/site.config.m4.ipv6 .if defined(SENDMAIL_WITH_SFIO) SITE+= ${FILESDIR}/site.config.m4.sfio .endif -.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS) -.if ! exists(${DESTDIR}/etc/mail/mailer.conf) -SITE+= ${FILESDIR}/site.config.m4.ssl -.endif -SITE+= ${FILESDIR}/site.config.m4.tls -.endif .if defined(SENDMAIL_WITH_SASL) SITE+= ${FILESDIR}/site.config.m4.sasl .endif @@ -88,11 +82,12 @@ SENDMAIL= ${PREFIX}/sbin/sendmail do-configure: @${MV} ${WRKSRC}/devtools/OS/FreeBSD ${WRKSRC}/devtools/OS/FreeBSD.sed - ${SED} -e "s,\`-pthread\',\`${PTHREAD_LIBS}\'," \ - -e "s,\`-O\',\`${CFLAGS}\'," \ + ${SED} -e "s;\`-pthread\';\`${PTHREAD_LIBS}\';" \ + -e "s;\`-O\';\`${CFLAGS}\';" \ ${WRKSRC}/devtools/OS/FreeBSD.sed \ > ${WRKSRC}/devtools/OS/FreeBSD - ${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \ + ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ + -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \ ${SITE} > ${WCONF}/site.config.m4 .if ! defined(SENDMAIL_WITHOUT_MILTER) @@ -177,6 +172,10 @@ mailer.conf: .if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS) .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" +.if ! defined(WITH_OPENSSL_BASE) +SITE+= ${FILESDIR}/site.config.m4.ssl +.endif +SITE+= ${FILESDIR}/site.config.m4.tls .endif .if exists(${FILESDIR}/site.config.m4.local) diff --git a/mail/sendmail811/files/site.config.m4.ssl b/mail/sendmail811/files/site.config.m4.ssl index 9e291b26e856..801030866543 100644 --- a/mail/sendmail811/files/site.config.m4.ssl +++ b/mail/sendmail811/files/site.config.m4.ssl @@ -1,3 +1,3 @@ -APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib') +APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib' -rpath=%%LOCALBASE%%/lib ) APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include') APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV') |