From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 18:36:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E48E0ECB; Sat, 5 Jul 2014 18:36:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7E4521BB; Sat, 5 Jul 2014 18:36:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65IaudY099175; Sat, 5 Jul 2014 18:36:56 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65Iau1H099168; Sat, 5 Jul 2014 18:36:56 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201407051836.s65Iau1H099168@svn.freebsd.org> From: Thierry Thomas Date: Sat, 5 Jul 2014 18:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360794 - in head/net-p2p/twister: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jul 2014 18:36:57 -0000 Author: thierry Date: Sat Jul 5 18:36:55 2014 New Revision: 360794 URL: http://svnweb.freebsd.org/changeset/ports/360794 QAT: https://qat.redports.org/buildarchive/r360794/ Log: Fix build on FreeBSD-9. Added: head/net-p2p/twister/files/patch-src_makefile.freebsd (contents, props changed) head/net-p2p/twister/files/patch-src_scrypt.cpp (contents, props changed) Modified: head/net-p2p/twister/Makefile Modified: head/net-p2p/twister/Makefile ============================================================================== --- head/net-p2p/twister/Makefile Sat Jul 5 18:36:41 2014 (r360793) +++ head/net-p2p/twister/Makefile Sat Jul 5 18:36:55 2014 (r360794) @@ -45,13 +45,18 @@ BUILD_WRKSRC= ${WRKSRC}/src MAKE_ENV= BOOST_INCLUDE_PATH=${LOCALBASE}/include \ BOOST_LIB_PATH=${LOCALBASE}/lib \ BDB_INCLUDE_PATH=${BDB_INCLUDE_DIR} \ - BDB_LIB_PATH=${BDB_LIB_DIR} + BDB_LIB_PATH=${BDB_LIB_DIR} \ + ICONV_LIB="${ICONV_LIB}" PLIST_FILES= bin/twisterd PORTDOCS= README.md .include +.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1000000) +WITH_OPENSSL_PORT= yes +.endif + pre-configure: (cd ${CONFIGURE_WRKSRC} && ./autotool.sh) .if ${PORT_OPTIONS:MUPNP} Added: head/net-p2p/twister/files/patch-src_makefile.freebsd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/twister/files/patch-src_makefile.freebsd Sat Jul 5 18:36:55 2014 (r360794) @@ -0,0 +1,11 @@ +--- src/makefile.freebsd.orig 2014-06-28 13:26:56.000000000 +0200 ++++ src/makefile.freebsd 2014-07-05 20:16:28.000000000 +0200 +@@ -40,7 +40,7 @@ + -l boost_thread$(BOOST_LIB_SUFFIX) \ + -l boost_locale$(BOOST_LIB_SUFFIX) \ + -l db_cxx$(BDB_LIB_SUFFIX) \ +- -l ssl \ ++ $(ICONV_LIB) -l ssl \ + -l crypto \ + -l rt + Added: head/net-p2p/twister/files/patch-src_scrypt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/twister/files/patch-src_scrypt.cpp Sat Jul 5 18:36:55 2014 (r360794) @@ -0,0 +1,12 @@ +--- src/scrypt.cpp.orig 2014-06-28 13:26:56.000000000 +0200 ++++ src/scrypt.cpp 2014-07-05 19:42:46.000000000 +0200 +@@ -33,6 +33,9 @@ + #include + #include + #include ++#if defined(__FreeBSD__) && (__FreeBSD_version < 100000) ++#include ++#endif + + #ifndef __FreeBSD__ + /* Allready defined in sys/endian.h */