git: ef074e792a59 - main - www/ot-recorder: Update to 0.9.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dan Langille <dvl_at_FreeBSD.org>
Date: Sat, 18 Jun 2022 13:44:49 UTC
The branch main has been updated by dvl:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ef074e792a59057095c2dfdc73424ad5a6f90848

commit ef074e792a59057095c2dfdc73424ad5a6f90848
Author:     Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2022-06-18 13:43:56 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2022-06-18 13:44:34 +0000

    www/ot-recorder: Update to 0.9.0
    
    re: https://github.com/owntracks/recorder/releases/tag/0.9.0
---
 www/ot-recorder/Makefile                 |  22 +-
 www/ot-recorder/distinfo                 |   6 +-
 www/ot-recorder/files/patch-config.mk.in |  39 +++
 www/ot-recorder/pkg-plist                | 524 +++++++++++++++----------------
 4 files changed, 317 insertions(+), 274 deletions(-)

diff --git a/www/ot-recorder/Makefile b/www/ot-recorder/Makefile
index b61f0525194d..b50a3acd2f28 100644
--- a/www/ot-recorder/Makefile
+++ b/www/ot-recorder/Makefile
@@ -1,8 +1,7 @@
 # Created by: tundra
 
 PORTNAME=	ot-recorder
-PORTVERSION=	0.8.4
-PORTREVISION=	3
+PORTVERSION=	0.9.0
 CATEGORIES=	www
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -11,14 +10,17 @@ COMMENT=	Store and access data published by OwnTracks apps
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake
+BUILD_DEPENDS=	curl>0:ftp/curl \
+		libconfig>0:devel/libconfig \
+		lmdb>0:databases/lmdb \
+		mosquitto>0:net/mosquitto
 
-SUB_FILES=	ot-recorder
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libconfig.so:devel/libconfig \
+		liblmdb.so:databases/lmdb \
+		libmosquitto.so:net/mosquitto
 
-LIB_DEPENDS+=	libcurl.so:ftp/curl
-LIB_DEPENDS+=	libconfig.so:devel/libconfig
-LIB_DEPENDS+=	liblmdb.so:databases/lmdb
-LIB_DEPENDS+=	libmosquitto.so:net/mosquitto
+USES=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	owntracks
@@ -27,7 +29,9 @@ GH_PROJECT=	recorder
 USERS=		ot-recorder
 GROUPS=		ot-recorder
 
-pre-patch:
+SUB_FILES=	ot-recorder
+
+post-patch:
 	${CP} ${WRKSRC}/config.mk.in ${WRKSRC}/config.mk
 
 .include <bsd.port.pre.mk>
diff --git a/www/ot-recorder/distinfo b/www/ot-recorder/distinfo
index 4c680cf5df0b..676f44ef9244 100644
--- a/www/ot-recorder/distinfo
+++ b/www/ot-recorder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564344984
-SHA256 (owntracks-recorder-0.8.4_GH0.tar.gz) = cdf4ced2563bdd26717b65aef18990d2d5c25ada231bf1293aab65f279fc8bff
-SIZE (owntracks-recorder-0.8.4_GH0.tar.gz) = 3321503
+TIMESTAMP = 1655556155
+SHA256 (owntracks-recorder-0.9.0_GH0.tar.gz) = a9d80bb5154f1846074244cd3d0de4e93d109de98b8f7985f4b6a13a5f6b330a
+SIZE (owntracks-recorder-0.9.0_GH0.tar.gz) = 3303572
diff --git a/www/ot-recorder/files/patch-config.mk.in b/www/ot-recorder/files/patch-config.mk.in
new file mode 100644
index 000000000000..f1c0656e6950
--- /dev/null
+++ b/www/ot-recorder/files/patch-config.mk.in
@@ -0,0 +1,39 @@
+--- config.mk.in.orig	2022-05-24 07:25:09 UTC
++++ config.mk.in
+@@ -20,10 +20,10 @@
+ #
+ # Uncomment the following lines and replace "no" with "yes":
+ #
+-# CC      = clang
+-# CFLAGS += -I/usr/local/include
+-# MORELIBS += -L /usr/local/lib
+-FREEBSD ?= no
++CC      = clang
++CFLAGS += -I/usr/local/include
++MORELIBS += -L /usr/local/lib
++FREEBSD ?= YES
+ #
+ # Now build recorder with the "gmake" command:
+ #
+@@ -57,10 +57,10 @@ WITH_GREENWICH ?= no
+ 
+ # Where should the recorder store its data? This directory must
+ # exist and be writeable by recorder (and readable by ocat)
+-STORAGEDEFAULT = /var/spool/owntracks/recorder/store
++STORAGEDEFAULT = /var/db/owntracks/recorder/store
+ 
+ # Where should the recorder find its document root (HTTP)?
+-DOCROOT = /var/spool/owntracks/recorder/htdocs
++DOCROOT = /usr/local/www/ot-recorder
+ 
+ # Define the precision for reverse-geo lookups. The higher
+ # the number, the more granular reverse-geo will be:
+@@ -83,7 +83,7 @@ GHASHPREC = 7
+ JSON_INDENT ?= no
+ 
+ # Location of optional default configuration file
+-CONFIGFILE = /etc/default/ot-recorder
++CONFIGFILE = /usr/local/etc/ot-recorder/ot-recorder.conf
+ 
+ # Optionally specify the path to the Mosquitto libs, include here
+ MOSQUITTO_INC = -I/usr/include
diff --git a/www/ot-recorder/pkg-plist b/www/ot-recorder/pkg-plist
index c5d052effe2a..7f2c491e3c67 100644
--- a/www/ot-recorder/pkg-plist
+++ b/www/ot-recorder/pkg-plist
@@ -2,10 +2,8 @@
 bin/ocat
 etc/rc.d/ot-recorder
 sbin/ot-recorder
