5 files changed, 5 insertions, 79 deletions

diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile
index d41d668b783f..611286f0cac7 100644
--- a/net-p2p/twister/Makefile
+++ b/net-p2p/twister/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	twister-core
-PORTVERSION=	0.140621
+PORTVERSION=	0.140629
 CATEGORIES=	net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -25,7 +25,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	miguelfreitas
 GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	2d23677
+GH_COMMIT=	7474196
 
 USE_BDB=	yes
 WANT_BDB_VER=	48
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	--with-libiconv			\
 		--with-boost-system=boost_system
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-MAKEFILE=	makefile.unix
+MAKEFILE=	makefile.freebsd
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ENV=	BOOST_INCLUDE_PATH=${LOCALBASE}/include	\
 		BOOST_LIB_PATH=${LOCALBASE}/lib		\
diff --git a/net-p2p/twister/distinfo b/net-p2p/twister/distinfo
index 4bc15ea53025..9374ab1e00bb 100644
--- a/net-p2p/twister/distinfo
+++ b/net-p2p/twister/distinfo
@@ -1,2 +1,2 @@
-SHA256 (twister-core-0.140621.tar.gz) = fc3fc95d32c615e97599ecf22de230a9c31ad5e0faf5d17dbb076002284dca07
-SIZE (twister-core-0.140621.tar.gz) = 6268064
+SHA256 (twister-core-0.140629.tar.gz) = 4a8df2b2d97ad2da9376c3357ad15899318f9d45810159003842a0ea31f047e5
+SIZE (twister-core-0.140629.tar.gz) = 6274289
diff --git a/net-p2p/twister/files/patch-src_makefile.unix b/net-p2p/twister/files/patch-src_makefile.unix
deleted file mode 100644
index 3e0bada38ae2..000000000000
--- a/net-p2p/twister/files/patch-src_makefile.unix
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/makefile.unix.orig	2014-06-20 21:38:49.000000000 +0200
-+++ src/makefile.unix	2014-06-21 16:53:52.000000000 +0200
-@@ -63,7 +63,6 @@
- LIBS+= \
-  -Wl,-B$(LMODE2) \
-    -l z \
--   -l dl \
-    -l pthread
- 
- 
-@@ -105,7 +104,7 @@
- 
- # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
- # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
--xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
-+xCXXFLAGS= -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
-     $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
- 
- # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
-@@ -113,7 +112,6 @@
- xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
- 
- OBJS= \
--    leveldb/libleveldb.a \
-     ../libtorrent/src/.libs/libtorrent-rasterbar.a \
-     obj/alert.o \
-     obj/version.o \
-@@ -169,9 +167,7 @@
- # LevelDB support
- #
- MAKEOVERRIDES =
--LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
--DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
--DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
-+LIBS += -l leveldb -l memenv
- leveldb/libleveldb.a:
- 	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC="$(CC)" CXX="$(CXX)" OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
- 
diff --git a/net-p2p/twister/files/patch-src_scrypt.cpp b/net-p2p/twister/files/patch-src_scrypt.cpp
deleted file mode 100644
index 370265aae275..000000000000
--- a/net-p2p/twister/files/patch-src_scrypt.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/scrypt.cpp.orig	2014-06-03 22:36:01.000000000 +0200
-+++ src/scrypt.cpp	2014-06-15 23:01:59.000000000 +0200
-@@ -34,6 +34,8 @@
- #include <string.h>
- #include <openssl/sha.h>
- 
-+#ifndef __FreeBSD__
-+/* Allready defined in sys/endian.h */
- static inline uint32_t be32dec(const void *pp)
- {
- 	const uint8_t *p = (uint8_t const *)pp;
-@@ -49,6 +51,7 @@
- 	p[1] = (x >> 16) & 0xff;
- 	p[0] = (x >> 24) & 0xff;
- }
-+#endif
- 
- typedef struct HMAC_SHA256Context {
- 	SHA256_CTX ictx;
diff --git a/net-p2p/twister/files/patch-src_scrypt.h b/net-p2p/twister/files/patch-src_scrypt.h
deleted file mode 100644
index 220acdb732b5..000000000000
--- a/net-p2p/twister/files/patch-src_scrypt.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/scrypt.h.orig	2014-06-03 22:36:01.000000000 +0200
-+++ src/scrypt.h	2014-06-15 22:44:40.000000000 +0200
-@@ -17,6 +17,8 @@
- PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt,
-     size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen);
- 
-+# ifndef __FreeBSD__
-+/* Allready defined in sys/endian.h */
- static inline uint32_t le32dec(const void *pp)
- {
-         const uint8_t *p = (uint8_t const *)pp;
-@@ -32,4 +34,5 @@
-         p[2] = (x >> 16) & 0xff;
-         p[3] = (x >> 24) & 0xff;
- }
-+# endif
- #endif