svn commit: r360794 - in head/net-p2p/twister: . files

[Thierry Thomas]

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 <bsd.port.options.mk>
 
+.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 <stdint.h>
+ #include <string.h>
+ #include <openssl/sha.h>
++#if defined(__FreeBSD__) && (__FreeBSD_version < 100000)
++#include <sys/endian.h>
++#endif
+ 
+ #ifndef __FreeBSD__
+ /* Allready defined in sys/endian.h */