-%%WWWDIR%%/favicon.ico
 %%WWWDIR%%/index.html
-%%WWWDIR%%/last/config.js
-%%WWWDIR%%/last/config.js.sample
+%%WWWDIR%%/config.js
 %%WWWDIR%%/last/index.html
 %%WWWDIR%%/last/last.html
 %%WWWDIR%%/last/manifest.json
@@ -16,10 +14,15 @@ sbin/ot-recorder
 %%WWWDIR%%/map/map_google.js
 %%WWWDIR%%/map/map_leaflet.js
 %%WWWDIR%%/owntracks.xsl
-%%WWWDIR%%/static/js/jquery-1.12.0.min.js
-%%WWWDIR%%/static/js/jquery-migrate-1.2.1.min.js
-%%WWWDIR%%/static/js/moment.min.js
-%%WWWDIR%%/static/js/mustache.js
+%%WWWDIR%%/static/datatables/css/jquery.dataTables.min.css
+%%WWWDIR%%/static/datatables/images/sort_asc.png
+%%WWWDIR%%/static/datatables/images/sort_asc_disabled.png
+%%WWWDIR%%/static/datatables/images/sort_both.png
+%%WWWDIR%%/static/datatables/images/sort_desc.png
+%%WWWDIR%%/static/datatables/images/sort_desc_disabled.png
+%%WWWDIR%%/static/datatables/js/jquery.dataTables.min.js
+%%WWWDIR%%/static/datatables/js/jquery.min.js
+%%WWWDIR%%/static/defaultface.svg
 %%WWWDIR%%/static/leaflet/images/layers-2x.png
 %%WWWDIR%%/static/leaflet/images/layers.png
 %%WWWDIR%%/static/leaflet/images/marker-icon-2x.png
@@ -28,275 +31,272 @@ sbin/ot-recorder
 %%WWWDIR%%/static/leaflet/leaflet.css
 %%WWWDIR%%/static/leaflet/leaflet.js
 %%WWWDIR%%/static/leaflet/leaflet.js.map
-%%WWWDIR%%/static/leaflet/version-1.3.4
 %%WWWDIR%%/static/recorder.png
