4 files changed, 454 insertions, 91 deletions

diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 02c3b175011a..9d6c019bb4a6 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xlog
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 		http://www.qsl.net/pg4i/download/
@@ -16,25 +15,32 @@ MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio logging application
 
 USE_GETTEXT=	yes
-USE_GNOME=	libgnomeprint gtk20
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mime-update
+CONFIGURE_ARGS=	--with-mime-update \
+		CFLAGS="-I${PREFIX}/include" \
+		LDFLAGS="-L${PREFIX}/lib"
 
 LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
 
 MAN1=		xlog.1
 
-.if defined (WITHOUT_NLS)
+.if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
-WITHNLS=	"@comment "
+PLIST_SUB+=		NLS="@comment "
 .else
-WITHNLS=	""
+PLIST_SUB+=		NLS=""
 .endif
 
-PLIST_SUB+=	WITHNLS=${WITHNLS}
-
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-D.*_DISABLE_DEPRECATED||g'
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|desktop doc dxcc|desktop dxcc|g' \
+	${WRKSRC}/data/Makefile.in
+	@${REINPLACE_CMD} -e \
+	's|install-data-am: install-glabelsDATA|install-data-am:|g' \
+	${WRKSRC}/data/glabels/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff --git a/comms/xlog/distinfo b/comms/xlog/distinfo
index 8d3f7e99302f..ebe39a114dc6 100644
--- a/comms/xlog/distinfo
+++ b/comms/xlog/distinfo
@@ -1,3 +1,3 @@
-MD5 (xlog-1.7.tar.gz) = f7d52236715f8ce30f251209dc3753d2
-SHA256 (xlog-1.7.tar.gz) = e7fa80a34bd8b972b50efb87bf58adf2c61f2473ab5e5d8f8933976101a75c5b
-SIZE (xlog-1.7.tar.gz) = 1444600
+MD5 (xlog-2.0.tar.gz) = 7daf0a83be1728dbdbed3c1b3dac5310
+SHA256 (xlog-2.0.tar.gz) = d26befab9d9293c354f4f18824c2efa832947b9b3a97d43b77e64dcd4ab89c0b
+SIZE (xlog-2.0.tar.gz) = 11115748
diff --git a/comms/xlog/pkg-descr b/comms/xlog/pkg-descr
index a7b007a36cbf..87665e219889 100644
--- a/comms/xlog/pkg-descr
+++ b/comms/xlog/pkg-descr
@@ -9,9 +9,4 @@ It also has the ability to customise log fields which makes it ideal for
 use in those countries that have odd logging rules such as the U.K. Also
 included is the ability to log using the FCC emissions codes.
 
-There is a new format for exporting the log called 'labels'. This will
-save some fields of the log in a TAB separated file. This file can be
-imported into glabels (deskutils/glabels) using the template
-called qsllabels.glabels in the xlog /usr/local/share/xlog directory.
-
 WWW: http://pg4i.chronos.org.uk/linux/xlog.html
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index 5d3919eb7e0b..d034e085bfa8 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -1,8 +1,78 @@
 bin/xlog
 share/applications/xlog.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/KEYS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/glabels/qsllabels.glabels
+%%PORTDOCS%%%%DOCSDIR%%/manual/img1.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/next.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node11.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node12.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node13.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node14.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node15.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node16.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node17.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node18.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node19.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node20.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node21.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node22.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node23.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node24.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node25.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node26.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node27.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node28.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node29.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node30.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node31.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node32.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node33.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node34.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node35.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-defaultsdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-dupecheckdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-exportsettings.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-importdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-keyerwindow.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-logeditor.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-mainwindow.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-mergelogdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-newlogdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-pagesetupdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-preferencesdialog-general.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-preferencesdialog-hamlib.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-preferencesdialog-info.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-preferencesdialog-logs.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-printdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-scorewindow.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-searchdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog-workedwindow.png
 share/icons/gnome-mime-text-x-xlog.png
 share/icons/xlog-icon.png
 share/mime/packages/xlog.xml
+share/pixmaps/xlog/countrymap.png
 share/pixmaps/xlog/cwdaemon.png
 share/pixmaps/xlog/gnome-mime-text-x-xlog.png
 share/pixmaps/xlog/jigsaw.png
