From 31b45299d7911297a239175d90a6b22885713c9e Mon Sep 17 00:00:00 2001 From: acm Date: Tue, 7 Aug 2018 07:44:47 +0000 Subject: - Move flavor helpers to right place Suggested by: mat --- editors/picpas/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'editors') diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile index 8760294e69aa..df636f1791f6 100644 --- a/editors/picpas/Makefile +++ b/editors/picpas/Makefile @@ -11,6 +11,10 @@ COMMENT= Multi-platform Pascal for Microchip PIC16F microcontrollers 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 @@ -33,10 +37,6 @@ 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 -- cgit