Update to 1.66

As of this release, the package now updates files which were previously
updated by the app.  In keeping with not having modified files within
WWWDIR, the following files are now supplied by the package and are
created at the same time the vendor tarball is manually created.

The files in question are located in

* bootstrap/cache
* html/js/lang

These files should now be static and not modified by the application,
which would create them if not found. These files will get updated
with each new release.

3 files changed, 21 insertions, 24 deletions

diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index eb4a939c5a37..94c4f9de2ede 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	librenms
-PORTVERSION=	1.65.1
-PORTREVISION=	3
+PORTVERSION=	1.66
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	LOCAL/dvl:vendor
@@ -19,7 +18,7 @@ USES=		shebangfix python
 # RELEASE_TIMESTAMP is used for a patch inside the vendor code
 # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01
 # It sits here so you remember to update it with each release
-RELEASE_TIMESTAMP=	1594410976
+RELEASE_TIMESTAMP=	1596087334
 
 # perhaps we also need python-memcache python-mysqldb
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \
@@ -79,19 +78,6 @@ SHEBANG_FILES=	scripts/auth_test.php \
 		scripts/Migration/XML_Conversion/mkdir.sh \
 		scripts/removespikes.pl scripts/removespikes.php scripts/watchmaillog/watchmaillog.pl \
 		poller.php poller-wrapper.py \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-includes.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush-definition-cache.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/old-remove-require-once.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/config-scanner.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/add-vimline.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/remove-trailing-whitespace.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/merge-library.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/old-extract-schema.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/rename-config.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-standalone.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-schema-cache.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/old-remove-schema-def.php \
-		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-entity-file.php \
 		../${PORTNAME}-vendor-${PORTVERSION}/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
 		../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php
 
@@ -150,6 +136,17 @@ do-install:
 .endfor
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/vendor
 	(cd ${WRKDIR}/${PORTNAME}-vendor-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/vendor)
+	
+	# As of 1.66_1, the package installs bootstrap/cache
+	# This was previously left to the code to populate.
+	# That causese problems when the code doesn't do that update.
+	${MV} ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache/* ${STAGEDIR}/${WWWDIR}/bootstrap/cache/
+	${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache
+
+	# similarly with html/js/lang
+	${MV} ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang/* ${STAGEDIR}/${WWWDIR}/html/js/lang/
+	${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang
+
 # Make daily.sh executable
 #	${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh
 # lnms does not fall into any other +x category
diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo
index 9c90345221f5..ae651fb9f790 100644
--- a/net-mgmt/librenms/distinfo
+++ b/net-mgmt/librenms/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1595266936
-SHA256 (librenms-vendor-1.65.1.tar.gz) = 50419db248edc3aad935bc13d7ca5a98e7a862a0221cd12a6b06dc300a557c00
-SIZE (librenms-vendor-1.65.1.tar.gz) = 27458132
-SHA256 (librenms-librenms-1.65.1_GH0.tar.gz) = 31824ca00bf503d661fb1646448db08b0c5bd8361f2163fae1e31b0bd29c1a11
-SIZE (librenms-librenms-1.65.1_GH0.tar.gz) = 45656920
+TIMESTAMP = 1596654257
+SHA256 (librenms-vendor-1.66.tar.gz) = f08f081dc50a5fdc90dc3fd04195c58df51eb41aa47796f596858072874ba388
+SIZE (librenms-vendor-1.66.tar.gz) = 27668445
+SHA256 (librenms-librenms-1.66_GH0.tar.gz) = 1e05675d719f93527762fefca4d0a54756ab26d959ea03cab58aca3cb822b7c6
+SIZE (librenms-librenms-1.66_GH0.tar.gz) = 45889619
diff --git a/net-mgmt/librenms/files/patch-includes_common.php b/net-mgmt/librenms/files/patch-includes_common.php
index 2639a9ef3dc3..1b705d68f68f 100644
--- a/net-mgmt/librenms/files/patch-includes_common.php
+++ b/net-mgmt/librenms/files/patch-includes_common.php
@@ -5,9 +5,9 @@
          $output['local_date']   = $local_date;
          $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
 +    } else {
-+        $output['local_ver']  = '1.65.1';
-+        # obtained via git show --pretty='%H|%ct' -s 1.65.1
-+        $output['local_date'] = 1594410976;
++        $output['local_ver']  = '%%PORTVERSION%%';
++        # obtained via git show --pretty='%H|%ct' -s %%PORTVERSION%%
++        $output['local_date'] = %%RELEASE_TIMESTAMP%%;
      }
      $output['db_schema']   = vsprintf('%s (%s)', $version->database());
      $output['php_ver']     = phpversion();