summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2003-04-15 19:40:30 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2003-04-15 19:40:30 +0000
commitb7bf966f624b6446fe756b771459b9ce1baac9e3 (patch)
tree6f78e99a0eb7e4f1951a436d48c4de56117c68fe /mail
parentFix build on 5.x (maintainer timeout). (diff)
- allow "," in CFLAGS
- SENDMAIL_WITH_TLS honors WITH_OPENSSL_BASE when set later by bsd.openssl.mk
Notes
Notes: svn path=/head/; revision=79031
Diffstat (limited to 'mail')
-rw-r--r--mail/sendmail/Makefile21
-rw-r--r--mail/sendmail/files/site.config.m4.ssl2
-rw-r--r--mail/sendmail812/Makefile21
-rw-r--r--mail/sendmail812/files/site.config.m4.ssl2
4 files changed, 18 insertions, 28 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index dab06175aa73..0392bfe58ba8 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -61,16 +61,6 @@ SITE+= ${FILESDIR}/site.config.m4
SITE+= ${FILESDIR}/site.config.m4.ipv6
.endif
.endif
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-.if ! defined(WITH_OPENSSL_BASE)
-SITE+= ${FILESDIR}/site.config.m4.ssl
-.else
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-SITE+= ${FILESDIR}/site.config.m4.ssl
-.endif
-.endif
-SITE+= ${FILESDIR}/site.config.m4.tls
-.endif
.if defined(SENDMAIL_WITH_SASL)
SITE+= ${FILESDIR}/site.config.m4.sasl
.endif
@@ -101,11 +91,12 @@ post-extract:
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_WITH_PICKY_HELO_CHECK)
${ECHO_CMD} \
@@ -243,6 +234,10 @@ tls-install:
.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/sendmail/files/site.config.m4.ssl b/mail/sendmail/files/site.config.m4.ssl
index 9e291b26e856..801030866543 100644
--- a/mail/sendmail/files/site.config.m4.ssl
+++ b/mail/sendmail/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')
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index dab06175aa73..0392bfe58ba8 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -61,16 +61,6 @@ SITE+= ${FILESDIR}/site.config.m4
SITE+= ${FILESDIR}/site.config.m4.ipv6
.endif
.endif
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-.if ! defined(WITH_OPENSSL_BASE)
-SITE+= ${FILESDIR}/site.config.m4.ssl
-.else
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-SITE+= ${FILESDIR}/site.config.m4.ssl
-.endif
-.endif
-SITE+= ${FILESDIR}/site.config.m4.tls
-.endif
.if defined(SENDMAIL_WITH_SASL)
SITE+= ${FILESDIR}/site.config.m4.sasl
.endif
@@ -101,11 +91,12 @@ post-extract:
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_WITH_PICKY_HELO_CHECK)
${ECHO_CMD} \
@@ -243,6 +234,10 @@ tls-install:
.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/sendmail812/files/site.config.m4.ssl b/mail/sendmail812/files/site.config.m4.ssl
index 9e291b26e856..801030866543 100644
--- a/mail/sendmail812/files/site.config.m4.ssl
+++ b/mail/sendmail812/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')