- Moved ports to Uses/lazarus.mk

- Add FLAVORS

Approved by:	portmgr
Differential Revision:	https://reviews.freebsd.org/D14661

3 files changed, 27 insertions, 25 deletions

diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 460d3d2736fa..10f99a86a790 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -3,22 +3,22 @@
 
 PORTNAME=	cqrlog
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms hamradio
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus
-PATCH_DEPENDS=	${LAZARUS_DIR}/tools/lazres:editors/lazarus
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
 
-USES=		fpc shebangfix
+USES=		fpc lazarus:flavors shebangfix
 SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
 		voice_keyer/voice_keyer.sh
   
@@ -28,23 +28,18 @@ USE_FPC=	cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \
 
 ALL_TARGET=	${PORTNAME}
 
-LAZARUS_VER=	1.8.0
-LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
-
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4
-OPTIONS_DEFAULT=	GTK2
+MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
+		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
+		LCL_PLATFORM="${LCL_PLATFORM}" \
+		LAZARUS_DIR="${LAZARUS_DIR}"
 
 USE_XORG+=	x11
-USE_GNOME+=	gdkpixbuf2 cairo
-
-GTK2_USE=	fpc=gtk2 gnome=gtk20
-GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2
-GTK2_MAKE_ARGS=	PLATFORM=gtk2
+NO_LAZBUILD=	yes
+LAZBUILD_ARGS=	-d --pcp=.
+LAZARUS_NO_FLAVORS=qt5
 
-QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
-QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:editors/lazarus-lcl-qt
-QT4_MAKE_ARGS=	PLATFORM=qt
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
@@ -67,8 +62,6 @@ post-patch:
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!Linux!FreeBSD!g \
 		${WRKSRC}/src/fMain.lfm
-	${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
-		${WRKSRC}/Makefile
 	${RM} -r ${WRKSRC}/src/mysql
 
 .include <bsd.port.mk>
diff --git a/comms/cqrlog/files/patch-Makefile b/comms/cqrlog/files/patch-Makefile
index ae8aba6e1e30..9a416e65af13 100644
--- a/comms/cqrlog/files/patch-Makefile
+++ b/comms/cqrlog/files/patch-Makefile
@@ -2,7 +2,7 @@
 +++ Makefile	2018-01-05 12:34:28.752177000 -0500
 @@ -1,12 +1,13 @@
 -CC=lazbuild
-+CC=lazbuild -d
++LAZBUILD_CMD?=lazbuild -d
  ST=strip
 -datadir  = $(DESTDIR)/usr/share/cqrlog
 -bindir   = $(DESTDIR)/usr/bin
@@ -15,7 +15,7 @@
  
  cqrlog: src/cqrlog.lpi
 -	$(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
-+	$(CC) --pcp=. --ws=${PLATFORM} src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%%
++	$(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) src/cqrlog.lpi
  	$(ST) src/cqrlog
  	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
  
diff --git a/comms/cqrlog/files/patch-src_cqrlog.lpi b/comms/cqrlog/files/patch-src_cqrlog.lpi
index 9c5f05f40149..a4b488c18152 100644
--- a/comms/cqrlog/files/patch-src_cqrlog.lpi
+++ b/comms/cqrlog/files/patch-src_cqrlog.lpi
@@ -1,11 +1,20 @@
---- src/cqrlog.lpi.orig	2016-04-20 16:06:15 UTC
-+++ src/cqrlog.lpi
-@@ -32,7 +32,7 @@
+--- src/cqrlog.lpi.orig	2017-12-30 02:10:01.000000000 -0500
++++ src/cqrlog.lpi	2018-04-07 19:17:15.225110000 -0500
+@@ -35,7 +35,7 @@
        <local>
          <FormatVersion Value="1"/>
          <CommandLineParams Value="--DEBUG=1"/>
 -        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
-+        <LaunchingApplication PathPlusParams="%%LOCALBASE%%/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
++        <LaunchingApplication PathPlusParams="/usr/local/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
        </local>
        <environment>
          <UserOverrides Count="2">
+@@ -748,7 +748,7 @@
+     <Version Value="11"/>
+     <SearchPaths>
+       <Libraries Value="$(LazarusDir)/lcl"/>
+-      <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;synapse"/>
++      <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;richmemo/qt;synapse"/>
+     </SearchPaths>
+     <Parsing>
+       <SyntaxOptions>