Index: head/net-p2p/linuxdcpp/Makefile =================================================================== --- head/net-p2p/linuxdcpp/Makefile (revision 518511) +++ head/net-p2p/linuxdcpp/Makefile (revision 518512) @@ -1,46 +1,42 @@ # $FreeBSD$ PORTNAME= linuxdcpp PORTVERSION= 1.1.0 PORTREVISION= 16 CATEGORIES= net-p2p MASTER_SITES= http://launchpadlibrarian.net/69733951/ MAINTAINER= ports@FreeBSD.org COMMENT= Port of the DC++ Direct Connect client to Unix-like systems LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/License.txt BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs USES= compiler:c++11-lang gettext gnome iconv localbase:ldflags \ pkgconfig scons ssl tar:bzip2 USE_GNOME= libglade2 +INSTALLS_ICONS= yes PORTDOCS= * DESTDIRNAME= FAKE_ROOT -OPTIONS_DEFINE= NOTIFY DEBUG DOCS +OPTIONS_DEFINE= NOTIFY DOCS OPTIONS_DEFAULT=NOTIFY NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_MAKE_ARGS_OFF= libnotify=0 -DEBUG_MAKE_ARGS=debug=1 - -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= member access into incomplete type 'dh_st' -BROKEN_FreeBSD_13= member access into incomplete type 'dh_st' +.if defined(WITH_DEBUG) +MAKE_ARGS+= debug=1 .endif post-patch: @${REINPLACE_CMD} -e "s/'iconv'/'${ICONV_LIB:S/-l//}'/" \ ${WRKSRC}/SConstruct @${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/SConstruct post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include +.include Index: head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp =================================================================== --- head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp (nonexistent) +++ head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp (revision 518512) @@ -0,0 +1,26 @@ +--- dcpp/CryptoManager.cpp.orig 2011-04-17 17:57:09 UTC ++++ dcpp/CryptoManager.cpp +@@ -107,12 +107,20 @@ CryptoManager::CryptoManager() + }; + + if(dh) { +- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); +- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); ++ BIGNUM *p, *g; + +- if (!dh->p || !dh->g) { ++ p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); ++ g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); ++ ++ if (!p || !g) { + dh.reset(); + } else { ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ dh->p = p; ++ dh->g = g; ++#else ++ DH_set0_pqg(dh, p, NULL, g); ++#endif + SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_tmp_dh(serverContext, (DH*)dh); Property changes on: head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property