+%%WWWDIR%%/static/flags/AD.png
+%%WWWDIR%%/static/flags/AE.png
+%%WWWDIR%%/static/flags/AF.png
+%%WWWDIR%%/static/flags/AG.png
+%%WWWDIR%%/static/flags/AI.png
+%%WWWDIR%%/static/flags/AL.png
+%%WWWDIR%%/static/flags/AM.png
+%%WWWDIR%%/static/flags/AN.png
+%%WWWDIR%%/static/flags/AO.png
+%%WWWDIR%%/static/flags/AQ.png
+%%WWWDIR%%/static/flags/AR.png
+%%WWWDIR%%/static/flags/AS.png
+%%WWWDIR%%/static/flags/AT.png
+%%WWWDIR%%/static/flags/AU.png
+%%WWWDIR%%/static/flags/AW.png
+%%WWWDIR%%/static/flags/AX.png
+%%WWWDIR%%/static/flags/AZ.png
+%%WWWDIR%%/static/flags/BA.png
+%%WWWDIR%%/static/flags/BB.png
+%%WWWDIR%%/static/flags/BD.png
+%%WWWDIR%%/static/flags/BE.png
+%%WWWDIR%%/static/flags/BF.png
+%%WWWDIR%%/static/flags/BG.png
+%%WWWDIR%%/static/flags/BH.png
+%%WWWDIR%%/static/flags/BI.png
+%%WWWDIR%%/static/flags/BJ.png
+%%WWWDIR%%/static/flags/BL.png
+%%WWWDIR%%/static/flags/BM.png
+%%WWWDIR%%/static/flags/BN.png
+%%WWWDIR%%/static/flags/BO.png
+%%WWWDIR%%/static/flags/BR.png
+%%WWWDIR%%/static/flags/BS.png
+%%WWWDIR%%/static/flags/BT.png
+%%WWWDIR%%/static/flags/BW.png
+%%WWWDIR%%/static/flags/BY.png
+%%WWWDIR%%/static/flags/BZ.png
+%%WWWDIR%%/static/flags/CA.png
+%%WWWDIR%%/static/flags/CC.png
+%%WWWDIR%%/static/flags/CD.png
+%%WWWDIR%%/static/flags/CF.png
+%%WWWDIR%%/static/flags/CG.png
+%%WWWDIR%%/static/flags/CH.png
+%%WWWDIR%%/static/flags/CI.png
+%%WWWDIR%%/static/flags/CK.png
+%%WWWDIR%%/static/flags/CL.png
+%%WWWDIR%%/static/flags/CM.png
+%%WWWDIR%%/static/flags/CN.png
+%%WWWDIR%%/static/flags/CO.png
+%%WWWDIR%%/static/flags/CR.png
+%%WWWDIR%%/static/flags/CU.png
+%%WWWDIR%%/static/flags/CV.png
+%%WWWDIR%%/static/flags/CW.png
+%%WWWDIR%%/static/flags/CX.png
+%%WWWDIR%%/static/flags/CY.png
+%%WWWDIR%%/static/flags/CZ.png
+%%WWWDIR%%/static/flags/DE.png
+%%WWWDIR%%/static/flags/DJ.png
+%%WWWDIR%%/static/flags/DK.png
+%%WWWDIR%%/static/flags/DM.png
+%%WWWDIR%%/static/flags/DO.png
+%%WWWDIR%%/static/flags/DZ.png
+%%WWWDIR%%/static/flags/EC.png
+%%WWWDIR%%/static/flags/EE.png
+%%WWWDIR%%/static/flags/EG.png
+%%WWWDIR%%/static/flags/EH.png
+%%WWWDIR%%/static/flags/ER.png
+%%WWWDIR%%/static/flags/ES.png
+%%WWWDIR%%/static/flags/ET.png
+%%WWWDIR%%/static/flags/EU.png
+%%WWWDIR%%/static/flags/FI.png
+%%WWWDIR%%/static/flags/FJ.png
+%%WWWDIR%%/static/flags/FK.png
+%%WWWDIR%%/static/flags/FM.png
+%%WWWDIR%%/static/flags/FO.png
+%%WWWDIR%%/static/flags/FR.png
+%%WWWDIR%%/static/flags/GA.png
+%%WWWDIR%%/static/flags/GB.png
+%%WWWDIR%%/static/flags/GD.png
+%%WWWDIR%%/static/flags/GE.png
+%%WWWDIR%%/static/flags/GG.png
+%%WWWDIR%%/static/flags/GH.png
+%%WWWDIR%%/static/flags/GI.png
+%%WWWDIR%%/static/flags/GL.png
+%%WWWDIR%%/static/flags/GM.png
+%%WWWDIR%%/static/flags/GN.png
+%%WWWDIR%%/static/flags/GQ.png
+%%WWWDIR%%/static/flags/GR.png
+%%WWWDIR%%/static/flags/GS.png
+%%WWWDIR%%/static/flags/GT.png
+%%WWWDIR%%/static/flags/GU.png
+%%WWWDIR%%/static/flags/GW.png
+%%WWWDIR%%/static/flags/GY.png
+%%WWWDIR%%/static/flags/HK.png
+%%WWWDIR%%/static/flags/HN.png
+%%WWWDIR%%/static/flags/HR.png
+%%WWWDIR%%/static/flags/HT.png
+%%WWWDIR%%/static/flags/HU.png
+%%WWWDIR%%/static/flags/Hello.txt
+%%WWWDIR%%/static/flags/IC.png
+%%WWWDIR%%/static/flags/ID.png
+%%WWWDIR%%/static/flags/IE.png
+%%WWWDIR%%/static/flags/IL.png
+%%WWWDIR%%/static/flags/IM.png
+%%WWWDIR%%/static/flags/IN.png
+%%WWWDIR%%/static/flags/IQ.png
+%%WWWDIR%%/static/flags/IR.png
+%%WWWDIR%%/static/flags/IS.png
+%%WWWDIR%%/static/flags/IT.png
+%%WWWDIR%%/static/flags/JE.png
+%%WWWDIR%%/static/flags/JM.png
+%%WWWDIR%%/static/flags/JO.png
+%%WWWDIR%%/static/flags/JP.png
+%%WWWDIR%%/static/flags/KE.png
+%%WWWDIR%%/static/flags/KG.png
+%%WWWDIR%%/static/flags/KH.png
+%%WWWDIR%%/static/flags/KI.png
+%%WWWDIR%%/static/flags/KM.png
+%%WWWDIR%%/static/flags/KN.png
+%%WWWDIR%%/static/flags/KP.png
+%%WWWDIR%%/static/flags/KR.png
+%%WWWDIR%%/static/flags/KW.png
+%%WWWDIR%%/static/flags/KY.png
+%%WWWDIR%%/static/flags/KZ.png
+%%WWWDIR%%/static/flags/LA.png
+%%WWWDIR%%/static/flags/LB.png
+%%WWWDIR%%/static/flags/LC.png
+%%WWWDIR%%/static/flags/LI.png
+%%WWWDIR%%/static/flags/LICENSE.txt
+%%WWWDIR%%/static/flags/LK.png
+%%WWWDIR%%/static/flags/LR.png
+%%WWWDIR%%/static/flags/LS.png
+%%WWWDIR%%/static/flags/LT.png
+%%WWWDIR%%/static/flags/LU.png
+%%WWWDIR%%/static/flags/LV.png
+%%WWWDIR%%/static/flags/LY.png
+%%WWWDIR%%/static/flags/MA.png
+%%WWWDIR%%/static/flags/MC.png
+%%WWWDIR%%/static/flags/MD.png
+%%WWWDIR%%/static/flags/ME.png
+%%WWWDIR%%/static/flags/MF.png
+%%WWWDIR%%/static/flags/MG.png
+%%WWWDIR%%/static/flags/MH.png
+%%WWWDIR%%/static/flags/MK.png
+%%WWWDIR%%/static/flags/ML.png
+%%WWWDIR%%/static/flags/MM.png
+%%WWWDIR%%/static/flags/MN.png
+%%WWWDIR%%/static/flags/MO.png
+%%WWWDIR%%/static/flags/MP.png
+%%WWWDIR%%/static/flags/MQ.png
+%%WWWDIR%%/static/flags/MR.png
+%%WWWDIR%%/static/flags/MS.png
+%%WWWDIR%%/static/flags/MT.png
+%%WWWDIR%%/static/flags/MU.png
+%%WWWDIR%%/static/flags/MV.png
+%%WWWDIR%%/static/flags/MW.png
+%%WWWDIR%%/static/flags/MX.png
+%%WWWDIR%%/static/flags/MY.png
+%%WWWDIR%%/static/flags/MZ.png
+%%WWWDIR%%/static/flags/NA.png
+%%WWWDIR%%/static/flags/NC.png
+%%WWWDIR%%/static/flags/NE.png
+%%WWWDIR%%/static/flags/NF.png
+%%WWWDIR%%/static/flags/NG.png
+%%WWWDIR%%/static/flags/NI.png
+%%WWWDIR%%/static/flags/NL.png
+%%WWWDIR%%/static/flags/NO.png
+%%WWWDIR%%/static/flags/NP.png
+%%WWWDIR%%/static/flags/NR.png
+%%WWWDIR%%/static/flags/NU.png
+%%WWWDIR%%/static/flags/NZ.png
+%%WWWDIR%%/static/flags/OM.png
+%%WWWDIR%%/static/flags/PA.png
+%%WWWDIR%%/static/flags/PE.png
+%%WWWDIR%%/static/flags/PF.png
+%%WWWDIR%%/static/flags/PG.png
+%%WWWDIR%%/static/flags/PH.png
+%%WWWDIR%%/static/flags/PK.png
+%%WWWDIR%%/static/flags/PL.png
+%%WWWDIR%%/static/flags/PN.png
+%%WWWDIR%%/static/flags/PR.png
+%%WWWDIR%%/static/flags/PS.png
+%%WWWDIR%%/static/flags/PT.png
+%%WWWDIR%%/static/flags/PW.png
+%%WWWDIR%%/static/flags/PY.png
+%%WWWDIR%%/static/flags/QA.png
+%%WWWDIR%%/static/flags/RO.png
+%%WWWDIR%%/static/flags/RS.png
+%%WWWDIR%%/static/flags/RU.png
+%%WWWDIR%%/static/flags/RW.png
+%%WWWDIR%%/static/flags/SA.png
+%%WWWDIR%%/static/flags/SB.png
+%%WWWDIR%%/static/flags/SC.png
+%%WWWDIR%%/static/flags/SD.png
+%%WWWDIR%%/static/flags/SE.png
+%%WWWDIR%%/static/flags/SG.png
+%%WWWDIR%%/static/flags/SH.png
+%%WWWDIR%%/static/flags/SI.png
+%%WWWDIR%%/static/flags/SK.png
+%%WWWDIR%%/static/flags/SL.png
+%%WWWDIR%%/static/flags/SM.png
+%%WWWDIR%%/static/flags/SN.png
+%%WWWDIR%%/static/flags/SO.png
+%%WWWDIR%%/static/flags/SR.png
+%%WWWDIR%%/static/flags/SS.png
+%%WWWDIR%%/static/flags/ST.png
+%%WWWDIR%%/static/flags/SV.png
+%%WWWDIR%%/static/flags/SY.png
+%%WWWDIR%%/static/flags/SZ.png
+%%WWWDIR%%/static/flags/TC.png
+%%WWWDIR%%/static/flags/TD.png
+%%WWWDIR%%/static/flags/TF.png
+%%WWWDIR%%/static/flags/TG.png
+%%WWWDIR%%/static/flags/TH.png
+%%WWWDIR%%/static/flags/TJ.png
+%%WWWDIR%%/static/flags/TK.png
+%%WWWDIR%%/static/flags/TL.png
+%%WWWDIR%%/static/flags/TM.png
+%%WWWDIR%%/static/flags/TN.png
+%%WWWDIR%%/static/flags/TO.png
+%%WWWDIR%%/static/flags/TR.png
+%%WWWDIR%%/static/flags/TT.png
+%%WWWDIR%%/static/flags/TV.png
+%%WWWDIR%%/static/flags/TW.png
+%%WWWDIR%%/static/flags/TZ.png
+%%WWWDIR%%/static/flags/UA.png
+%%WWWDIR%%/static/flags/UG.png
+%%WWWDIR%%/static/flags/US.png
+%%WWWDIR%%/static/flags/UY.png
+%%WWWDIR%%/static/flags/UZ.png
+%%WWWDIR%%/static/flags/VA.png
+%%WWWDIR%%/static/flags/VC.png
+%%WWWDIR%%/static/flags/VE.png
+%%WWWDIR%%/static/flags/VG.png
+%%WWWDIR%%/static/flags/VI.png
+%%WWWDIR%%/static/flags/VN.png
+%%WWWDIR%%/static/flags/VU.png
+%%WWWDIR%%/static/flags/WF.png
+%%WWWDIR%%/static/flags/WS.png
+%%WWWDIR%%/static/flags/YE.png
+%%WWWDIR%%/static/flags/YT.png
+%%WWWDIR%%/static/flags/ZA.png
+%%WWWDIR%%/static/flags/ZM.png
+%%WWWDIR%%/static/flags/ZW.png
+%%WWWDIR%%/static/flags/__.png
 %%WWWDIR%%/table/config.js
