diff options
author | swills <swills@FreeBSD.org> | 2014-10-18 11:37:35 +0800 |
---|---|---|
committer | swills <swills@FreeBSD.org> | 2014-10-18 11:37:35 +0800 |
commit | c51fa8011f70715a4b05dae65be8152f70885380 (patch) | |
tree | ff71c387dfba8a6165e11d3615e91d0b1470e34b /net-p2p | |
parent | 09549e00d5d96cf67f38b53ae622077426ddffcb (diff) | |
download | freebsd-ports-gnome-c51fa8011f70715a4b05dae65be8152f70885380.tar.gz freebsd-ports-gnome-c51fa8011f70715a4b05dae65be8152f70885380.tar.zst freebsd-ports-gnome-c51fa8011f70715a4b05dae65be8152f70885380.zip |
net-p2p/dogecoin: update to 1.8.0
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/dogecoin/Makefile | 83 | ||||
-rw-r--r-- | net-p2p/dogecoin/distinfo | 4 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-makefile_unix-Add_boost-crypto | 11 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-src-util.h | 10 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-src__Makefile.include | 27 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-src__qt__Makefile.am | 12 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-src__scrypt.cpp | 8 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-src__scrypt.h | 6 |
8 files changed, 78 insertions, 83 deletions
diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile index 7a53ad811646..9df2a07bf7a3 100644 --- a/net-p2p/dogecoin/Makefile +++ b/net-p2p/dogecoin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dogecoin -PORTVERSION= 1.5.0 -PORTREVISION= 4 +PORTVERSION= 1.8.0 CATEGORIES= net-p2p finance MAINTAINER= swills@FreeBSD.org @@ -11,6 +10,8 @@ COMMENT= Virtual Peer-to-Peer Currency Client LICENSE= MIT +BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf + LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= GUI UPNP QRCODES @@ -22,83 +23,59 @@ QRCODES_DESC= Build with QR code display USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME} -GH_COMMIT= be94b62 +GH_COMMIT= c4209a3 GH_TAGNAME= v${PORTVERSION} -USES= gmake compiler:c++11-lib +USES= gmake compiler:c++11-lib pkgconfig autoreconf +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-incompatible-bdb \ + SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \ + CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto" +CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" USE_OPENSSL= yes USE_BDB= yes -WANT_BDB_VER= 48 +WANT_BDB_VER= 5 + +CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \ + -L${LOCALBASE}/lib -L${BDB_LIB_DIR} -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} -CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} -CXXFLAGS+= -Wno-invalid-offsetof +PLIST_FILES= bin/dogecoind bin/dogecoin-cli .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile -.endif +#.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile +#.endif -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) -USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build -BINARY= dogecoin-qt -.else -BINARY= dogecoind -ALL_TARGET= ${BINARY} test -MAKE_ARGS+= -C ${WRKSRC}/src +GUI_CONFIGURE_ENABLE= gui +.if ${PORT_OPTIONS:MGUI} +USE_QT4= corelib network gui qmake_build linguist_build uic_build moc_build rcc_build dbus +PLIST_FILES+= share/applications/dogecoin-qt.desktop \ + share/pixmaps/dogecoin64.png \ + bin/dogecoin-qt .endif +QRCODES_CONFIGURE_ENABLE= qrencode .if ${PORT_OPTIONS:MQRCODES} LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode -QMAKE_USE_QRCODE=1 -.else -QMAKE_USE_QRCODE=0 .endif -PLIST_FILES= bin/${BINARY} - +UPNP_CONFIGURE_ENABLE= miniupnpc .if ${PORT_OPTIONS:MUPNP} LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -QMAKE_USE_UPNP= 1 -.else -QMAKE_USE_UPNP= - .endif SUB_FILES+= dogecoin-qt.desktop .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) -PLIST_FILES+= share/applications/dogecoin-qt.desktop share/pixmaps/dogecoin64.png -.endif - -post-patch: -.if !${PORT_OPTIONS:MGUI} || defined(WITHOUT_X11) - @cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile - @${REINPLACE_CMD} \ - -e 's|^USE_UPNP.*$$|USE_UPNP=${QMAKE_USE_UPNP}|' \ - -e 's|-l pthread|${PTHREAD_LIBS}|g' \ - -e 's:-l dl::' \ - ${WRKSRC}/src/Makefile -.endif - -do-configure: -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) - cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \ - QMAKE_LRELEASE=${LRELEASE} INCLUDEPATH=${BDB_INCLUDE_DIR} \ - QMAKE_LIBDIR+=${BDB_LIB_DIR} dogecoin-qt.pro -.endif - do-install: - @${MKDIR} ${PREFIX}/bin -.if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) - ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/dogecoind ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/dogecoin-cli ${STAGEDIR}${PREFIX}/bin/ +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_PROGRAM} ${WRKSRC}/src/qt/dogecoin-qt ${STAGEDIR}${PREFIX}/bin/ ${INSTALL} ${WRKDIR}/dogecoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png ${STAGEDIR}${PREFIX}/share/pixmaps/dogecoin64.png -.else - ${INSTALL_PROGRAM} ${WRKSRC}/src/${BINARY} ${STAGEDIR}${PREFIX}/bin/ .endif .include <bsd.port.post.mk> diff --git a/net-p2p/dogecoin/distinfo b/net-p2p/dogecoin/distinfo index 6cc37b37ec76..1f8279ade49c 100644 --- a/net-p2p/dogecoin/distinfo +++ b/net-p2p/dogecoin/distinfo @@ -1,2 +1,2 @@ -SHA256 (dogecoin-1.5.0.tar.gz) = 43832d6a147471b759599b4dd080b88ed4d39c119231129d1febd2f1e991cf06 -SIZE (dogecoin-1.5.0.tar.gz) = 3509184 +SHA256 (dogecoin-1.8.0.tar.gz) = 8eb2d30175cda6065f9dc8e2b6a937eb0e638119fec3966ed3ec0afa87743680 +SIZE (dogecoin-1.8.0.tar.gz) = 8049394 diff --git a/net-p2p/dogecoin/files/patch-makefile_unix-Add_boost-crypto b/net-p2p/dogecoin/files/patch-makefile_unix-Add_boost-crypto deleted file mode 100644 index fb6aca794a71..000000000000 --- a/net-p2p/dogecoin/files/patch-makefile_unix-Add_boost-crypto +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur ../bitcoin-bitcoin-18c9239.orig/src/makefile.unix ./src/makefile.unix ---- ../bitcoin-bitcoin-18c9239.orig/src/makefile.unix 2013-05-24 22:50:15.000000000 +1000 -+++ ./src/makefile.unix 2013-05-24 22:52:34.000000000 +1000 -@@ -38,6 +38,7 @@ - -l boost_filesystem$(BOOST_LIB_SUFFIX) \ - -l boost_program_options$(BOOST_LIB_SUFFIX) \ - -l boost_thread$(BOOST_LIB_SUFFIX) \ -+ -l boost_chrono$(BOOST_LIB_SUFFIX) \ - -l db_cxx$(BDB_LIB_SUFFIX) \ - -l ssl \ - -l crypto diff --git a/net-p2p/dogecoin/files/patch-src-util.h b/net-p2p/dogecoin/files/patch-src-util.h deleted file mode 100644 index 0a51f8c3f409..000000000000 --- a/net-p2p/dogecoin/files/patch-src-util.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/util.h.orig 2013-12-31 20:53:22.000000000 +0000 -+++ src/util.h 2013-12-31 20:53:40.000000000 +0000 -@@ -18,6 +18,7 @@ - #include <map> - #include <vector> - #include <string> -+#include <cstdarg> - - #include <boost/thread.hpp> - #include <boost/filesystem.hpp> diff --git a/net-p2p/dogecoin/files/patch-src__Makefile.include b/net-p2p/dogecoin/files/patch-src__Makefile.include new file mode 100644 index 000000000000..d70d9cde2d49 --- /dev/null +++ b/net-p2p/dogecoin/files/patch-src__Makefile.include @@ -0,0 +1,27 @@ +--- src/Makefile.include.orig 2014-10-13 01:51:55.000000000 +0000 ++++ src/Makefile.include 2014-10-13 01:53:22.000000000 +0000 +@@ -41,18 +41,18 @@ + ui_%.h: %.ui + @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) + @test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@ +- $(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,} +- $(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,} ++ $(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@ ++ $(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@.n $(abs_builddir)/$@ + + %.moc: %.cpp + QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< +- $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,} +- $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,} ++ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@ ++ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $@ + + moc_%.cpp: %.h + QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< +- $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,} +- $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,} ++ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@ ++ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $@ + + %.qm: %.ts + @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) diff --git a/net-p2p/dogecoin/files/patch-src__qt__Makefile.am b/net-p2p/dogecoin/files/patch-src__qt__Makefile.am new file mode 100644 index 000000000000..80094b4da4cd --- /dev/null +++ b/net-p2p/dogecoin/files/patch-src__qt__Makefile.am @@ -0,0 +1,12 @@ +--- src/qt/Makefile.am.orig 2014-10-13 01:49:25.000000000 +0000 ++++ src/qt/Makefile.am 2014-10-13 01:50:00.000000000 +0000 +@@ -382,7 +382,7 @@ + $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(RES_FONTS) $(PROTOBUF_H) + @cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \ + echo error: could not build $@ +- $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,} +- $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,} ++ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@.n $@ ++ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $@ + + CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno diff --git a/net-p2p/dogecoin/files/patch-src__scrypt.cpp b/net-p2p/dogecoin/files/patch-src__scrypt.cpp index 4bb49b8a7ffd..a7ba62513a87 100644 --- a/net-p2p/dogecoin/files/patch-src__scrypt.cpp +++ b/net-p2p/dogecoin/files/patch-src__scrypt.cpp @@ -1,6 +1,6 @@ ---- ./src/scrypt.cpp.orig 2014-01-10 01:38:53.000000000 +0000 -+++ ./src/scrypt.cpp 2014-02-09 05:45:03.131006405 +0000 -@@ -33,6 +33,7 @@ +--- src/scrypt.cpp.orig 2014-08-24 15:09:34 UTC ++++ src/scrypt.cpp +@@ -35,6 +35,7 @@ #include <stdint.h> #include <string.h> #include <openssl/sha.h> @@ -8,7 +8,7 @@ #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) #ifdef _MSC_VER -@@ -44,22 +45,6 @@ +@@ -46,22 +47,6 @@ #endif #endif diff --git a/net-p2p/dogecoin/files/patch-src__scrypt.h b/net-p2p/dogecoin/files/patch-src__scrypt.h index f66841aa2886..cd76590bd952 100644 --- a/net-p2p/dogecoin/files/patch-src__scrypt.h +++ b/net-p2p/dogecoin/files/patch-src__scrypt.h @@ -1,6 +1,6 @@ ---- ./src/scrypt.h.orig 2014-01-10 01:38:53.000000000 +0000 -+++ ./src/scrypt.h 2014-02-09 05:45:03.133009188 +0000 -@@ -27,19 +27,4 @@ +--- src/scrypt.h.orig 2014-08-24 15:09:34 UTC ++++ src/scrypt.h +@@ -29,19 +29,4 @@ 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); |