Index: head/lang/swi-pl/Makefile =================================================================== --- head/lang/swi-pl/Makefile (revision 421729) +++ head/lang/swi-pl/Makefile (revision 421730) @@ -1,75 +1,76 @@ # Created by: Michael Butschky # $FreeBSD$ PORTNAME= swi-pl PORTVERSION= 7.2.3 PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.swi-prolog.org/download/stable/src/ DISTNAME= swipl-${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Edinburgh-style Prolog compiler LIB_DEPENDS= libgmp.so:math/gmp \ libodbc.so:databases/unixODBC SWIPLDIR= ${PORTNAME:C/-//}-${PORTVERSION} NOPRECIOUSMAKEVARS= yes USE_XORG= xft xpm xt -USES= gmake jpeg libarchive pathfix pkgconfig shebangfix +USES= gmake jpeg libarchive pathfix pkgconfig shebangfix ssl MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ARCH=${ARCH}-${OPSYS:tl} CONFIGURE_TARGET= ${ARCH}-${OPSYS:tl} CONFIGURE_ARGS= --with-world --without-jpl --enable-shared MAKE_ARGS= DISABLE_PKGS=jpl \ - ac_cv_lib_ossp_uuid_uuid_create=no ac_cv_lib_uuid_uuid_create=no + ac_cv_lib_ossp_uuid_uuid_create=no \ + ac_cv_lib_uuid_uuid_create=no SHEBANG_LANG= swipl swipl_OLD_CMD= /usr/bin/swipl swipl_CMD= ${LOCALBASE}/bin/swipl SHEBANG_FILES= library/dialect/sicstus/swipl-lfr.pl \ packages/http/examples/demo_inetd PLIST_SUB= DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:tl} \ VER=${PORTVERSION} .include .if (${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "armv6") PLIST_SUB+= BITS=32 .else PLIST_SUB+= BITS=64 .endif .if (${ARCH} == "amd64") ARCH= x86_64 .endif post-configure: .if ${ARCH} != "i386" @${REINPLACE_CMD} -e '/^CMFLAGS=/s/$$/ -fPIC/' \ ${WRKSRC}/packages/Dialect.defs .endif @{ ${ECHO} "#define HAVE_DLOPEN 1"; ${ECHO} "#define HAVE_DLADDR 1"; }\ >> ${WRKSRC}/src/config.h post-patch: @${REINPLACE_CMD} -e 's!^mandir=@mandir@!mandir=${MANPREFIX}/man!' \ -e '/-o $$@ $$(PLOBJ)/s/$$/ $$(LIBS)/' \ -e '/ $$(SHAREDV) $$(SONAME)/d' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/packages/xpce/src/Makefile.in @${REINPLACE_CMD} -e '/EXAMPLEEXE/s/INSTALL_PROGRAM/INSTALL_SCRIPT/' \ ${WRKSRC}/packages/http/Makefile.in \ ${WRKSRC}/packages/pldoc/Makefile.in @${REINPLACE_CMD} -e 's/malloc\.h/stdlib.h/' \ ${WRKSRC}/packages/cpp/SWI-cpp.h post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xpce-client \ - ${STAGEDIR}${PREFIX}/lib/${SWIPLDIR}/lib/${ARCH}-freebsd/pl2xpce.so + ${STAGEDIR}${PREFIX}/lib/${SWIPLDIR}/lib/${ARCH}-${OPSYS:tl}/pl2xpce.so .include Index: head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.c =================================================================== --- head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.c (nonexistent) +++ head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.c (revision 421730) @@ -0,0 +1,28 @@ +--- packages/ssl/ssl4pl.c.orig 2015-06-09 09:25:57 UTC ++++ packages/ssl/ssl4pl.c +@@ -1127,8 +1127,12 @@ pl_ssl_context(term_t role, term_t confi + + if (!PL_get_atom(method, &method_name)) + return PL_domain_error("ssl_method", method); +- if (method_name == ATOM_sslv3) ++ if (0) ++ { /* never reached */ } ++#ifndef OPENSSL_NO_SSL3 ++ else if (method_name == ATOM_sslv3) + ssl_method = SSLv3_method(); ++#endif + #ifdef HAVE_SSLV2_METHOD + else if (method_name == ATOM_sslv2) + ssl_method = SSLv2_method(); +@@ -1736,9 +1740,11 @@ pl_ssl_session(term_t stream_t, term_t s + PL_INTEGER, (int)session->ssl_version)) + return FALSE; + ++#ifndef OPENSSL_NO_SSL2 + if ( !add_key_string(list_t, FUNCTOR_session_key1, + session->key_arg_length, session->key_arg) ) + return FALSE; ++#endif + + if ( !add_key_string(list_t, FUNCTOR_master_key1, + session->master_key_length, session->master_key) ) Property changes on: head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.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