-%%WWWDIR%%/table/defaultface.js
-%%WWWDIR%%/table/flags/AD.png
-%%WWWDIR%%/table/flags/AE.png
-%%WWWDIR%%/table/flags/AF.png
-%%WWWDIR%%/table/flags/AG.png
-%%WWWDIR%%/table/flags/AI.png
-%%WWWDIR%%/table/flags/AL.png
-%%WWWDIR%%/table/flags/AM.png
-%%WWWDIR%%/table/flags/AN.png
-%%WWWDIR%%/table/flags/AO.png
-%%WWWDIR%%/table/flags/AQ.png
-%%WWWDIR%%/table/flags/AR.png
-%%WWWDIR%%/table/flags/AS.png
-%%WWWDIR%%/table/flags/AT.png
-%%WWWDIR%%/table/flags/AU.png
-%%WWWDIR%%/table/flags/AW.png
-%%WWWDIR%%/table/flags/AX.png
-%%WWWDIR%%/table/flags/AZ.png
-%%WWWDIR%%/table/flags/BA.png
-%%WWWDIR%%/table/flags/BB.png
-%%WWWDIR%%/table/flags/BD.png
-%%WWWDIR%%/table/flags/BE.png
-%%WWWDIR%%/table/flags/BF.png
-%%WWWDIR%%/table/flags/BG.png
-%%WWWDIR%%/table/flags/BH.png
-%%WWWDIR%%/table/flags/BI.png
-%%WWWDIR%%/table/flags/BJ.png
-%%WWWDIR%%/table/flags/BL.png
-%%WWWDIR%%/table/flags/BM.png
-%%WWWDIR%%/table/flags/BN.png
-%%WWWDIR%%/table/flags/BO.png
-%%WWWDIR%%/table/flags/BR.png
-%%WWWDIR%%/table/flags/BS.png
-%%WWWDIR%%/table/flags/BT.png
-%%WWWDIR%%/table/flags/BW.png
-%%WWWDIR%%/table/flags/BY.png
-%%WWWDIR%%/table/flags/BZ.png
-%%WWWDIR%%/table/flags/CA.png
-%%WWWDIR%%/table/flags/CC.png
-%%WWWDIR%%/table/flags/CD.png
-%%WWWDIR%%/table/flags/CF.png
-%%WWWDIR%%/table/flags/CG.png
-%%WWWDIR%%/table/flags/CH.png
-%%WWWDIR%%/table/flags/CI.png
-%%WWWDIR%%/table/flags/CK.png
-%%WWWDIR%%/table/flags/CL.png
-%%WWWDIR%%/table/flags/CM.png
-%%WWWDIR%%/table/flags/CN.png
-%%WWWDIR%%/table/flags/CO.png
-%%WWWDIR%%/table/flags/CR.png
-%%WWWDIR%%/table/flags/CU.png
-%%WWWDIR%%/table/flags/CV.png
-%%WWWDIR%%/table/flags/CW.png
-%%WWWDIR%%/table/flags/CX.png
-%%WWWDIR%%/table/flags/CY.png
-%%WWWDIR%%/table/flags/CZ.png
-%%WWWDIR%%/table/flags/DE.png
-%%WWWDIR%%/table/flags/DJ.png
-%%WWWDIR%%/table/flags/DK.png
-%%WWWDIR%%/table/flags/DM.png
-%%WWWDIR%%/table/flags/DO.png
-%%WWWDIR%%/table/flags/DZ.png
-%%WWWDIR%%/table/flags/EC.png
-%%WWWDIR%%/table/flags/EE.png
-%%WWWDIR%%/table/flags/EG.png
-%%WWWDIR%%/table/flags/EH.png
-%%WWWDIR%%/table/flags/ER.png
-%%WWWDIR%%/table/flags/ES.png
-%%WWWDIR%%/table/flags/ET.png
-%%WWWDIR%%/table/flags/EU.png
-%%WWWDIR%%/table/flags/FI.png
-%%WWWDIR%%/table/flags/FJ.png
-%%WWWDIR%%/table/flags/FK.png
-%%WWWDIR%%/table/flags/FM.png
-%%WWWDIR%%/table/flags/FO.png
-%%WWWDIR%%/table/flags/FR.png
-%%WWWDIR%%/table/flags/GA.png
-%%WWWDIR%%/table/flags/GB.png
-%%WWWDIR%%/table/flags/GD.png
-%%WWWDIR%%/table/flags/GE.png
-%%WWWDIR%%/table/flags/GG.png
-%%WWWDIR%%/table/flags/GH.png
-%%WWWDIR%%/table/flags/GI.png
-%%WWWDIR%%/table/flags/GL.png
-%%WWWDIR%%/table/flags/GM.png
-%%WWWDIR%%/table/flags/GN.png
-%%WWWDIR%%/table/flags/GQ.png
-%%WWWDIR%%/table/flags/GR.png
-%%WWWDIR%%/table/flags/GS.png
-%%WWWDIR%%/table/flags/GT.png
-%%WWWDIR%%/table/flags/GU.png
-%%WWWDIR%%/table/flags/GW.png
-%%WWWDIR%%/table/flags/GY.png
-%%WWWDIR%%/table/flags/HK.png
-%%WWWDIR%%/table/flags/HN.png
-%%WWWDIR%%/table/flags/HR.png
-%%WWWDIR%%/table/flags/HT.png
-%%WWWDIR%%/table/flags/HU.png
-%%WWWDIR%%/table/flags/Hello.txt
-%%WWWDIR%%/table/flags/IC.png
-%%WWWDIR%%/table/flags/ID.png
-%%WWWDIR%%/table/flags/IE.png
-%%WWWDIR%%/table/flags/IL.png
-%%WWWDIR%%/table/flags/IM.png
-%%WWWDIR%%/table/flags/IN.png
-%%WWWDIR%%/table/flags/IQ.png
-%%WWWDIR%%/table/flags/IR.png
-%%WWWDIR%%/table/flags/IS.png
-%%WWWDIR%%/table/flags/IT.png
-%%WWWDIR%%/table/flags/JE.png
-%%WWWDIR%%/table/flags/JM.png
-%%WWWDIR%%/table/flags/JO.png
-%%WWWDIR%%/table/flags/JP.png
-%%WWWDIR%%/table/flags/KE.png
-%%WWWDIR%%/table/flags/KG.png
-%%WWWDIR%%/table/flags/KH.png
-%%WWWDIR%%/table/flags/KI.png
-%%WWWDIR%%/table/flags/KM.png
-%%WWWDIR%%/table/flags/KN.png
-%%WWWDIR%%/table/flags/KP.png
-%%WWWDIR%%/table/flags/KR.png
-%%WWWDIR%%/table/flags/KW.png
-%%WWWDIR%%/table/flags/KY.png
-%%WWWDIR%%/table/flags/KZ.png
-%%WWWDIR%%/table/flags/LA.png
-%%WWWDIR%%/table/flags/LB.png
-%%WWWDIR%%/table/flags/LC.png
-%%WWWDIR%%/table/flags/LI.png
-%%WWWDIR%%/table/flags/LICENSE.txt
-%%WWWDIR%%/table/flags/LK.png
-%%WWWDIR%%/table/flags/LR.png
-%%WWWDIR%%/table/flags/LS.png
-%%WWWDIR%%/table/flags/LT.png
-%%WWWDIR%%/table/flags/LU.png
-%%WWWDIR%%/table/flags/LV.png
-%%WWWDIR%%/table/flags/LY.png
-%%WWWDIR%%/table/flags/MA.png
-%%WWWDIR%%/table/flags/MC.png
-%%WWWDIR%%/table/flags/MD.png
-%%WWWDIR%%/table/flags/ME.png
-%%WWWDIR%%/table/flags/MF.png
-%%WWWDIR%%/table/flags/MG.png
-%%WWWDIR%%/table/flags/MH.png
-%%WWWDIR%%/table/flags/MK.png
-%%WWWDIR%%/table/flags/ML.png
-%%WWWDIR%%/table/flags/MM.png
-%%WWWDIR%%/table/flags/MN.png
-%%WWWDIR%%/table/flags/MO.png
-%%WWWDIR%%/table/flags/MP.png
-%%WWWDIR%%/table/flags/MQ.png
-%%WWWDIR%%/table/flags/MR.png
-%%WWWDIR%%/table/flags/MS.png
-%%WWWDIR%%/table/flags/MT.png
-%%WWWDIR%%/table/flags/MU.png
-%%WWWDIR%%/table/flags/MV.png
-%%WWWDIR%%/table/flags/MW.png
-%%WWWDIR%%/table/flags/MX.png
-%%WWWDIR%%/table/flags/MY.png
-%%WWWDIR%%/table/flags/MZ.png
-%%WWWDIR%%/table/flags/NA.png
-%%WWWDIR%%/table/flags/NC.png
-%%WWWDIR%%/table/flags/NE.png
-%%WWWDIR%%/table/flags/NF.png
-%%WWWDIR%%/table/flags/NG.png
-%%WWWDIR%%/table/flags/NI.png
-%%WWWDIR%%/table/flags/NL.png
-%%WWWDIR%%/table/flags/NO.png
-%%WWWDIR%%/table/flags/NP.png
-%%WWWDIR%%/table/flags/NR.png
-%%WWWDIR%%/table/flags/NU.png
-%%WWWDIR%%/table/flags/NZ.png
-%%WWWDIR%%/table/flags/OM.png
-%%WWWDIR%%/table/flags/PA.png
-%%WWWDIR%%/table/flags/PE.png
-%%WWWDIR%%/table/flags/PF.png
-%%WWWDIR%%/table/flags/PG.png
-%%WWWDIR%%/table/flags/PH.png
-%%WWWDIR%%/table/flags/PK.png
-%%WWWDIR%%/table/flags/PL.png
-%%WWWDIR%%/table/flags/PN.png
-%%WWWDIR%%/table/flags/PR.png
-%%WWWDIR%%/table/flags/PS.png
-%%WWWDIR%%/table/flags/PT.png
-%%WWWDIR%%/table/flags/PW.png
-%%WWWDIR%%/table/flags/PY.png
-%%WWWDIR%%/table/flags/QA.png
-%%WWWDIR%%/table/flags/RO.png
-%%WWWDIR%%/table/flags/RS.png
-%%WWWDIR%%/table/flags/RU.png
-%%WWWDIR%%/table/flags/RW.png
-%%WWWDIR%%/table/flags/SA.png
-%%WWWDIR%%/table/flags/SB.png
-%%WWWDIR%%/table/flags/SC.png
-%%WWWDIR%%/table/flags/SD.png
-%%WWWDIR%%/table/flags/SE.png
-%%WWWDIR%%/table/flags/SG.png
-%%WWWDIR%%/table/flags/SH.png
-%%WWWDIR%%/table/flags/SI.png
-%%WWWDIR%%/table/flags/SK.png
-%%WWWDIR%%/table/flags/SL.png
-%%WWWDIR%%/table/flags/SM.png
-%%WWWDIR%%/table/flags/SN.png
-%%WWWDIR%%/table/flags/SO.png
-%%WWWDIR%%/table/flags/SR.png
-%%WWWDIR%%/table/flags/SS.png
-%%WWWDIR%%/table/flags/ST.png
-%%WWWDIR%%/table/flags/SV.png
-%%WWWDIR%%/table/flags/SY.png
-%%WWWDIR%%/table/flags/SZ.png
-%%WWWDIR%%/table/flags/TC.png
-%%WWWDIR%%/table/flags/TD.png
-%%WWWDIR%%/table/flags/TF.png
-%%WWWDIR%%/table/flags/TG.png
-%%WWWDIR%%/table/flags/TH.png
-%%WWWDIR%%/table/flags/TJ.png
-%%WWWDIR%%/table/flags/TK.png
-%%WWWDIR%%/table/flags/TL.png
-%%WWWDIR%%/table/flags/TM.png
-%%WWWDIR%%/table/flags/TN.png
-%%WWWDIR%%/table/flags/TO.png
-%%WWWDIR%%/table/flags/TR.png
-%%WWWDIR%%/table/flags/TT.png
-%%WWWDIR%%/table/flags/TV.png
-%%WWWDIR%%/table/flags/TW.png
-%%WWWDIR%%/table/flags/TZ.png
-%%WWWDIR%%/table/flags/UA.png
-%%WWWDIR%%/table/flags/UG.png
-%%WWWDIR%%/table/flags/US.png
-%%WWWDIR%%/table/flags/UY.png
-%%WWWDIR%%/table/flags/UZ.png
-%%WWWDIR%%/table/flags/VA.png
-%%WWWDIR%%/table/flags/VC.png
-%%WWWDIR%%/table/flags/VE.png
-%%WWWDIR%%/table/flags/VG.png
-%%WWWDIR%%/table/flags/VI.png
-%%WWWDIR%%/table/flags/VN.png
-%%WWWDIR%%/table/flags/VU.png
-%%WWWDIR%%/table/flags/WF.png
-%%WWWDIR%%/table/flags/WS.png
-%%WWWDIR%%/table/flags/YE.png
-%%WWWDIR%%/table/flags/YT.png
-%%WWWDIR%%/table/flags/ZA.png
-%%WWWDIR%%/table/flags/ZM.png
-%%WWWDIR%%/table/flags/ZW.png
-%%WWWDIR%%/table/flags/__.png
-%%WWWDIR%%/table/images/sort_asc.png
-%%WWWDIR%%/table/images/sort_both.png
-%%WWWDIR%%/table/images/sort_desc.png
 %%WWWDIR%%/table/index.html
