Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Feb 2021 02:29:01 +0000
From:      Alexey Dokuchaev <danfe@freebsd.org>
To:        Adriaan de Groot <adridg@freebsd.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r566427 - in head: Mk/Uses devel/qt5/files
Message-ID:  <20210224022901.GA3306@FreeBSD.org>
In-Reply-To: <202102232011.11NKBuTB080164@repo.freebsd.org>
References:  <202102232011.11NKBuTB080164@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Feb 23, 2021 at 08:11:56PM +0000, Adriaan de Groot wrote:
> New Revision: 566427
> URL: https://svnweb.freebsd.org/changeset/ports/566427
> 
> Log:
>   Re-work Qt5 install- and deinstall scripts.
>   
> ...
> Modified: head/Mk/Uses/qt-dist.mk
> ==============================================================================
> --- head/Mk/Uses/qt-dist.mk	Tue Feb 23 20:07:56 2021	(r566426)
> +++ head/Mk/Uses/qt-dist.mk	Tue Feb 23 20:11:56 2021	(r566427)
> @@ -196,11 +196,9 @@ QT_DEFINES?=		# For qconfig.h flags (without "QT_" pre
>  QT_CONFIG?=		# For *.pri files QT_CONFIG flags.
>  .  if ${QT_DEFINES}
>  QMAKE_ARGS+=		DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
> -.    if ${QT_DEFINES:N-*}
> -# Use a script to cleanup qconfig-modules.h (see qt-post-install).
> -PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
> -.    endif
>  .  endif #  ${QT_DEFINES}
> +PKGDEINSTALL=		${WRKDIR}/pkg-install
> +PKGINSTALL=		${WRKDIR}/pkg-deinstall

If these assignments are correct, it probably makes sense to add a comment
as to why they are swapped.

./danfe



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