Retire CLANG_NO_VALUE_PROPAGATION_PASS. CVP has been fixed in LLVM to

require much less memory.

4 files changed, 2 insertions, 35 deletions

diff --git a/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile
index 546b7acae5f..2378dc04bac 100644
--- a/print/scribus-qt4/Makefile
+++ b/print/scribus-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/05/19 13:29:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.46 2017/07/11 19:41:20 joerg Exp $
 
 DISTNAME=		scribus-1.4.3
 PKGREVISION=		9
@@ -24,11 +24,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 1.4.3
 
 INSTALLATION_DIRS+=	share/pixmaps
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CMAKE_ARGS+=	-DCLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/icons/scribus.png \
 		${DESTDIR}${PREFIX}/share/pixmaps
diff --git a/print/scribus-qt4/distinfo b/print/scribus-qt4/distinfo
index cec70d3c86a..07a690dc08e 100644
--- a/print/scribus-qt4/distinfo
+++ b/print/scribus-qt4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/04/21 09:34:12 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2017/07/11 19:41:20 joerg Exp $
 
 SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71
 RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650
@@ -10,5 +10,3 @@ SHA1 (patch-ai) = 6616ce472b9fa7d8aa9bc3677ac5b25799222816
 SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b
 SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881
 SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b
-SHA1 (patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt) = b0fa6cabcbcdc46d2a662df313b02f61f4926d2b
-SHA1 (patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt) = 5d7ee482d4afd8acf2c3741f2660539069c5d5cc
diff --git a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt b/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
deleted file mode 100644
index cbb9b60f5dd..00000000000
--- a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt,v 1.1 2013/12/15 19:44:02 joerg Exp $
-
---- scribus/plugins/fileloader/scribus134format/CMakeLists.txt.orig	2013-12-14 22:12:14.000000000 +0000
-+++ scribus/plugins/fileloader/scribus134format/CMakeLists.txt
-@@ -14,6 +14,8 @@ scribus134format_save.cpp
- scribus134formatimpl.cpp
- )
- 
-+SET_SOURCE_FILES_PROPERTIES(scribus134format.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}")
-+
- SET(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
- 
- QT4_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
diff --git a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt b/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt
deleted file mode 100644
index e181ce0245f..00000000000
--- a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt,v 1.1 2015/06/17 20:46:51 joerg Exp $
-
---- scribus/plugins/fileloader/scribus13format/CMakeLists.txt.orig	2015-06-17 20:04:41.000000000 +0000
-+++ scribus/plugins/fileloader/scribus13format/CMakeLists.txt
-@@ -13,6 +13,8 @@ scribus13format.cpp
- scribus13formatimpl.cpp
- )
- 
-+SET_SOURCE_FILES_PROPERTIES(scribus13format.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}")
-+
- SET(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format")
- 
- QT4_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})