cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix build on 4.x and 5.2.1 [1]

Browse Source 
- change the OpenSSL check, it may fail in some circumstances [2]

PR:		72287, 72384 [1]
Reported by:	Ulrich Spoerlein <q@uni.de> [2]
This commit is contained in:
Alexander Leidinger 2004-10-16 13:02:21 +00:00
parent a5571475dd
commit 3792d5b467
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=119587
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/claws-mail/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= sylpheed-claws
PORTVERSION= 0.9.12b
PORTREVISION= 1
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
@ -47,7 +48,12 @@ CONFIGURE_ARGS= --enable-openssl --with-openssl-includes=${OPENSSLINC} \
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SSL)
SSLTEST!=test ${OPENSSLVER} \< 0.9.7 && ${ECHO_CMD} bad || ${TRUE}
.if defined(OPENSSLVER)
MYSSLVER=${OPENSSLVER}
.else
MYSSLVER!=openssl version | cut -d ' ' -f 2
.endif
SSLTEST!=test ${MYSSLVER} \< 0.9.7 && ${ECHO_CMD} bad || ${TRUE}
. if ${SSLTEST} == "bad"
IGNORE=You need at least OpenSSL v0.9.7
. endif
@ -169,6 +175,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
@${REINPLACE_CMD} -e "s|po intl src|po src|" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's:%%OPENSSL_LIBS%%:"-lssl -lcrypto":g' ${WRKSRC}/configure
@for f in ${WRKSRC}/tools/*; do \
${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
# @${LN} -s ${WRKSRC}/po/sylpheed.pot ${WRKSRC}/po/${PORTNAME}.pot

2
mail/claws-mail/files/patch-configure
View File

@ -56,7 +56,7 @@
- fi
-
if test x$ac_cv_enable_openssl = xyes; then
+OPENSSL_LIBS=-lssl
+OPENSSL_LIBS=%%OPENSSL_LIBS%%
cat >>confdefs.h <<\_ACEOF
#define USE_OPENSSL 1

9
mail/sylpheed-claws/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= sylpheed-claws
PORTVERSION= 0.9.12b
PORTREVISION= 1
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
@ -47,7 +48,12 @@ CONFIGURE_ARGS= --enable-openssl --with-openssl-includes=${OPENSSLINC} \
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SSL)
SSLTEST!=test ${OPENSSLVER} \< 0.9.7 && ${ECHO_CMD} bad || ${TRUE}
.if defined(OPENSSLVER)
MYSSLVER=${OPENSSLVER}
.else
MYSSLVER!=openssl version | cut -d ' ' -f 2
.endif
SSLTEST!=test ${MYSSLVER} \< 0.9.7 && ${ECHO_CMD} bad || ${TRUE}
. if ${SSLTEST} == "bad"
IGNORE=You need at least OpenSSL v0.9.7
. endif
@ -169,6 +175,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
@${REINPLACE_CMD} -e "s|po intl src|po src|" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's:%%OPENSSL_LIBS%%:"-lssl -lcrypto":g' ${WRKSRC}/configure
@for f in ${WRKSRC}/tools/*; do \
${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
# @${LN} -s ${WRKSRC}/po/sylpheed.pot ${WRKSRC}/po/${PORTNAME}.pot

2
mail/sylpheed-claws/files/patch-configure
View File

@ -56,7 +56,7 @@
- fi
-
if test x$ac_cv_enable_openssl = xyes; then
+OPENSSL_LIBS=-lssl
+OPENSSL_LIBS=%%OPENSSL_LIBS%%
cat >>confdefs.h <<\_ACEOF
#define USE_OPENSSL 1