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

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

PR:		72287, 72384 [1]
Reported by:	Ulrich Spoerlein <q@uni.de> [2]

4 files changed, 18 insertions, 4 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 5d097c73b994..d50a2311faa0 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -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
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
index 4c5df65601b0..635064a1cb20 100644
--- a/mail/claws-mail/files/patch-configure
+++ b/mail/claws-mail/files/patch-configure
@@ -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
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 5d097c73b994..d50a2311faa0 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -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
diff --git a/mail/sylpheed-claws/files/patch-configure b/mail/sylpheed-claws/files/patch-configure
index 4c5df65601b0..635064a1cb20 100644
--- a/mail/sylpheed-claws/files/patch-configure
+++ b/mail/sylpheed-claws/files/patch-configure
@@ -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