Index: head/net-im/climm/Makefile =================================================================== --- head/net-im/climm/Makefile (revision 546707) +++ head/net-im/climm/Makefile (revision 546708) @@ -1,95 +1,90 @@ # Created by: mph # $FreeBSD$ PORTNAME= climm PORTVERSION= 0.7.1 PORTREVISION= 12 CATEGORIES= net-im MASTER_SITES= http://www.climm.org/source/ \ http://http.bg.climm.org/source/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= CLI-based Multi-Messenger USES= gmake pkgconfig GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= ICONV P2P TCL OTR REMOTE XMPP DOCS OPTIONS_DEFAULT=ICONV P2P TCL OTR REMOTE P2P_DESC= Enable Peer2peer connection support OTR_DESC= Enable OTR encryption support REMOTE_DESC= Enable Remote control fifo support XMPP_DESC= Enable XMPP Jabber support .include -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= incomplete definition of type 'struct dh_st' -BROKEN_FreeBSD_13= incomplete definition of type 'struct dh_st' -.endif - .if ${PORT_OPTIONS:MOTR} CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-otr LIB_DEPENDS+= libotr.so.2:security/libotr3 .else CONFIGURE_ARGS+= --disable-otr .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv .else CONFIGURE_ARGS+= --disable-iconv .endif .if ${PORT_OPTIONS:MP2P} CONFIGURE_ARGS+= --enable-peer2peer .else CONFIGURE_ARGS+= --disable-peer2peer .endif .if ${PORT_OPTIONS:MTCL} USES+= tcl .else CONFIGURE_ARGS+= --disable-tcl .endif .if ${PORT_OPTIONS:MREMOTE} CONFIGURE_ARGS+= --enable-remote .else CONFIGURE_ARGS+= --disable-remote .endif .if ${PORT_OPTIONS:MXMPP} CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-xmpp --enable-ssl=gnutls \ --with-libgcrypt-prefix=${LOCALBASE} CONFIGURE_ENV+= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls" LIB_DEPENDS+= libiksemel.so:textproc/iksemel \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error .else USES+= ssl CONFIGURE_ARGS+= --disable-xmpp --enable-ssl=openssl .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/ doc//' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/^noinst_LIBRARIES/d' ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e '/ac_lib/s/tcl8\./tcl8/g' \ -e '/libgnutls_config_version=/s/--version/--modversion/' \ ${WRKSRC}/configure post-install: ${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/climmrc.5 ${STAGEDIR}${PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/doc/climmcmds.7 ${STAGEDIR}${PREFIX}/man/man7 @${MKDIR} ${STAGEDIR}${DOCSDIR} .for ext in i18n logformat png txt xpm ${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/net-im/climm/files/patch-src_io_io__openssl.c =================================================================== --- head/net-im/climm/files/patch-src_io_io__openssl.c (nonexistent) +++ head/net-im/climm/files/patch-src_io_io__openssl.c (revision 546708) @@ -0,0 +1,25 @@ +--- src/io/io_openssl.c.orig 2010-03-20 14:13:15 UTC ++++ src/io/io_openssl.c +@@ -96,10 +96,22 @@ static DH *get_dh512() + DH *dh; + + if ((dh=DH_new()) == NULL) return(NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10100005L ++ BIGNUM *p, *g; ++ ++ p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); ++ g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); ++ if (p == NULL || g == NULL) { ++ BN_free(p); BN_free(g); ++ DH_free(dh); return(NULL); ++ } else ++ DH_set0_pqg(dh, p, NULL, g); ++#else + dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); + dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); + if ((dh->p == NULL) || (dh->g == NULL)) + { DH_free(dh); return(NULL); } ++#endif + return(dh); + } + /* END AUTOGENERATED */ Property changes on: head/net-im/climm/files/patch-src_io_io__openssl.c ___________________________________________________________________ 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