Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jan 2019 13:40:16 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490134 - head/devel/qjson
Message-ID:  <201901131340.x0DDeGgY092453@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <doralitze@chaotikum.org>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901131340.x0DDeGgY092453>