diff options
author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2017-10-07 02:39:06 +0000 |
---|---|---|
committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2017-10-07 02:39:06 +0000 |
commit | adacf49f05205099259c90f67d323e018e4a2a3f (patch) | |
tree | 0f5ff27873f1d56ee2be71c066aa81ebc864967a | |
parent | Remove the two gets() calls and replace with fgets() (diff) |
- Update to 1.10.0
- Use a more descriptive comment inspired by a repology.org comparison
- Take maintainership
- Remove extra newline from pkg-descr
- Make better use of options helper
- Update GUI option to use qt5 framework instead of qt4
- Provide an option to build with additional cli utils
Approved by: swills (maintainer)
Notes
Notes:
svn path=/head/; revision=451424
-rw-r--r-- | net-p2p/dogecoin/Makefile | 92 | ||||
-rw-r--r-- | net-p2p/dogecoin/distinfo | 5 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/extra-patch-src__leveldb__Makefile | 20 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-configure.ac | 13 | ||||
-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_crypto_scrypt.cpp (renamed from net-p2p/dogecoin/files/patch-src__scrypt.cpp) | 8 | ||||
-rw-r--r-- | net-p2p/dogecoin/files/patch-src_crypto_scrypt.h (renamed from net-p2p/dogecoin/files/patch-src__scrypt.h) | 6 | ||||
-rw-r--r-- | net-p2p/dogecoin/pkg-descr | 1 | ||||
-rw-r--r-- | net-p2p/dogecoin/pkg-plist | 12 |
10 files changed, 75 insertions, 121 deletions
diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile index ac5c2c733915..3b5c9e594cd3 100644 --- a/net-p2p/dogecoin/Makefile +++ b/net-p2p/dogecoin/Makefile @@ -2,78 +2,66 @@ # $FreeBSD$ PORTNAME= dogecoin -PORTVERSION= 1.8.2 +PORTVERSION= 1.10.0 DISTVERSIONPREFIX= v -PORTREVISION= 9 CATEGORIES= net-p2p finance -MAINTAINER= swills@FreeBSD.org -COMMENT= Virtual Peer-to-Peer Currency Client +MAINTAINER= ehaupt@FreeBSD.org +COMMENT= P2P crypto currency client favored by shiba inus worldwide LICENSE= MIT -BUILD_DEPENDS= protoc:devel/protobuf -LIB_DEPENDS= libboost_date_time.so:devel/boost-libs - NOT_FOR_ARCHS= powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to configure: "Big Endian not supported" -OPTIONS_DEFINE= GUI UPNP QRCODES -OPTIONS_DEFAULT= GUI QRCODES - -GUI_DESC= Build as a QT4 GUI -UPNP_DESC= Build with UPNP support -QRCODES_DESC= Build with QR code display +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libprotobuf.so:devel/protobuf +USES= autoreconf bdb compiler:gcc-c++11-lib gmake libtool \ + localbase:ldconfig pkgconfig ssl USE_GITHUB= yes - -USES= bdb:5 gmake compiler:c++11-lib pkgconfig autoreconf ssl +USE_LDCONFIG= yes 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}" +OPTIONS_SUB= yes -CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \ - -L${LOCALBASE}/lib -L${BDB_LIB_DIR} +OPTIONS_DEFINE= GUI UPNP UTILS QRCODES +OPTIONS_DEFAULT=GUI UPNP UTILS QRCODES -PLIST_FILES= bin/dogecoind bin/dogecoin-cli +GUI_DESC= Build as a QT5 GUI +UPNP_DESC= Build with UPNP support +UTILS_DESC= Build with additional cli utils +QRCODES_DESC= Build with QR code display + +CONFIGURE_ARGS+= --with-incompatible-bdb --disable-tests -.include <bsd.port.options.mk> +GUI_CONFIGURE_ARGS= --with-gui=qt5 +GUI_CONFIGURE_OFF= --with-gui=no +GUI_USE= QT5=buildtools,core,dbus,gui,linguist_build,network,printsupport,testlib,widgets +GUI_USES= desktop-file-utils -#.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__leveldb__Makefile -#.endif +QRCODES_CONFIGURE_WITH= qrencode +QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode -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 +UPNP_CONFIGURE_WITH= miniupnpc +UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc -QRCODES_CONFIGURE_ENABLE= qrencode -.if ${PORT_OPTIONS:MQRCODES} -LIB_DEPENDS+= libqrencode.so:graphics/libqrencode -.endif +UTILS_CONFIGURE_WITH= utils + +CONFIGURE_ENV= SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \ + CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto" -UPNP_CONFIGURE_ENABLE= miniupnpc -.if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= libminiupnpc.so:net/miniupnpc -.endif +CXXFLAGS+= -I${BDB_INCLUDE_DIR} +LDFLAGS+= -L${BDB_LIB_DIR} -SUB_FILES+= dogecoin-qt.desktop +SUB_FILES= dogecoin-qt.desktop -.include <bsd.port.pre.mk> +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbitcoinconsensus.so.0.0.0 -do-install: - ${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 -.endif +post-install-GUI-on: + ${INSTALL} ${WRKDIR}/dogecoin-qt.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/dogecoin64.png -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/dogecoin/distinfo b/net-p2p/dogecoin/distinfo index 8513a2d23483..cfee3a405345 100644 --- a/net-p2p/dogecoin/distinfo +++ b/net-p2p/dogecoin/distinfo @@ -1,2 +1,3 @@ -SHA256 (dogecoin-dogecoin-v1.8.2_GH0.tar.gz) = 87060dfe6d9770f8af17c447120cb6a059bbd84687dfd6a1f0787c9d75d75d9e -SIZE (dogecoin-dogecoin-v1.8.2_GH0.tar.gz) = 8280103 +TIMESTAMP = 1507273829 +SHA256 (dogecoin-dogecoin-v1.10.0_GH0.tar.gz) = e392f4142819fdab313ba921af53fdbd2cf6ee8965d237d0cb5cda8a52c97084 +SIZE (dogecoin-dogecoin-v1.10.0_GH0.tar.gz) = 6537709 diff --git a/net-p2p/dogecoin/files/extra-patch-src__leveldb__Makefile b/net-p2p/dogecoin/files/extra-patch-src__leveldb__Makefile deleted file mode 100644 index dfe8b2cc4009..000000000000 --- a/net-p2p/dogecoin/files/extra-patch-src__leveldb__Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- src/leveldb/Makefile.orig 2014-02-01 18:59:21.000000000 +0000 -+++ src/leveldb/Makefile 2014-02-01 18:59:30.000000000 +0000 -@@ -98,7 +98,7 @@ - - $(LIBRARY): $(LIBOBJECTS) - rm -f $@ -- $(AR) -rs $@ $(LIBOBJECTS) -+ $(AR) -s $@ $(LIBOBJECTS) - - db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) - $(CXX) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS) -@@ -174,7 +174,7 @@ - - $(MEMENVLIBRARY) : $(MEMENVOBJECTS) - rm -f $@ -- $(AR) -rs $@ $(MEMENVOBJECTS) -+ $(AR) -s $@ $(MEMENVOBJECTS) - - memenv_test : helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) - $(CXX) $(LDFLAGS) helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) -o $@ $(LIBS) diff --git a/net-p2p/dogecoin/files/patch-configure.ac b/net-p2p/dogecoin/files/patch-configure.ac new file mode 100644 index 000000000000..ca19633a5370 --- /dev/null +++ b/net-p2p/dogecoin/files/patch-configure.ac @@ -0,0 +1,13 @@ +--- configure.ac.orig 2015-10-31 14:49:41 UTC ++++ configure.ac +@@ -417,8 +417,8 @@ if test x$use_hardening != xno; then + + if test x$TARGET_OS != xwindows; then + # All windows code is PIC, forcing it on just adds useless compile warnings +- AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"]) +- AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"]) ++ AX_CHECK_COMPILE_FLAG([-fPIC],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIC"]) ++ AX_CHECK_LINK_FLAG([[-pic]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pic"]) + fi + + case $host in diff --git a/net-p2p/dogecoin/files/patch-src__Makefile.include b/net-p2p/dogecoin/files/patch-src__Makefile.include deleted file mode 100644 index d70d9cde2d49..000000000000 --- a/net-p2p/dogecoin/files/patch-src__Makefile.include +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 deleted file mode 100644 index 80094b4da4cd..000000000000 --- a/net-p2p/dogecoin/files/patch-src__qt__Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- 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_crypto_scrypt.cpp index a7ba62513a87..bbac88afd841 100644 --- a/net-p2p/dogecoin/files/patch-src__scrypt.cpp +++ b/net-p2p/dogecoin/files/patch-src_crypto_scrypt.cpp @@ -1,6 +1,6 @@ ---- src/scrypt.cpp.orig 2014-08-24 15:09:34 UTC -+++ src/scrypt.cpp -@@ -35,6 +35,7 @@ +--- src/crypto/scrypt.cpp.orig 2015-10-31 14:49:41 UTC ++++ src/crypto/scrypt.cpp +@@ -33,6 +33,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 -@@ -46,22 +47,6 @@ +@@ -44,22 +45,6 @@ #endif #endif diff --git a/net-p2p/dogecoin/files/patch-src__scrypt.h b/net-p2p/dogecoin/files/patch-src_crypto_scrypt.h index cd76590bd952..a0ce6ef3d780 100644 --- a/net-p2p/dogecoin/files/patch-src__scrypt.h +++ b/net-p2p/dogecoin/files/patch-src_crypto_scrypt.h @@ -1,6 +1,6 @@ ---- src/scrypt.h.orig 2014-08-24 15:09:34 UTC -+++ src/scrypt.h -@@ -29,19 +29,4 @@ +--- src/crypto/scrypt.h.orig 2015-10-31 14:49:41 UTC ++++ src/crypto/scrypt.h +@@ -27,19 +27,4 @@ void 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); diff --git a/net-p2p/dogecoin/pkg-descr b/net-p2p/dogecoin/pkg-descr index 0b7d7abeda6c..a862622709d1 100644 --- a/net-p2p/dogecoin/pkg-descr +++ b/net-p2p/dogecoin/pkg-descr @@ -1,5 +1,4 @@ Dogecoin is an open source peer-to-peer cryptocurrency, favored by Shiba Inus worldwide. - WWW: http://dogecoin.com/ diff --git a/net-p2p/dogecoin/pkg-plist b/net-p2p/dogecoin/pkg-plist new file mode 100644 index 000000000000..d1bebdcfdaa6 --- /dev/null +++ b/net-p2p/dogecoin/pkg-plist @@ -0,0 +1,12 @@ +%%UTILS%%bin/dogecoin-cli +%%GUI%%bin/dogecoin-qt +%%UTILS%%bin/dogecoin-tx +bin/dogecoind +include/bitcoinconsensus.h +lib/libbitcoinconsensus.a +lib/libbitcoinconsensus.so +lib/libbitcoinconsensus.so.0 +lib/libbitcoinconsensus.so.0.0.0 +libdata/pkgconfig/libbitcoinconsensus.pc +%%GUI%%share/applications/dogecoin-qt.desktop +%%GUI%%share/pixmaps/dogecoin64.png |