Index: ircproxy/Makefile =================================================================== --- ircproxy/Makefile (revision 527260) +++ ircproxy/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= ircproxy PORTVERSION= 1.3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= irc MASTER_SITES= https://BSDforge.com/projects/source/irc/ircproxy/ @@ -15,7 +15,7 @@ LIB_DEPENDS= libcares.so:dns/c-ares -USES= tar:bzip2 +USES= tar:bzip2 ssl GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -lcrypto CFLAGS+= -I${LOCALBASE}/include @@ -26,8 +26,8 @@ SUB_LIST= IRC_USR=${USERS} IRC_GRP=${GROUPS} SUB_FILES= pkg-deinstall -OPTIONS_DEFINE= SSL IPV6 MEMDEBUG FDDEBUG -OPTIONS_DEFAULT= SSL MEMDEBUG FDDEBUG +OPTIONS_DEFINE= IPV6 MEMDEBUG FDDEBUG +OPTIONS_DEFAULT= MEMDEBUG FDDEBUG MEMDEBUG_DESC= Enable memory debugging FDDEBUG_DESC= Enable file descriptor debugging @@ -34,16 +34,7 @@ MEMDEBUG_CONFIGURE_ENABLE= memdebug FDDEBUG_CONFIGURE_ENABLE= fddebug IPV6_CONFIGURE_ENABLE= ipv6 -SSL_CONFIGURE_ENABLE= ssl -SSL_USES= ssl -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= gnutls library not found. Install gnutls or use --with-openssl -BROKEN_FreeBSD_13= gnutls library not found. Install gnutls or use --with-openssl -.endif - post-patch: @${REINPLACE_CMD} -e 's|EUSER="ircproxy"|EUSER="ircproxyd"|g; \ s|EGROUP="users"|EGROUP="ircproxyd"|g' ${WRKSRC}/data/${PORTNAME}d.conf @@ -51,4 +42,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/imkpasswd ${STAGEDIR}${PREFIX}/bin/ircproxyd -.include +.include Index: ircproxy/files/patch-configure =================================================================== --- ircproxy/files/patch-configure (nonexistent) +++ ircproxy/files/patch-configure (working copy) @@ -0,0 +1,102 @@ +--- configure.orig 2009-03-21 17:29:58.000000000 -0700 ++++ configure 2020-02-26 22:39:06.516413000 -0800 +@@ -5358,8 +5358,8 @@ + if test "x$ssl_support" = "xyes" ; then + + if test "x$with_gnutls" = "xno" -a "x$with_openssl" = "xno" ; then +- { $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5 +-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } ++ { $as_echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lssl" >&5 ++$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; } + if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then + $as_echo_n "(cached) " >&6 + else +@@ -5378,11 +5378,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char OPENSSL_init_ssl (); + int + main () + { +-return SSL_library_init (); ++return OPENSSL_init_ssl (); + ; + return 0; + } +@@ -5429,8 +5429,8 @@ + with_openssl=no + fi + +- { $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lgnutls-openssl" >&5 +-$as_echo_n "checking for SSL_library_init in -lgnutls-openssl... " >&6; } ++ { $as_echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lgnutls-openssl" >&5 ++$as_echo_n "checking for OPENSSL_init_ssl in -lgnutls-openssl... " >&6; } + if test "${ac_cv_lib_gnutls_openssl_SSL_library_init+set}" = set; then + $as_echo_n "(cached) " >&6 + else +@@ -5449,11 +5449,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char OPENSSL_init_ssl (); + int + main () + { +-return SSL_library_init (); ++return OPENSSL_init_ssl (); + ; + return 0; + } +@@ -5503,8 +5503,8 @@ + fi + + if test "x$with_openssl" != "xno" ; then +- { $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5 +-$as_echo_n "checking for library containing SSL_library_init... " >&6; } ++ { $as_echo "$as_me:$LINENO: checking for library containing OPENSSL_init_ssl" >&5 ++$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; } + if test "${ac_cv_search_SSL_library_init+set}" = set; then + $as_echo_n "(cached) " >&6 + else +@@ -5522,11 +5522,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char OPENSSL_init_ssl (); + int + main () + { +-return SSL_library_init (); ++return OPENSSL_init_ssl (); + ; + return 0; + } +@@ -5604,8 +5604,8 @@ + exit 1 + fi + else +- { $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5 +-$as_echo_n "checking for library containing SSL_library_init... " >&6; } ++ { $as_echo "$as_me:$LINENO: checking for library containing OPENSSL_init_ssl" >&5 ++$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; } + if test "${ac_cv_search_SSL_library_init+set}" = set; then + $as_echo_n "(cached) " >&6 + else +@@ -5623,11 +5623,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char OPENSSL_init_ssl (); + int + main () + { +-return SSL_library_init (); ++return OPENSSL_init_ssl (); + ; + return 0; + } Index: ircproxy/files/patch-configure.in =================================================================== --- ircproxy/files/patch-configure.in (nonexistent) +++ ircproxy/files/patch-configure.in (working copy) @@ -0,0 +1,27 @@ +--- configure.in.orig 2009-03-21 17:29:58.000000000 -0700 ++++ configure.in 2020-02-26 22:39:03.499134000 -0800 +@@ -230,12 +230,12 @@ + if test "x$ssl_support" = "xyes" ; then + + if test "x$with_gnutls" = "xno" -a "x$with_openssl" = "xno" ; then +- AC_CHECK_LIB(ssl, SSL_library_init, [with_openssl=yes], [with_openssl=no], []) +- AC_CHECK_LIB(gnutls-openssl, SSL_library_init, [with_gnutls=yes], [with_gnutls=no], []) ++ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, [with_openssl=yes], [with_openssl=no], []) ++ AC_CHECK_LIB(gnutls-openssl, OPENSSL_init_ssl, [with_gnutls=yes], [with_gnutls=no], []) + fi + + if test "x$with_openssl" != "xno" ; then +- AC_SEARCH_LIBS(SSL_library_init, [ssl], [have_openssl=yes], [have_openssl=no], []) ++ AC_SEARCH_LIBS(OPENSSL_init_ssl, [ssl], [have_openssl=yes], [have_openssl=no], []) + if test "x$have_openssl" = "xyes" ; then + AC_DEFINE([HAVE_OPENSSL], [], [OpenSSL Library]) + have_ssl=yes +@@ -244,7 +244,7 @@ + exit 1 + fi + else +- AC_SEARCH_LIBS(SSL_library_init, [gnutls-openssl], [have_gnutls=yes], [have_gnutls=no], []) ++ AC_SEARCH_LIBS(OPENSSL_init_ssl, [gnutls-openssl], [have_gnutls=yes], [have_gnutls=no], []) + if test "x$have_gnutls" = "xyes" ; then + AC_DEFINE([HAVE_GNUTLS], [], [GNUTLS Library]) + have_ssl=yes