kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- allow "," in CFLAGS

Browse source 
- SENDMAIL_WITH_TLS honors WITH_OPENSSL_BASE
  when set later by bsd.openssl.mk
This commit is contained in:
Dirk Meyer 2003-04-15 19:40:30 +00:00
parent 6df84c6840
commit b7bf966f62
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=79031
4 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mail/sendmail/Makefile
View file

@ -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)

2
mail/sendmail/files/site.config.m4.ssl
View file

@ -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')

21
mail/sendmail812/Makefile
View file

@ -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)

2
mail/sendmail812/files/site.config.m4.ssl
View file

@ -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')