@@ -24,85 +94,374 @@ share/pixmaps/xlog/s9.xpm
 share/pixmaps/xlog/xlog-b4.png
 share/pixmaps/xlog/xlog-icon.png
 share/pixmaps/xlog/xlog-keyer.png
+share/pixmaps/xlog/xlog-map.png
 share/pixmaps/xlog/xlog-scoring.png
 share/pixmaps/xlog/xlog.png
 share/pixmaps/xlog/xlog.xpm
-%%WITHNLS%%share/locale/da/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/de/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/es/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/fr/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/nl/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/cs/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/pl/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/sk/LC_MESSAGES/xlog.mo
-%%WITHNLS%%share/locale/sv/LC_MESSAGES/xlog.mo
-%%DATADIR%%/AUTHORS
-%%DATADIR%%/BUGS
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/KEYS
-%%DATADIR%%/THANKS
-%%DATADIR%%/TODO
+share/pixmaps/xlog/xlog.svg
+%%NLS%%share/locale/cs/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xlog.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xlog.mo
 %%DATADIR%%/dxcc/area.dat
 %%DATADIR%%/dxcc/cty.dat
-%%DATADIR%%/manual.tex
-%%DATADIR%%/manual/img1.png
-%%DATADIR%%/manual/index.html
-%%DATADIR%%/manual/manual.css
-%%DATADIR%%/manual/manual.html
-%%DATADIR%%/manual/next.png
-%%DATADIR%%/manual/next_g.png
-%%DATADIR%%/manual/node1.html
-%%DATADIR%%/manual/node10.html
-%%DATADIR%%/manual/node11.html
-%%DATADIR%%/manual/node12.html
-%%DATADIR%%/manual/node13.html
-%%DATADIR%%/manual/node14.html
-%%DATADIR%%/manual/node15.html
-%%DATADIR%%/manual/node16.html
-%%DATADIR%%/manual/node17.html
-%%DATADIR%%/manual/node18.html
-%%DATADIR%%/manual/node19.html
-%%DATADIR%%/manual/node2.html
-%%DATADIR%%/manual/node20.html
-%%DATADIR%%/manual/node21.html
-%%DATADIR%%/manual/node22.html
-%%DATADIR%%/manual/node23.html
-%%DATADIR%%/manual/node24.html
-%%DATADIR%%/manual/node25.html
-%%DATADIR%%/manual/node26.html
-%%DATADIR%%/manual/node27.html
-%%DATADIR%%/manual/node28.html
-%%DATADIR%%/manual/node29.html
-%%DATADIR%%/manual/node3.html
-%%DATADIR%%/manual/node30.html
-%%DATADIR%%/manual/node31.html
-%%DATADIR%%/manual/node4.html
-%%DATADIR%%/manual/node5.html
-%%DATADIR%%/manual/node6.html
-%%DATADIR%%/manual/node7.html
-%%DATADIR%%/manual/node8.html
-%%DATADIR%%/manual/node9.html
-%%DATADIR%%/manual/prev.png
-%%DATADIR%%/manual/prev_g.png
-%%DATADIR%%/manual/up.png
-%%DATADIR%%/manual/up_g.png
-%%DATADIR%%/manual/xlog-defaultsdialog.png
-%%DATADIR%%/manual/xlog-dupecheckdialog.png
-%%DATADIR%%/manual/xlog-importdialog.png
-%%DATADIR%%/manual/xlog-keyerwindow.png
-%%DATADIR%%/manual/xlog-logeditor.png
-%%DATADIR%%/manual/xlog-mainwindow.png
-%%DATADIR%%/manual/xlog-mergelogdialog.png
-%%DATADIR%%/manual/xlog-newlogdialog.png
-%%DATADIR%%/manual/xlog-preferencesdialog-general.png
-%%DATADIR%%/manual/xlog-preferencesdialog-hamlib.png
-%%DATADIR%%/manual/xlog-preferencesdialog-info.png
-%%DATADIR%%/manual/xlog-preferencesdialog-logs.png
-%%DATADIR%%/manual/xlog-printdialog.png
-%%DATADIR%%/manual/xlog-scorewindow.png
-%%DATADIR%%/manual/xlog-workedwindow.png
-%%DATADIR%%/qsllabels.glabels
-@dirrm %%DATADIR%%/manual
+%%DATADIR%%/maps/1S.png
+%%DATADIR%%/maps/3A.png
+%%DATADIR%%/maps/3B6.png
+%%DATADIR%%/maps/3B8.png
+%%DATADIR%%/maps/3B9.png
+%%DATADIR%%/maps/3C.png
+%%DATADIR%%/maps/3C0.png
+%%DATADIR%%/maps/3D2.png
+%%DATADIR%%/maps/3D2/c.png
+%%DATADIR%%/maps/3D2/r.png
+%%DATADIR%%/maps/3DA.png
+%%DATADIR%%/maps/3V.png
+%%DATADIR%%/maps/3W.png
+%%DATADIR%%/maps/3X.png
+%%DATADIR%%/maps/3Y/b.png
+%%DATADIR%%/maps/3Y/p.png
+%%DATADIR%%/maps/4J.png
+%%DATADIR%%/maps/4L.png
+%%DATADIR%%/maps/4O.png
+%%DATADIR%%/maps/4S.png
+%%DATADIR%%/maps/4U1I.png
+%%DATADIR%%/maps/4U1U.png
+%%DATADIR%%/maps/4W.png
+%%DATADIR%%/maps/4X.png
+%%DATADIR%%/maps/5A.png
+%%DATADIR%%/maps/5B.png
+%%DATADIR%%/maps/5H.png
+%%DATADIR%%/maps/5N.png
+%%DATADIR%%/maps/5R.png
+%%DATADIR%%/maps/5T.png
+%%DATADIR%%/maps/5U.png
+%%DATADIR%%/maps/5V.png
+%%DATADIR%%/maps/5W.png
+%%DATADIR%%/maps/5X.png
+%%DATADIR%%/maps/5Z.png
+%%DATADIR%%/maps/6W.png
+%%DATADIR%%/maps/6Y.png
+%%DATADIR%%/maps/7O.png
+%%DATADIR%%/maps/7P.png
+%%DATADIR%%/maps/7Q.png
+%%DATADIR%%/maps/7X.png
+%%DATADIR%%/maps/8P.png
+%%DATADIR%%/maps/8Q.png
+%%DATADIR%%/maps/8R.png
+%%DATADIR%%/maps/9A.png
+%%DATADIR%%/maps/9G.png
+%%DATADIR%%/maps/9H.png
+%%DATADIR%%/maps/9J.png
+%%DATADIR%%/maps/9K.png
+%%DATADIR%%/maps/9L.png
+%%DATADIR%%/maps/9M2.png
+%%DATADIR%%/maps/9M6.png
+%%DATADIR%%/maps/9N.png
+%%DATADIR%%/maps/9Q.png
+%%DATADIR%%/maps/9U.png
+%%DATADIR%%/maps/9V.png
+%%DATADIR%%/maps/9X.png
+%%DATADIR%%/maps/9Y.png
+%%DATADIR%%/maps/A2.png
+%%DATADIR%%/maps/A3.png
+%%DATADIR%%/maps/A4.png
+%%DATADIR%%/maps/A5.png
+%%DATADIR%%/maps/A6.png
+%%DATADIR%%/maps/A7.png
+%%DATADIR%%/maps/A9.png
+%%DATADIR%%/maps/AP.png
+%%DATADIR%%/maps/BS7.png
+%%DATADIR%%/maps/BV.png
+%%DATADIR%%/maps/BV9P.png
+%%DATADIR%%/maps/BY.png
+%%DATADIR%%/maps/C2.png
+%%DATADIR%%/maps/C3.png
+%%DATADIR%%/maps/C5.png
+%%DATADIR%%/maps/C6.png
+%%DATADIR%%/maps/C9.png
+%%DATADIR%%/maps/CE.png
+%%DATADIR%%/maps/CE0X.png
+%%DATADIR%%/maps/CE0Y.png
+%%DATADIR%%/maps/CE0Z.png
+%%DATADIR%%/maps/CE9.png
+%%DATADIR%%/maps/CM.png
+%%DATADIR%%/maps/CN.png
+%%DATADIR%%/maps/CP.png
+%%DATADIR%%/maps/CT.png
+%%DATADIR%%/maps/CT3.png
+%%DATADIR%%/maps/CU.png
+%%DATADIR%%/maps/CX.png
+%%DATADIR%%/maps/CY0.png
+%%DATADIR%%/maps/CY9.png
+%%DATADIR%%/maps/D2.png
+%%DATADIR%%/maps/D4.png
+%%DATADIR%%/maps/D6.png
+%%DATADIR%%/maps/DL.png
+%%DATADIR%%/maps/DU.png
+%%DATADIR%%/maps/E3.png
+%%DATADIR%%/maps/E4.png
+%%DATADIR%%/maps/E5/n.png
+%%DATADIR%%/maps/E5/s.png
+%%DATADIR%%/maps/E7.png
+%%DATADIR%%/maps/EA.png
+%%DATADIR%%/maps/EA6.png
+%%DATADIR%%/maps/EA8.png
+%%DATADIR%%/maps/EA9.png
+%%DATADIR%%/maps/EI.png
+%%DATADIR%%/maps/EK.png
+%%DATADIR%%/maps/EL.png
+%%DATADIR%%/maps/EP.png
+%%DATADIR%%/maps/ER.png
+%%DATADIR%%/maps/ES.png
+%%DATADIR%%/maps/ET.png
+%%DATADIR%%/maps/EU.png
+%%DATADIR%%/maps/EX.png
+%%DATADIR%%/maps/EY.png
+%%DATADIR%%/maps/EZ.png
+%%DATADIR%%/maps/F.png
+%%DATADIR%%/maps/FG.png
+%%DATADIR%%/maps/FH.png
+%%DATADIR%%/maps/FJ.png
+%%DATADIR%%/maps/FK.png
+%%DATADIR%%/maps/FK/c.png
+%%DATADIR%%/maps/FM.png
+%%DATADIR%%/maps/FO.png
+%%DATADIR%%/maps/FO/a.png
+%%DATADIR%%/maps/FO/c.png
+%%DATADIR%%/maps/FO/m.png
+%%DATADIR%%/maps/FP.png
+%%DATADIR%%/maps/FR.png
+%%DATADIR%%/maps/FR/g.png
+%%DATADIR%%/maps/FR/j.png
+%%DATADIR%%/maps/FR/t.png
+%%DATADIR%%/maps/FS.png
+%%DATADIR%%/maps/FT5W.png
+%%DATADIR%%/maps/FT5X.png
+%%DATADIR%%/maps/FT5Z.png
+%%DATADIR%%/maps/FW.png
+%%DATADIR%%/maps/FY.png
+%%DATADIR%%/maps/G.png
+%%DATADIR%%/maps/GD.png
+%%DATADIR%%/maps/GI.png
+%%DATADIR%%/maps/GJ.png
+%%DATADIR%%/maps/GM.png
+%%DATADIR%%/maps/GU.png
+%%DATADIR%%/maps/GW.png
+%%DATADIR%%/maps/H4.png
+%%DATADIR%%/maps/H40.png
+%%DATADIR%%/maps/HA.png
+%%DATADIR%%/maps/HB.png
+%%DATADIR%%/maps/HB0.png
+%%DATADIR%%/maps/HC.png
+%%DATADIR%%/maps/HC8.png
+%%DATADIR%%/maps/HH.png
+%%DATADIR%%/maps/HI.png
+%%DATADIR%%/maps/HK.png
+%%DATADIR%%/maps/HK0/a.png
+%%DATADIR%%/maps/HK0/m.png
+%%DATADIR%%/maps/HL.png
+%%DATADIR%%/maps/HM.png
+%%DATADIR%%/maps/HP.png
+%%DATADIR%%/maps/HR.png
+%%DATADIR%%/maps/HS.png
+%%DATADIR%%/maps/HV.png
+%%DATADIR%%/maps/HZ.png
+%%DATADIR%%/maps/I.png
+%%DATADIR%%/maps/IS.png
+%%DATADIR%%/maps/J2.png
+%%DATADIR%%/maps/J3.png
+%%DATADIR%%/maps/J5.png
+%%DATADIR%%/maps/J6.png
+%%DATADIR%%/maps/J7.png
+%%DATADIR%%/maps/J8.png
+%%DATADIR%%/maps/JA.png
+%%DATADIR%%/maps/JD/m.png
+%%DATADIR%%/maps/JD/o.png
+%%DATADIR%%/maps/JT.png
+%%DATADIR%%/maps/JW.png
+%%DATADIR%%/maps/JX.png
+%%DATADIR%%/maps/JY.png
+%%DATADIR%%/maps/K.png
+%%DATADIR%%/maps/KG4.png
+%%DATADIR%%/maps/KH0.png
+%%DATADIR%%/maps/KH1.png
+%%DATADIR%%/maps/KH2.png
+%%DATADIR%%/maps/KH3.png
+%%DATADIR%%/maps/KH4.png
+%%DATADIR%%/maps/KH5.png
+%%DATADIR%%/maps/KH5K.png
+%%DATADIR%%/maps/KH6.png
+%%DATADIR%%/maps/KH7K.png
+%%DATADIR%%/maps/KH8.png
+%%DATADIR%%/maps/KH8/s.png
+%%DATADIR%%/maps/KH9.png
+%%DATADIR%%/maps/KL.png
+%%DATADIR%%/maps/KP1.png
+%%DATADIR%%/maps/KP2.png
+%%DATADIR%%/maps/KP4.png
+%%DATADIR%%/maps/KP5.png
+%%DATADIR%%/maps/LA.png
+%%DATADIR%%/maps/LU.png
+%%DATADIR%%/maps/LX.png
+%%DATADIR%%/maps/LY.png
+%%DATADIR%%/maps/LZ.png
+%%DATADIR%%/maps/OA.png
+%%DATADIR%%/maps/OD.png
+%%DATADIR%%/maps/OE.png
+%%DATADIR%%/maps/OH.png
+%%DATADIR%%/maps/OH0.png
+%%DATADIR%%/maps/OJ0.png
+%%DATADIR%%/maps/OK.png
+%%DATADIR%%/maps/OM.png
+%%DATADIR%%/maps/ON.png
+%%DATADIR%%/maps/OX.png
+%%DATADIR%%/maps/OY.png
+%%DATADIR%%/maps/OZ.png
+%%DATADIR%%/maps/P2.png
+%%DATADIR%%/maps/P4.png
+%%DATADIR%%/maps/PA.png
+%%DATADIR%%/maps/PJ2.png
+%%DATADIR%%/maps/PJ7.png
+%%DATADIR%%/maps/PY.png
+%%DATADIR%%/maps/PY0F.png
+%%DATADIR%%/maps/PY0S.png
+%%DATADIR%%/maps/PY0T.png
+%%DATADIR%%/maps/PZ.png
+%%DATADIR%%/maps/R1FJ.png
+%%DATADIR%%/maps/R1MV.png
+%%DATADIR%%/maps/S0.png
+%%DATADIR%%/maps/S2.png
+%%DATADIR%%/maps/S5.png
+%%DATADIR%%/maps/S7.png
+%%DATADIR%%/maps/S9.png
+%%DATADIR%%/maps/SM.png
+%%DATADIR%%/maps/SP.png
+%%DATADIR%%/maps/ST.png
+%%DATADIR%%/maps/SU.png
+%%DATADIR%%/maps/SV.png
+%%DATADIR%%/maps/SV/a.png
+%%DATADIR%%/maps/SV5.png
+%%DATADIR%%/maps/SV9.png
+%%DATADIR%%/maps/T2.png
+%%DATADIR%%/maps/T30.png
+%%DATADIR%%/maps/T31.png
+%%DATADIR%%/maps/T32.png
+%%DATADIR%%/maps/T33.png
+%%DATADIR%%/maps/T5.png
+%%DATADIR%%/maps/T7.png
+%%DATADIR%%/maps/T8.png
+%%DATADIR%%/maps/TA.png
+%%DATADIR%%/maps/TF.png
+%%DATADIR%%/maps/TG.png
+%%DATADIR%%/maps/TI.png
+%%DATADIR%%/maps/TI9.png
+%%DATADIR%%/maps/TJ.png
+%%DATADIR%%/maps/TK.png
+%%DATADIR%%/maps/TL.png
+%%DATADIR%%/maps/TN.png
+%%DATADIR%%/maps/TR.png
+%%DATADIR%%/maps/TT.png
+%%DATADIR%%/maps/TU.png
+%%DATADIR%%/maps/TY.png
+%%DATADIR%%/maps/TZ.png
+%%DATADIR%%/maps/UA.png
+%%DATADIR%%/maps/UA2.png
+%%DATADIR%%/maps/UA9.png
+%%DATADIR%%/maps/UK.png
+%%DATADIR%%/maps/UN.png
+%%DATADIR%%/maps/UR.png
+%%DATADIR%%/maps/V2.png
+%%DATADIR%%/maps/V3.png
+%%DATADIR%%/maps/V4.png
+%%DATADIR%%/maps/V5.png
+%%DATADIR%%/maps/V6.png
+%%DATADIR%%/maps/V7.png
+%%DATADIR%%/maps/V8.png
+%%DATADIR%%/maps/VE.png
+%%DATADIR%%/maps/VK.png
+%%DATADIR%%/maps/VK0H.png
+%%DATADIR%%/maps/VK0M.png
+%%DATADIR%%/maps/VK9C.png
+%%DATADIR%%/maps/VK9L.png
+%%DATADIR%%/maps/VK9M.png
+%%DATADIR%%/maps/VK9N.png
+%%DATADIR%%/maps/VK9W.png
+%%DATADIR%%/maps/VK9X.png
+%%DATADIR%%/maps/VP2E.png
+%%DATADIR%%/maps/VP2M.png
+%%DATADIR%%/maps/VP2V.png
+%%DATADIR%%/maps/VP5.png
+%%DATADIR%%/maps/VP6.png
+%%DATADIR%%/maps/VP6/d.png
+%%DATADIR%%/maps/VP8.png
+%%DATADIR%%/maps/VP8/g.png
+%%DATADIR%%/maps/VP8/h.png
+%%DATADIR%%/maps/VP8/o.png
+%%DATADIR%%/maps/VP8/s.png
+%%DATADIR%%/maps/VP9.png
+%%DATADIR%%/maps/VQ9.png
+%%DATADIR%%/maps/VR.png
+%%DATADIR%%/maps/VU.png
+%%DATADIR%%/maps/VU4.png
+%%DATADIR%%/maps/VU7.png
+%%DATADIR%%/maps/XE.png
+%%DATADIR%%/maps/XF4.png
+%%DATADIR%%/maps/XT.png
+%%DATADIR%%/maps/XU.png
+%%DATADIR%%/maps/XW.png
+%%DATADIR%%/maps/XX9.png
+%%DATADIR%%/maps/XZ.png
+%%DATADIR%%/maps/YA.png
+%%DATADIR%%/maps/YB.png
+%%DATADIR%%/maps/YI.png
+%%DATADIR%%/maps/YJ.png
+%%DATADIR%%/maps/YK.png
+%%DATADIR%%/maps/YL.png
+%%DATADIR%%/maps/YN.png
+%%DATADIR%%/maps/YO.png
+%%DATADIR%%/maps/YS.png
+%%DATADIR%%/maps/YU.png
+%%DATADIR%%/maps/YV.png
+%%DATADIR%%/maps/YV0.png
+%%DATADIR%%/maps/Z2.png
+%%DATADIR%%/maps/Z3.png
+%%DATADIR%%/maps/ZA.png
+%%DATADIR%%/maps/ZB.png
+%%DATADIR%%/maps/ZC4.png
+%%DATADIR%%/maps/ZD7.png
+%%DATADIR%%/maps/ZD8.png
+%%DATADIR%%/maps/ZD9.png
+%%DATADIR%%/maps/ZF.png
+%%DATADIR%%/maps/ZK2.png
+%%DATADIR%%/maps/ZK3.png
+%%DATADIR%%/maps/ZL.png
+%%DATADIR%%/maps/ZL7.png
+%%DATADIR%%/maps/ZL8.png
+%%DATADIR%%/maps/ZL9.png
+%%DATADIR%%/maps/ZP.png
+%%DATADIR%%/maps/ZS.png
+%%DATADIR%%/maps/ZS8.png
+%%DATADIR%%/maps/worldmap.jpg
+@dirrm %%DATADIR%%/maps/VP8
+@dirrm %%DATADIR%%/maps/VP6
+@dirrm %%DATADIR%%/maps/SV
+@dirrm %%DATADIR%%/maps/KH8
+@dirrm %%DATADIR%%/maps/JD
+@dirrm %%DATADIR%%/maps/HK0
+@dirrm %%DATADIR%%/maps/FR
+@dirrm %%DATADIR%%/maps/FO
+@dirrm %%DATADIR%%/maps/FK
+@dirrm %%DATADIR%%/maps/E5
+@dirrm %%DATADIR%%/maps/3Y
+@dirrm %%DATADIR%%/maps/3D2
+@dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/dxcc
 @dirrm %%DATADIR%%
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@@ -111,4 +470,7 @@ share/pixmaps/xlog/xlog.xpm
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
 @dirrmtry share/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/glabels
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications