diff options
-rw-r--r-- | net-p2p/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/namecoin-daemon/Makefile | 15 | ||||
-rw-r--r-- | net-p2p/namecoin/Makefile | 14 | ||||
-rw-r--r-- | net-p2p/namecoin/distinfo | 4 | ||||
-rw-r--r-- | net-p2p/namecoin/files/patch-src__main.h | 6 | ||||
-rw-r--r-- | net-p2p/namecoin/files/patch-src__net.cpp | 25 | ||||
-rw-r--r-- | net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h | 4 | ||||
-rw-r--r-- | net-p2p/namecoin/files/patch-src__qt__managenamespage.h | 4 | ||||
-rw-r--r-- | net-p2p/namecoin/files/patch-src__serialize.h | 21 |
9 files changed, 34 insertions, 60 deletions
diff --git a/net-p2p/Makefile b/net-p2p/Makefile index d5333a0a27ed..f16f10452f3f 100644 --- a/net-p2p/Makefile +++ b/net-p2p/Makefile @@ -57,6 +57,7 @@ SUBDIR += mldonkey-core SUBDIR += mldonkey-gui SUBDIR += namecoin + SUBDIR += namecoin-daemon SUBDIR += napshare SUBDIR += ncdc SUBDIR += opendchub diff --git a/net-p2p/namecoin-daemon/Makefile b/net-p2p/namecoin-daemon/Makefile new file mode 100644 index 000000000000..d6d66691d204 --- /dev/null +++ b/net-p2p/namecoin-daemon/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -daemon + +COMMENT= A decentralized, open DNS system and general purpose key/value store. + +MASTERDIR= ${.CURDIR}/../namecoin + +DESCR= ${MASTERDIR}/pkg-descr + +SLAVE_PORT= yes + +OPTIONS_EXCLUDE= X11 DBUS QRCODES + +.include "${MASTERDIR}/Makefile" diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile index 1733e8078a2f..10327a43dfed 100644 --- a/net-p2p/namecoin/Makefile +++ b/net-p2p/namecoin/Makefile @@ -2,14 +2,16 @@ # $FreeBSD$ PORTNAME= namecoin -PORTVERSION= Q.3.72 -DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTVERSION= 0.3.80 +DISTVERSIONPREFIX= nc +PORTEPOCH= 1 CATEGORIES= net-p2p dns MAINTAINER= milios@ccsys.com COMMENT= Decentralized, open DNS system and general purpose key/value store +LICENSE= MIT + LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= X11 UPNP QRCODES DBUS @@ -19,10 +21,11 @@ UPNP_DESC= Build with UPNP support QRCODES_DESC= Build with QR code display USE_GITHUB= yes -GH_ACCOUNT= namecoinq -GH_PROJECT= namecoinq +GH_ACCOUNT= namecoin +GH_PROJECT= namecoin USES= gmake compiler:c++11-lib +MAKE_JOBS_UNSAFE=yes USE_OPENSSL= yes USE_BDB= yes WANT_BDB_VER= 48 @@ -62,6 +65,7 @@ PLIST_FILES+= bin/${BINARY} .if ${PORT_OPTIONS:MUPNP} LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc +CXXFLAGS+= -I${LOCALBASE}/include/miniupnpc QMAKE_USE_UPNP= 1 .else QMAKE_USE_UPNP= - diff --git a/net-p2p/namecoin/distinfo b/net-p2p/namecoin/distinfo index deb4b537b2b5..4e663908fe4b 100644 --- a/net-p2p/namecoin/distinfo +++ b/net-p2p/namecoin/distinfo @@ -1,2 +1,2 @@ -SHA256 (namecoinq-namecoinq-vQ.3.72_GH0.tar.gz) = 74d088f96735b3397b9a71bc10bbbe1211cd2594baf593c4b9062457c1d4b869 -SIZE (namecoinq-namecoinq-vQ.3.72_GH0.tar.gz) = 1453901 +SHA256 (namecoin-namecoin-nc0.3.80_GH0.tar.gz) = 3f5e5af95cea46111d3cf1663f0e84d5fda653917745e0607a3ca4773baea59c +SIZE (namecoin-namecoin-nc0.3.80_GH0.tar.gz) = 1471777 diff --git a/net-p2p/namecoin/files/patch-src__main.h b/net-p2p/namecoin/files/patch-src__main.h index 4fb54e4fcd1a..9abd575cb34a 100644 --- a/net-p2p/namecoin/files/patch-src__main.h +++ b/net-p2p/namecoin/files/patch-src__main.h @@ -1,6 +1,6 @@ ---- ./src/main.h.orig 2013-10-29 13:38:10.000000000 +0000 -+++ ./src/main.h 2014-01-18 23:12:20.871138275 +0000 -@@ -16,7 +16,6 @@ +--- src/main.h.orig 2014-12-18 14:47:02 UTC ++++ src/main.h +@@ -17,7 +17,6 @@ #ifdef __WXMSW__ #include <io.h> /* for _commit */ #elif !defined(MAC_OSX) diff --git a/net-p2p/namecoin/files/patch-src__net.cpp b/net-p2p/namecoin/files/patch-src__net.cpp deleted file mode 100644 index 992948cf9d63..000000000000 --- a/net-p2p/namecoin/files/patch-src__net.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- ./src/net.cpp.orig 2013-10-29 13:38:10.000000000 +0000 -+++ ./src/net.cpp 2014-01-18 23:12:20.911138205 +0000 -@@ -51,7 +51,7 @@ - CAddress addrLocalHost("0.0.0.0", 0, false, nLocalServices); - CNode* pnodeLocalHost = NULL; - uint64 nLocalHostNonce = 0; --array<int, 10> vnThreadsRunning; -+boost::array<int, 10> vnThreadsRunning; - SOCKET hListenSocket = INVALID_SOCKET; - - vector<CNode*> vNodes; -@@ -1094,13 +1094,8 @@ - char intClient[16]; - char intPort[6]; - --#if !defined(__WXMSW__) && !defined(MAC_OSX) -- r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, -- port, port, lanaddr, 0, "TCP", 0); --#else - r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, 0, "TCP", 0, "0"); --#endif - if(r!=UPNPCOMMAND_SUCCESS) - printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n", - port, port, lanaddr, r, strupnperror(r)); diff --git a/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h b/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h index 104460b7b841..5bb77e1af82a 100644 --- a/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h +++ b/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h @@ -1,5 +1,5 @@ ---- ./src/qt/configurenamedialog.h.orig 2013-10-29 13:38:10.000000000 +0000 -+++ ./src/qt/configurenamedialog.h 2014-01-18 23:12:20.925138619 +0000 +--- src/qt/configurenamedialog.h.orig 2014-12-18 14:47:02 UTC ++++ src/qt/configurenamedialog.h @@ -1,6 +1,9 @@ #ifndef CONFIGURENAMEDIALOG_H #define CONFIGURENAMEDIALOG_H diff --git a/net-p2p/namecoin/files/patch-src__qt__managenamespage.h b/net-p2p/namecoin/files/patch-src__qt__managenamespage.h index 6651dcbbf137..d37fd4e44275 100644 --- a/net-p2p/namecoin/files/patch-src__qt__managenamespage.h +++ b/net-p2p/namecoin/files/patch-src__qt__managenamespage.h @@ -1,5 +1,5 @@ ---- ./src/qt/managenamespage.h.orig 2013-10-29 13:38:10.000000000 +0000 -+++ ./src/qt/managenamespage.h 2014-01-18 23:12:20.965138391 +0000 +--- src/qt/managenamespage.h.orig 2014-12-18 14:47:02 UTC ++++ src/qt/managenamespage.h @@ -1,6 +1,9 @@ #ifndef MANAGENAMESPAGE_H #define MANAGENAMESPAGE_H diff --git a/net-p2p/namecoin/files/patch-src__serialize.h b/net-p2p/namecoin/files/patch-src__serialize.h deleted file mode 100644 index 30eb12fa5131..000000000000 --- a/net-p2p/namecoin/files/patch-src__serialize.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/serialize.h.orig 2014-01-19 03:49:23.000000000 +0000 -+++ src/serialize.h 2014-01-19 03:52:10.000000000 +0000 -@@ -858,18 +858,6 @@ - iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); } - void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); } - -- void insert(iterator it, const_iterator first, const_iterator last) -- { -- if (it == vch.begin() + nReadPos && last - first <= nReadPos) -- { -- // special case for inserting at the front when there's room -- nReadPos -= (last - first); -- memcpy(&vch[nReadPos], &first[0], last - first); -- } -- else -- vch.insert(it, first, last); -- } -- - void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last) - { - if (it == vch.begin() + nReadPos && last - first <= nReadPos) |