Index: head/comms/cqrlog/Makefile
===================================================================
--- head/comms/cqrlog/Makefile	(revision 486862)
+++ head/comms/cqrlog/Makefile	(revision 486863)
@@ -1,70 +1,71 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cqrlog
 PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USES=		fpc lazarus:flavors shebangfix ssl:run dos2unix mysql
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
 
+LLD_UNSAFE=	yes
 SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
 		voice_keyer/voice_keyer.sh
 USE_FPC=	cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \
 		fcl-registry rtl-extra fcl-xml mysql numlib openssl \
 		pasjpeg regexpr x11
 
 ALL_TARGET=	${PORTNAME}
 
 MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}"
 
 USE_XORG+=	x11
 NO_LAZBUILD=	yes
 LAZBUILD_ARGS=	-d --pcp=.
 LAZARUS_NO_FLAVORS=qt5
 INSTALLS_ICONS=	yes
 DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
 qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
 
 post-patch:
 	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \
 		-e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
 		${FILESDIR}/environmentoptions.xml.in \
 		> ${WRKSRC}/environmentoptions.xml
 	${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		${WRKSRC}/help/cwd.html ${WRKSRC}/help/h1.html \
 		${WRKSRC}/src/cqrlog.lpi ${WRKSRC}/src/dData.pas \
 		${WRKSRC}/src/dUtils.pas \
 		${WRKSRC}/src/fLoTWExport.pas ${WRKSRC}/src/fLoTWExport.lfm \
 		${WRKSRC}/src/fPreferences.pas ${WRKSRC}/src/fRotControl.pas \
 		${WRKSRC}/src/fTRXControl.pas ${WRKSRC}/src/fGrayline.pas \
 		${WRKSRC}/src/fPreferences.lfm ${WRKSRC}/src/fPreferences.pas
 	${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!Linux!FreeBSD!g \
 		${WRKSRC}/src/fMain.lfm
 	${REINPLACE_CMD} -e s!%%OPENSSLLIB%%!${OPENSSLLIB}!g \
 		${WRKSRC}/src/synapse/ssl_openssl_lib.pas
 	${RM} -r ${WRKSRC}/src/mysql
 
 .include <bsd.port.mk>
Index: head/comms/cqrlog/pkg-plist
===================================================================
--- head/comms/cqrlog/pkg-plist	(revision 486862)
+++ head/comms/cqrlog/pkg-plist	(revision 486863)
@@ -1,375 +1,399 @@
 bin/cqrlog
 man/man1/cqrlog.1.gz
 share/appdata/cqrlog.appdata.xml
 share/applications/cqrlog.desktop
 %%DATADIR%%/changelog.html
 %%DATADIR%%/cqrlog-apparmor-fix
 %%DATADIR%%/ctyfiles/Ambiguous.tbl
 %%DATADIR%%/ctyfiles/AreaOK1RR.tbl
 %%DATADIR%%/ctyfiles/CallResolution.tbl
 %%DATADIR%%/ctyfiles/Country.tab
 %%DATADIR%%/ctyfiles/CountryDel.tab
 %%DATADIR%%/ctyfiles/Exceptions.tab
 %%DATADIR%%/ctyfiles/MASTER.SCP
 %%DATADIR%%/ctyfiles/README
 %%DATADIR%%/ctyfiles/eqsl.txt
 %%DATADIR%%/ctyfiles/iota.tbl
 %%DATADIR%%/ctyfiles/lotw1.txt
+%%DATADIR%%/ctyfiles/prop_mode.tab
 %%DATADIR%%/ctyfiles/qslmgr.csv
+%%DATADIR%%/ctyfiles/sat_name.tab
 %%DATADIR%%/ctyfiles/us_states.tab
 %%DATADIR%%/help/contest.html
 %%DATADIR%%/help/cwd.html
+%%DATADIR%%/help/cwh.html
 %%DATADIR%%/help/fldxml.html
 %%DATADIR%%/help/h1.html
 %%DATADIR%%/help/h20.html
 %%DATADIR%%/help/h21.html
 %%DATADIR%%/help/h22.html
 %%DATADIR%%/help/h23.html
 %%DATADIR%%/help/h24.html
 %%DATADIR%%/help/h25.html
 %%DATADIR%%/help/h26.html
 %%DATADIR%%/help/h27.html
 %%DATADIR%%/help/h28.html
+%%DATADIR%%/help/h29.html
+%%DATADIR%%/help/h30.html
 %%DATADIR%%/help/h3.html
 %%DATADIR%%/help/h4.html
 %%DATADIR%%/help/h5.html
 %%DATADIR%%/help/h6.html
 %%DATADIR%%/help/h7.html
 %%DATADIR%%/help/h8.html
 %%DATADIR%%/help/img/bulb.png
 %%DATADIR%%/help/img/c03.jpg
 %%DATADIR%%/help/img/contest.png
 %%DATADIR%%/help/img/contest_html_export.png
 %%DATADIR%%/help/img/cwdaem.png
 %%DATADIR%%/help/img/exc.png
 %%DATADIR%%/help/img/fxml5.png
 %%DATADIR%%/help/img/fxml8.png
 %%DATADIR%%/help/img/fxml9.png
 %%DATADIR%%/help/img/h1.png
 %%DATADIR%%/help/img/h10.png
 %%DATADIR%%/help/img/h100.png
 %%DATADIR%%/help/img/h101.png
 %%DATADIR%%/help/img/h102.png
 %%DATADIR%%/help/img/h103.png
 %%DATADIR%%/help/img/h104.png
 %%DATADIR%%/help/img/h105.png
 %%DATADIR%%/help/img/h106.png
 %%DATADIR%%/help/img/h107.png
 %%DATADIR%%/help/img/h108.png
 %%DATADIR%%/help/img/h109.png
 %%DATADIR%%/help/img/h11.png
 %%DATADIR%%/help/img/h110.png
+%%DATADIR%%/help/img/h117.png
+%%DATADIR%%/help/img/h118.png
+%%DATADIR%%/help/img/h165.png
 %%DATADIR%%/help/img/h111.png
 %%DATADIR%%/help/img/h1112.png
 %%DATADIR%%/help/img/h1114.png
 %%DATADIR%%/help/img/h1116.png
 %%DATADIR%%/help/img/h112.png
 %%DATADIR%%/help/img/h113.png
 %%DATADIR%%/help/img/h114.png
 %%DATADIR%%/help/img/h115.png
 %%DATADIR%%/help/img/h116.png
 %%DATADIR%%/help/img/h12.png
 %%DATADIR%%/help/img/h13.png
 %%DATADIR%%/help/img/h14.png
 %%DATADIR%%/help/img/h15.png
 %%DATADIR%%/help/img/h16.png
 %%DATADIR%%/help/img/h17.png
 %%DATADIR%%/help/img/h18.png
 %%DATADIR%%/help/img/h19.png
 %%DATADIR%%/help/img/h2.png
 %%DATADIR%%/help/img/h20.png
 %%DATADIR%%/help/img/h21.png
 %%DATADIR%%/help/img/h22.png
 %%DATADIR%%/help/img/h23.png
 %%DATADIR%%/help/img/h24.png
 %%DATADIR%%/help/img/h25.png
 %%DATADIR%%/help/img/h26.png
 %%DATADIR%%/help/img/h27.png
 %%DATADIR%%/help/img/h28.png
 %%DATADIR%%/help/img/h29.png
 %%DATADIR%%/help/img/h3.png
 %%DATADIR%%/help/img/h30.png
 %%DATADIR%%/help/img/h31.png
 %%DATADIR%%/help/img/h32.png
 %%DATADIR%%/help/img/h33.png
 %%DATADIR%%/help/img/h34.png
 %%DATADIR%%/help/img/h35.png
 %%DATADIR%%/help/img/h36.png
 %%DATADIR%%/help/img/h37.png
 %%DATADIR%%/help/img/h38.png
 %%DATADIR%%/help/img/h39.png
 %%DATADIR%%/help/img/h4.png
 %%DATADIR%%/help/img/h40.png
 %%DATADIR%%/help/img/h41.png
 %%DATADIR%%/help/img/h42.png
 %%DATADIR%%/help/img/h43.png
 %%DATADIR%%/help/img/h44.png
 %%DATADIR%%/help/img/h45.png
 %%DATADIR%%/help/img/h46.png
 %%DATADIR%%/help/img/h47.png
 %%DATADIR%%/help/img/h48.png
 %%DATADIR%%/help/img/h49.png
 %%DATADIR%%/help/img/h5.png
 %%DATADIR%%/help/img/h50.png
 %%DATADIR%%/help/img/h51.png
 %%DATADIR%%/help/img/h52.png
 %%DATADIR%%/help/img/h53.png
 %%DATADIR%%/help/img/h54.png
 %%DATADIR%%/help/img/h55.png
 %%DATADIR%%/help/img/h56.png
 %%DATADIR%%/help/img/h57.png
 %%DATADIR%%/help/img/h58.png
 %%DATADIR%%/help/img/h59.png
 %%DATADIR%%/help/img/h6.png
 %%DATADIR%%/help/img/h60.png
 %%DATADIR%%/help/img/h61.png
 %%DATADIR%%/help/img/h62.png
 %%DATADIR%%/help/img/h63.png
 %%DATADIR%%/help/img/h64.png
 %%DATADIR%%/help/img/h65.png
 %%DATADIR%%/help/img/h66.png
 %%DATADIR%%/help/img/h67.png
 %%DATADIR%%/help/img/h68.png
 %%DATADIR%%/help/img/h69.png
 %%DATADIR%%/help/img/h7.png
 %%DATADIR%%/help/img/h70.png
 %%DATADIR%%/help/img/h71.png
 %%DATADIR%%/help/img/h72.png
 %%DATADIR%%/help/img/h73.png
 %%DATADIR%%/help/img/h74.png
 %%DATADIR%%/help/img/h75.png
 %%DATADIR%%/help/img/h76.png
 %%DATADIR%%/help/img/h77.png
 %%DATADIR%%/help/img/h78.png
 %%DATADIR%%/help/img/h79.png
 %%DATADIR%%/help/img/h8.png
 %%DATADIR%%/help/img/h80.png
 %%DATADIR%%/help/img/h81.png
 %%DATADIR%%/help/img/h82.png
 %%DATADIR%%/help/img/h83.png
 %%DATADIR%%/help/img/h84.png
 %%DATADIR%%/help/img/h85.png
 %%DATADIR%%/help/img/h86.png
 %%DATADIR%%/help/img/h87.png
 %%DATADIR%%/help/img/h88.png
 %%DATADIR%%/help/img/h89.png
 %%DATADIR%%/help/img/h9.png
 %%DATADIR%%/help/img/h90.png
 %%DATADIR%%/help/img/h91.png
 %%DATADIR%%/help/img/h92.png
 %%DATADIR%%/help/img/h93.png
 %%DATADIR%%/help/img/h94.png
 %%DATADIR%%/help/img/h95.png
 %%DATADIR%%/help/img/h96.png
 %%DATADIR%%/help/img/h97.png
 %%DATADIR%%/help/img/h98.png
 %%DATADIR%%/help/img/h99.png
 %%DATADIR%%/help/img/line.png
 %%DATADIR%%/help/img/misc12.png
 %%DATADIR%%/help/img/misc13.png
 %%DATADIR%%/help/img/misc14.png
 %%DATADIR%%/help/img/misc3.png
 %%DATADIR%%/help/img/misc40.png
 %%DATADIR%%/help/img/misc41.png
 %%DATADIR%%/help/img/misc42.png
 %%DATADIR%%/help/img/misc43.png
 %%DATADIR%%/help/img/misc44.png
 %%DATADIR%%/help/img/misc5.png
 %%DATADIR%%/help/img/misc8.png
 %%DATADIR%%/help/img/note.png
 %%DATADIR%%/help/img/radio_memory.png
 %%DATADIR%%/help/img/wkdgrid10.png
 %%DATADIR%%/help/img/wkdgrid11.png
 %%DATADIR%%/help/img/wkdgrid9.png
 %%DATADIR%%/help/img/wsjt1.png
 %%DATADIR%%/help/img/wsjt15.png
 %%DATADIR%%/help/img/wsjt16.png
 %%DATADIR%%/help/img/wsjt17.png
 %%DATADIR%%/help/img/wsjt18.png
 %%DATADIR%%/help/img/wsjt19.png
 %%DATADIR%%/help/img/wsjt2.png
 %%DATADIR%%/help/img/wsjt20.png
 %%DATADIR%%/help/img/wsjt21.png
+%%DATADIR%%/help/img/wsjt22.png
+%%DATADIR%%/help/img/wsjt23.png
 %%DATADIR%%/help/img/wsjt27.png
 %%DATADIR%%/help/img/wsjt28.png
+%%DATADIR%%/help/img/wsjt29.png
+%%DATADIR%%/help/img/wsjt30.png
+%%DATADIR%%/help/img/wsjt31.png
+%%DATADIR%%/help/img/wsjt32.png
+%%DATADIR%%/help/img/wsjt33.png
+%%DATADIR%%/help/img/wsjt34.png
+%%DATADIR%%/help/img/wsjt35.png
+%%DATADIR%%/help/img/wsjt36.png
 %%DATADIR%%/help/img/wsjt4.png
 %%DATADIR%%/help/index.html
 %%DATADIR%%/help/remi.html
 %%DATADIR%%/help/sql_console.html
 %%DATADIR%%/help/wkdgrid.html
 %%DATADIR%%/help/wkusb.html
 %%DATADIR%%/help/wsjt.html
 %%DATADIR%%/images/BigEarth.bmp
 %%DATADIR%%/images/HamQTH.png
 %%DATADIR%%/images/bck.png
 %%DATADIR%%/images/connect.png
 %%DATADIR%%/images/cqrlog.png
 %%DATADIR%%/images/delete.png
 %%DATADIR%%/images/disconnect.png
 %%DATADIR%%/images/dxcc_stat.xpm
 %%DATADIR%%/images/edit.png
 %%DATADIR%%/images/edwn.xpm
 %%DATADIR%%/images/eqsl_dwn.png
 %%DATADIR%%/images/eqsl_up.png
 %%DATADIR%%/images/eupl.xpm
 %%DATADIR%%/images/filter.png
 %%DATADIR%%/images/font.png
 %%DATADIR%%/images/go-bottom.png
 %%DATADIR%%/images/grayline.bmp
 %%DATADIR%%/images/help.png
 %%DATADIR%%/images/icon/128x128/cqrlog.png
 %%DATADIR%%/images/icon/256x256/cqrlog.png
 %%DATADIR%%/images/icon/32x32/cqrlog.png
 %%DATADIR%%/images/icon/48x48/cqrlog.png
 %%DATADIR%%/images/icon/64x64/cqrlog.png
 %%DATADIR%%/images/menu_new.png
 %%DATADIR%%/images/my_view.png
 %%DATADIR%%/images/options.xpm
 %%DATADIR%%/images/properties.png
 %%DATADIR%%/images/quit.png
 %%DATADIR%%/images/quit.xpm
 %%DATADIR%%/images/radio.bmp
 %%DATADIR%%/images/rbn_list.png
 %%DATADIR%%/images/search.png
 %%DATADIR%%/images/sort.xpm
 %%DATADIR%%/images/splash.png
 %%DATADIR%%/images/sun.png
 %%DATADIR%%/images/sunrise.png
 %%DATADIR%%/images/sunrise_small.png
 %%DATADIR%%/images/sunset.png
 %%DATADIR%%/images/sunset_small.bmp
 %%DATADIR%%/images/sunset_small.jpg
 %%DATADIR%%/images/sunset_small.png
 %%DATADIR%%/images/sunset_small_.png
 %%DATADIR%%/images/uses_eqsl.png
 %%DATADIR%%/images/view.png
 %%DATADIR%%/images/world_borders.png
 %%DATADIR%%/members/070-club.txt
 %%DATADIR%%/members/10-10.txt
 %%DATADIR%%/members/599dxa.txt
 %%DATADIR%%/members/9acwg.txt
 %%DATADIR%%/members/a1-club.txt
+%%DATADIR%%/members/a1a-ea.txt
 %%DATADIR%%/members/a1-op.txt
 %%DATADIR%%/members/afm.txt
 %%DATADIR%%/members/agb.txt
 %%DATADIR%%/members/agcw.txt
 %%DATADIR%%/members/arci.txt
 %%DATADIR%%/members/arktika.txt
 %%DATADIR%%/members/armi.txt
 %%DATADIR%%/members/aviaham.txt
 %%DATADIR%%/members/bcc.txt
 %%DATADIR%%/members/bmars.txt
 %%DATADIR%%/members/bscc.txt
 %%DATADIR%%/members/btc.txt
 %%DATADIR%%/members/cav.txt
 %%DATADIR%%/members/cct.txt
 %%DATADIR%%/members/cdxc.txt
 %%DATADIR%%/members/cfo.txt
 %%DATADIR%%/members/cft.txt
 %%DATADIR%%/members/conveniat.txt
 %%DATADIR%%/members/cqcw.txt
 %%DATADIR%%/members/ctc.txt
 %%DATADIR%%/members/ctid.txt
 %%DATADIR%%/members/cwjf.txt
 %%DATADIR%%/members/cwops.txt
 %%DATADIR%%/members/cwsp.txt
 %%DATADIR%%/members/dig.txt
+%%DATADIR%%/members/dmc.txt
 %%DATADIR%%/members/dtc.txt
 %%DATADIR%%/members/ehsc.txt
 %%DATADIR%%/members/epc.txt
 %%DATADIR%%/members/ffr.txt
 %%DATADIR%%/members/fhc.txt
 %%DATADIR%%/members/firac.txt
 %%DATADIR%%/members/fists.txt
 %%DATADIR%%/members/fmc.txt
 %%DATADIR%%/members/fnars.txt
 %%DATADIR%%/members/foc.txt
 %%DATADIR%%/members/foc_names.txt
 %%DATADIR%%/members/fog.txt
 %%DATADIR%%/members/fpqrp.txt
 %%DATADIR%%/members/gacw.txt
 %%DATADIR%%/members/gdxf.txt
 %%DATADIR%%/members/gqrpc.txt
 %%DATADIR%%/members/gra.txt
 %%DATADIR%%/members/gtc.txt
 %%DATADIR%%/members/hacwg.txt
 %%DATADIR%%/members/hadxc.txt
 %%DATADIR%%/members/hh.txt
 %%DATADIR%%/members/hhc.txt
 %%DATADIR%%/members/hsc.txt
 %%DATADIR%%/members/htc.txt
+%%DATADIR%%/members/kdr.txt
 %%DATADIR%%/members/inorc.txt
 %%DATADIR%%/members/jaig.txt
 %%DATADIR%%/members/lcc.txt
 %%DATADIR%%/members/lids.txt
 %%DATADIR%%/members/marac.txt
 %%DATADIR%%/members/marconista.txt
 %%DATADIR%%/members/mcl.txt
 %%DATADIR%%/members/mcwg.txt
 %%DATADIR%%/members/mdxc.txt
 %%DATADIR%%/members/mdxg.txt
 %%DATADIR%%/members/mf.txt
 %%DATADIR%%/members/mfca.txt
 %%DATADIR%%/members/naqcc.txt
 %%DATADIR%%/members/nra.txt
 %%DATADIR%%/members/okdxc.txt
 %%DATADIR%%/members/okdxf.txt
 %%DATADIR%%/members/okqrp.txt
 %%DATADIR%%/members/omiss.txt
 %%DATADIR%%/members/ootc.txt
 %%DATADIR%%/members/otc-sara.txt
 %%DATADIR%%/members/prc.txt
 %%DATADIR%%/members/prl.txt
 %%DATADIR%%/members/pro.txt
 %%DATADIR%%/members/qcwa.txt
 %%DATADIR%%/members/qthloc.txt
 %%DATADIR%%/members/rafars.txt
+%%DATADIR%%/members/rcc.txt
 %%DATADIR%%/members/rcwc.txt
+%%DATADIR%%/members/rdrc.txt
 %%DATADIR%%/members/ria.txt
 %%DATADIR%%/members/rnars.txt
 %%DATADIR%%/members/rrdxa.txt
 %%DATADIR%%/members/rsars.txt
 %%DATADIR%%/members/rtc.txt
 %%DATADIR%%/members/sdxg.txt
 %%DATADIR%%/members/shsc.txt
 %%DATADIR%%/members/skcc.txt
 %%DATADIR%%/members/soc.txt
 %%DATADIR%%/members/spar-rcc.txt
 %%DATADIR%%/members/spar.txt
 %%DATADIR%%/members/spcwc.txt
 %%DATADIR%%/members/spdxc.txt
+%%DATADIR%%/members/tbdxc.txt
 %%DATADIR%%/members/ten-ten.txt
 %%DATADIR%%/members/tenten.txt
 %%DATADIR%%/members/tfc.txt
 %%DATADIR%%/members/trc.txt
 %%DATADIR%%/members/udxc.txt
 %%DATADIR%%/members/uft.txt
 %%DATADIR%%/members/uksmg.txt
 %%DATADIR%%/members/uqrqc.txt
 %%DATADIR%%/members/vhsc.txt
 %%DATADIR%%/members/vrk.txt
 %%DATADIR%%/members/wap.txt
 %%DATADIR%%/members/was.txt
 %%DATADIR%%/members/wcc.txt
 %%DATADIR%%/members/wff.txt
 %%DATADIR%%/members/wwyc.txt
 %%DATADIR%%/members/yasme.txt
 %%DATADIR%%/voice_keyer/F10.mp3
 %%DATADIR%%/voice_keyer/README
 %%DATADIR%%/voice_keyer/voice_keyer.sh
 %%DATADIR%%/xplanet/geoconfig
 %%DATADIR%%/zipcodes/italy-prov.txt
 %%DATADIR%%/zipcodes/usa-ca.txt
 %%DATADIR%%/zipcodes/usa-states.txt
 share/icons/cqrlog.png
 share/icons/cqrlog/128x128/cqrlog.png
 share/icons/cqrlog/256x256/cqrlog.png
 share/icons/cqrlog/32x32/cqrlog.png
 share/icons/cqrlog/48x48/cqrlog.png
 share/icons/cqrlog/64x64/cqrlog.png
 share/pixmaps/cqrlog/128x128/cqrlog.png
 share/pixmaps/cqrlog/256x256/cqrlog.png
 share/pixmaps/cqrlog/32x32/cqrlog.png
 share/pixmaps/cqrlog/48x48/cqrlog.png
 share/pixmaps/cqrlog/64x64/cqrlog.png
 share/pixmaps/cqrlog/cqrlog.png