From owner-svn-ports-head@freebsd.org Sun Jan 13 13:40:17 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8886D149A785; Sun, 13 Jan 2019 13:40:17 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 309A07482C; Sun, 13 Jan 2019 13:40:17 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25ADC1C24C; Sun, 13 Jan 2019 13:40:17 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0DDeHHn092455; Sun, 13 Jan 2019 13:40:17 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0DDeGgY092453; Sun, 13 Jan 2019 13:40:16 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201901131340.x0DDeGgY092453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 13 Jan 2019 13:40:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490134 - head/devel/qjson X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/devel/qjson X-SVN-Commit-Revision: 490134 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 309A07482C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2019 13:40:17 -0000 Author: tcberner Date: Sun Jan 13 13:40:16 2019 New Revision: 490134 URL: https://svnweb.freebsd.org/changeset/ports/490134 Log: devel/qjson: fix plist when DOXYGEN is on. - The weird moc* files that were different for the flavors are no longer generated. - Remove them from plist - Remove the SUB for it from the Makefile PR: 234917 Reported by: Leon Dietrich Modified: head/devel/qjson/Makefile head/devel/qjson/pkg-plist Modified: head/devel/qjson/Makefile ============================================================================== --- head/devel/qjson/Makefile Sun Jan 13 12:56:07 2019 (r490133) +++ head/devel/qjson/Makefile Sun Jan 13 13:40:16 2019 (r490134) @@ -27,12 +27,10 @@ EXPIRATION_DATE= 2019-03-15 USES+= qt:4 USE_QT= corelib moc_build qmake_build rcc_build uic_build CMAKE_ON= QT4_BUILD -PLIST_SUB= QT5="@comment " NO_QT5="" . else USES+= compiler:c++11-lang qt:5 USE_QT= core buildtools_build qmake_build CMAKE_OFF= QT4_BUILD -PLIST_SUB= QT5="" NO_QT5="@comment " QT_SUFFIX= -qt5 . endif Modified: head/devel/qjson/pkg-plist ============================================================================== --- head/devel/qjson/pkg-plist Sun Jan 13 12:56:07 2019 (r490133) +++ head/devel/qjson/pkg-plist Sun Jan 13 13:40:16 2019 (r490134) @@ -38,8 +38,6 @@ libdata/pkgconfig/QJson%%QT_SUFFIX%%.pc %%DOXYGEN%%%%DOCSDIR%%/closed.png %%DOXYGEN%%%%DOCSDIR%%/deprecated.html %%DOXYGEN%%%%DOCSDIR%%/dir_68267d1309a1af8e8297ef4c3efbcdba.html -%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/dir_895027ca4f9d4058e881d4f0ac2cb7ea.html -%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/dir_9bd286a0f2175d29a28acdf988d5722e.html %%DOXYGEN%%%%DOCSDIR%%/doc.png %%DOXYGEN%%%%DOCSDIR%%/doxygen.css %%DOXYGEN%%%%DOCSDIR%%/doxygen.png @@ -63,12 +61,6 @@ libdata/pkgconfig/QJson%%QT_SUFFIX%%.pc %%DOXYGEN%%%%DOCSDIR%%/location_8hh_source.html %%DOXYGEN%%%%DOCSDIR%%/menu.js %%DOXYGEN%%%%DOCSDIR%%/menudata.js -%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__parserrunnable_8cpp_source.html -%%NO_QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__parserrunnable_8cxx_source.html -%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__qobjecthelper_8cpp_source.html -%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__serializerrunnable_8cpp_source.html -%%NO_QT5%%%%DOXYGEN%%%%DOCSDIR%%/moc__serializerrunnable_8cxx_source.html -%%QT5%%%%DOXYGEN%%%%DOCSDIR%%/mocs__compilation_8cpp_source.html %%DOXYGEN%%%%DOCSDIR%%/namespaceQJson.html %%DOXYGEN%%%%DOCSDIR%%/namespacemembers.html %%DOXYGEN%%%%DOCSDIR%%/namespacemembers_enum.html