Index: head/comms/cqrlog/Makefile
===================================================================
--- head/comms/cqrlog/Makefile	(revision 376732)
+++ head/comms/cqrlog/Makefile	(revision 376733)
@@ -1,49 +1,65 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cqrlog
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	shurd
 DISTNAME=	${PORTNAME}_${PORTVERSION}.src
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
 LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_FPC=	gtk2
+USE_FPC=	yes
+WANT_GNOME=	yes
 ALL_TARGET=	${PORTNAME}
 
-GETLAZDIR=	${AWK} '/cd .* .* exit/ { print $$2 }' ${LOCALBASE}/bin/lazarus
+LAZARUS_VER=    1.2.6
+LAZARUS_DIR=    ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 
-pre-build:
-	${REINPLACE_CMD} -e s!%%LAZSHAREDIR%%!`${GETLAZDIR}`!g \
-		${WRKSRC}/environmentoptions.xml
-	# We're basically copying the entire editors/lazarus
-	# port into WRKSRC since lazbuild modifies all sorts
-	# of files in the lazarus dir during builds.
-	${CP} -R `${GETLAZDIR}` ${WRKSRC}/lazdir
-	${CHMOD} -R u+w ${WRKSRC}/lazdir
+OPTIONS_SINGLE=		LCL
+OPTIONS_SINGLE_LCL=	GTK2 QT4
+OPTIONS_DEFAULT=	GTK2
 
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MGTK2}
+USE_FPC+=	gtk2
+USE_GNOME=	gtk20
+LCL_PLATFORM=	gtk2
+BUILD_DEPENDS+=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+.endif
+
+.if ${PORT_OPTIONS:MQT4}
+LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+LCL_PLATFORM=	qt
+BUILD_DEPENDS+=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+.endif
+
 post-patch:
 	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \
-		-e s!%%WRKSRC%%!${WRKSRC}!g \
+		-e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
 		${FILESDIR}/environmentoptions.xml.in \
 		> ${WRKSRC}/environmentoptions.xml
 	${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/dUtils.pas \
 		${WRKSRC}/src/fLoTWExport.pas ${WRKSRC}/src/fPreferences.pas \
 		${WRKSRC}/src/fRotControl.pas ${WRKSRC}/src/fTRXControl.pas \
 		${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!%%PREFIX%%!${PREFIX}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
+	${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
+		-e s!%%LCL_PLATFORM%%!${LCL_PLATFORM}!g \
+		${WRKSRC}/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/comms/cqrlog/files/environmentoptions.xml.in
===================================================================
--- head/comms/cqrlog/files/environmentoptions.xml.in	(revision 376732)
+++ head/comms/cqrlog/files/environmentoptions.xml.in	(revision 376733)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <EnvironmentOptions>
-    <LazarusDirectory Value="%%WRKSRC%%/lazdir"/>
+    <LazarusDirectory Value="%%LAZARUSDIR%%"/>
     <MakeFilename Value="%%MAKE_CMD%%"/>
     <CompilerFilename Value="%%LOCALBASE%%/bin/fpc"/>
   </EnvironmentOptions>
 </CONFIG>
Index: head/comms/cqrlog/files/patch-Makefile
===================================================================
--- head/comms/cqrlog/files/patch-Makefile	(revision 376732)
+++ head/comms/cqrlog/files/patch-Makefile	(revision 376733)
@@ -1,37 +1,38 @@
---- Makefile.orig	2014-04-13 05:14:38.000000000 -0700
-+++ Makefile	2014-07-01 04:04:04.000000000 -0700
+--- Makefile	2014-10-03 14:37:57.000000000 -0500
++++ Makefile	2015-01-10 21:44:03.000000000 -0500
 @@ -1,11 +1,12 @@
- CC=lazbuild
+-CC=lazbuild
++CC=lazbuild -d
  ST=strip
 -datadir  = $(DESTDIR)/usr/share/cqrlog
 -bindir   = $(DESTDIR)/usr/bin
 -sharedir = $(DESTDIR)/usr/share
 +datadir  = $(DESTDIR)${PREFIX}/share/cqrlog
 +bindir   = $(DESTDIR)${PREFIX}/bin
 +sharedir = $(DESTDIR)${PREFIX}/share
 +mandir   = $(DESTDIR)${PREFIX}
  
  cqrlog: src/cqrlog.lpi
 -	$(CC) --ws=gtk2 src/cqrlog.lpi
-+	$(CC) --pcp=. --ws=gtk2 src/cqrlog.lpi
++	$(CC) --pcp=. --ws=%%LCL_PLATFORM%% src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%%
  	$(ST) src/cqrlog
  	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
  
 @@ -29,7 +30,7 @@
  	install -d -v         $(sharedir)/pixmaps/cqrlog
  	install -d -v         $(sharedir)/icons
  	install -d -v         $(sharedir)/applications
 -	install -d -v         $(sharedir)/man/man1
 +	install -d -v         $(mandir)/man/man1
  	install    -v -m 0755 src/cqrlog $(bindir)
  	install    -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix
  	install    -v -m 0644 ctyfiles/* $(datadir)/ctyfiles/
 @@ -46,7 +47,7 @@
  	install    -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
  	install    -v -m 0644 images/cqrlog.png $(sharedir)/icons/cqrlog.png  
  	install    -v -m 0644 src/changelog.html $(datadir)/changelog.html
 -	install    -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz
 +	install    -v -m 0644 tools/cqrlog.1.gz $(mandir)/man/man1/cqrlog.1.gz
  deb:
  	dpkg-buildpackage -rfakeroot -i -I
  deb_src: