From c36e756587a215ce43d318cd5da41c7cb458786a Mon Sep 17 00:00:00 2001
From: pgollucci <pgollucci@FreeBSD.org>
Date: Wed, 15 Jul 2015 20:59:19 +0000
Subject: net-p2p/zetacoin: cleanup

- Remove Qt build tools from runtime dependencies;
- Use qt4-linguisttools instead of qt4-linguist;
- Add explicit dependency on qt4-network;
- Regen patches.

PR:                  201024
Submitted by:        s3erios@gmail.com
Approved by:         bradleythughes (maintainer)
---
 net-p2p/zetacoin/Makefile                          |  3 ++-
 .../patch-Makefile_include_editSedCommands.patch   | 29 ----------------------
 .../patch-qt_makefile_am_editSedCommands.patch     | 14 -----------
 net-p2p/zetacoin/files/patch-src_Makefile.include  | 27 ++++++++++++++++++++
 net-p2p/zetacoin/files/patch-src_qt_Makefile.am    | 12 +++++++++
 5 files changed, 41 insertions(+), 44 deletions(-)
 delete mode 100644 net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch
 delete mode 100644 net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch
 create mode 100644 net-p2p/zetacoin/files/patch-src_Makefile.include
 create mode 100644 net-p2p/zetacoin/files/patch-src_qt_Makefile.am

(limited to 'net-p2p')

diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index 33e1cad09e4a..b487efa32893 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -34,7 +34,8 @@ X11_CONFIGURE_WITH=	gui
 X11_CONFIGURE_ON=	--without-daemon
 X11_CONFIGURE_OFF=	--with-daemon
 X11_BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
-X11_USE=	qt4=corelib,gui,qmake_build,linguist,uic,moc,rcc,qtestlib_build
+X11_USE=	qt4=corelib,network,gui,qmake_build,linguisttools_build \
+		qt4=uic_build,moc_build,rcc_build,qtestlib_build
 X11_USES=	desktop-file-utils
 
 WALLET_CONFIGURE_ENABLE=	wallet
diff --git a/net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch b/net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch
deleted file mode 100644
index 4727e95faeef..000000000000
--- a/net-p2p/zetacoin/files/patch-Makefile_include_editSedCommands.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/Makefile.include b/src/Makefile.include
-index 2fc6cd7..cdd16f5 100644
---- a/src/Makefile.include
-+++ src/Makefile.include
-@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
- 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 $(abs_builddir)/$@
-+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
- 
- 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 $(abs_builddir)/$@
-+	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
- 
- %.qm: %.ts
- 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
diff --git a/net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch b/net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch
deleted file mode 100644
index 8a72618f8aec..000000000000
--- a/net-p2p/zetacoin/files/patch-qt_makefile_am_editSedCommands.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
-index 648971b..97b2ec4 100644
---- a/src/qt/Makefile.am
-+++ src/qt/Makefile.am
-@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
- $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(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/zetacoin/files/patch-src_Makefile.include b/net-p2p/zetacoin/files/patch-src_Makefile.include
new file mode 100644
index 000000000000..0360627faa04
--- /dev/null
+++ b/net-p2p/zetacoin/files/patch-src_Makefile.include
@@ -0,0 +1,27 @@
+--- src/Makefile.include.orig	2014-12-12 22:22:31 UTC
++++ src/Makefile.include
+@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
+ 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 $(abs_builddir)/$@
++	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
+ 
+ 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 $(abs_builddir)/$@
++	$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@.n $(abs_builddir)/$@
+ 
+ %.qm: %.ts
+ 	@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
diff --git a/net-p2p/zetacoin/files/patch-src_qt_Makefile.am b/net-p2p/zetacoin/files/patch-src_qt_Makefile.am
new file mode 100644
index 000000000000..9c9cb0da5ddb
--- /dev/null
+++ b/net-p2p/zetacoin/files/patch-src_qt_Makefile.am
@@ -0,0 +1,12 @@
+--- src/qt/Makefile.am.orig	2014-12-12 22:22:31 UTC
++++ src/qt/Makefile.am
+@@ -373,7 +373,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS
+ $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(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
-- 
cgit