From owner-svn-ports-head@freebsd.org  Tue Aug  7 07:44:49 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
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 1326C10508E9;
 Tue,  7 Aug 2018 07:44:49 +0000 (UTC) (envelope-from acm@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id AA4E581D9C;
 Tue,  7 Aug 2018 07:44:48 +0000 (UTC) (envelope-from acm@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 8647D18E73;
 Tue,  7 Aug 2018 07:44:48 +0000 (UTC) (envelope-from acm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w777ima8051525;
 Tue, 7 Aug 2018 07:44:48 GMT (envelope-from acm@FreeBSD.org)
Received: (from acm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w777imts051524;
 Tue, 7 Aug 2018 07:44:48 GMT (envelope-from acm@FreeBSD.org)
Message-Id: <201808070744.w777imts051524@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org
 using -f
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Tue, 7 Aug 2018 07:44:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r476575 - head/editors/picpas
X-SVN-Group: ports-head
X-SVN-Commit-Author: acm
X-SVN-Commit-Paths: head/editors/picpas
X-SVN-Commit-Revision: 476575
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2018 07:44:49 -0000

Author: acm
Date: Tue Aug  7 07:44:47 2018
New Revision: 476575
URL: https://svnweb.freebsd.org/changeset/ports/476575

Log:
  - Move flavor helpers to right place
  
  Suggested by:	mat

Modified:
  head/editors/picpas/Makefile

Modified: head/editors/picpas/Makefile
==============================================================================
--- head/editors/picpas/Makefile	Tue Aug  7 07:39:47 2018	(r476574)
+++ head/editors/picpas/Makefile	Tue Aug  7 07:44:47 2018	(r476575)
@@ -11,6 +11,10 @@ COMMENT=	Multi-platform Pascal for Microchip PIC16F mi
 
 LICENSE=	GPLv2
 
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
+
 USES=		dos2unix fpc lazarus:flavors
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
 		rtl-objpas x11
@@ -32,10 +36,6 @@ USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
-
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
-qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
 
 LAZARUS_PROJECT_FILES=	Source/PicPas.lpi
 LAZBUILD_ARGS=		-d