-%%WWWDIR%%/table/js/jquery.dataTables.min.css
-%%WWWDIR%%/table/js/jquery.dataTables.min.js
 %%WWWDIR%%/table/otable.css
 %%WWWDIR%%/test-ws.html
 %%WWWDIR%%/test.txt
+%%WWWDIR%%/utils/debug.js
+%%WWWDIR%%/utils/map.css
+%%WWWDIR%%/utils/map.js
+%%WWWDIR%%/utils/map_google.js
+%%WWWDIR%%/utils/map_leaflet.js
+%%WWWDIR%%/utils/misc.js
+%%WWWDIR%%/utils/network.js
 %%WWWDIR%%/views/jane.json.sample
 %%WWWDIR%%/views/leafletmap.html
 %%WWWDIR%%/views/vmap.html
 @dir %%WWWDIR%%/last
 @dir %%WWWDIR%%/map
-@dir %%WWWDIR%%/static/js
 @dir %%WWWDIR%%/static/leaflet/images
 @dir %%WWWDIR%%/static/leaflet
 @dir %%WWWDIR%%/static
-@dir %%WWWDIR%%/table/flags
-@dir %%WWWDIR%%/table/images
-@dir %%WWWDIR%%/table/js
+@dir %%WWWDIR%%/static/flags
 @dir %%WWWDIR%%/table
 @dir %%WWWDIR%%/views
 @dir(ot-recorder,ot-recorder,) /var/log/ot-recorder