pkg: sort plist, file systems getting in the way

Makefile

@@ -221,17 +221,18 @@ bootstrap: force
 	    CORE_REPOSITORY=${CORE_REPOSITORY}
 
 plist: force
-	@${MAKE} -C ${.CURDIR}/contrib plist
-	@${MAKE} -C ${.CURDIR}/src plist
+	@(${MAKE} -C ${.CURDIR}/contrib plist && \
+	    ${MAKE} -C ${.CURDIR}/src plist) | sort
 
 plist-fix: force
-	@${MAKE} DESTDIR=${DESTDIR} plist > ${.CURDIR}/plist
+	@${MAKE} DESTDIR=${DESTDIR} plist | sort > ${.CURDIR}/plist
 
 plist-check: force
-	@${MAKE} DESTDIR=${DESTDIR} plist > ${WRKDIR}/plist
-	@if ! diff -uq ${.CURDIR}/plist ${WRKDIR}/plist > /dev/null ; then \
+	@${MAKE} DESTDIR=${DESTDIR} plist > ${WRKDIR}/plist.new
+	@cat ${.CURDIR}/plist > ${WRKDIR}/plist.old
+	@if ! diff -uq ${WRKDIR}/plist.old ${WRKDIR}/plist.new > /dev/null ; then \
 		echo ">>> Package file lists do not match.  Please run 'make plist-fix'." >&2; \
-		diff -u ${.CURDIR}/plist ${WRKDIR}/plist; \
+		diff -u ${WRKDIR}/plist.old ${WRKDIR}/plist.new; \
 	fi
 
 metadata: force

plist

-/usr/local/opnsense/contrib/mobile-broadband-provider-info/serviceproviders.xml
-/usr/local/opnsense/contrib/tzdata/iso3166.tab
 /boot/brand-opnsense.4th
 /boot/logo-hourglass.4th
-@shadow /usr/local/etc/bogons.sample
-@shadow /usr/local/etc/bogonsv6.sample
-@shadow /usr/local/etc/config.xml.sample
 /usr/local/etc/ddb.conf
 /usr/local/etc/devd/carp.conf
 /usr/local/etc/devd/ifnet.conf
 /usr/local/etc/dh-parameters.1024
 /usr/local/etc/dh-parameters.2048
 /usr/local/etc/dh-parameters.4096
+/usr/local/etc/inc/IPv6.inc
+/usr/local/etc/inc/PEAR.inc
+/usr/local/etc/inc/XMLRPC_Client.inc
 /usr/local/etc/inc/auth.inc
 /usr/local/etc/inc/authgui.inc
 /usr/local/etc/inc/certs.inc
@@ -27,7 +25,6 @@
 /usr/local/etc/inc/interfaces.lib.inc
 /usr/local/etc/inc/ipsec.auth-user.php
 /usr/local/etc/inc/ipsec.inc
-/usr/local/etc/inc/IPv6.inc
 /usr/local/etc/inc/legacy_bindings.inc
 /usr/local/etc/inc/miniupnpd.inc
 /usr/local/etc/inc/notices.basic_sasl_client.inc
@@ -45,7 +42,6 @@
 /usr/local/etc/inc/openvpn.inc
 /usr/local/etc/inc/openvpn.tls-verify.php
 /usr/local/etc/inc/openvpn_wizard.inc
-/usr/local/etc/inc/PEAR.inc
 /usr/local/etc/inc/plugins.inc
 /usr/local/etc/inc/plugins.inc.d/if_group.inc
 /usr/local/etc/inc/plugins.inc.d/if_ipsec.inc
@@ -59,22 +55,19 @@
 /usr/local/etc/inc/unbound.inc
 /usr/local/etc/inc/upgrade_config.inc
 /usr/local/etc/inc/util.inc
+/usr/local/etc/inc/vslb.inc
 /usr/local/etc/inc/vslb/dns.proto
 /usr/local/etc/inc/vslb/tcp.proto
-/usr/local/etc/inc/vslb.inc
 /usr/local/etc/inc/xmlparse.inc
+/usr/local/etc/inc/xmlrpc.inc
 /usr/local/etc/inc/xmlrpc/legacy.inc
 /usr/local/etc/inc/xmlrpc/service.inc
 /usr/local/etc/inc/xmlrpc/test.inc
-/usr/local/etc/inc/xmlrpc.inc
-/usr/local/etc/inc/XMLRPC_Client.inc
 /usr/local/etc/netflow.conf.example
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20150402
 /usr/local/etc/pkg/fingerprints/OPNsense/revoked/pkg.opnsense.org.20160104
 /usr/local/etc/pkg/fingerprints/OPNsense/trusted/opnsense-update.deciso.com.20160725
 /usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20160630
-@shadow /usr/local/etc/pkg/repos/FreeBSD.conf.sample
-@shadow /usr/local/etc/pkg/repos/origin.conf.sample
 /usr/local/etc/rc
 /usr/local/etc/rc.backup_dhcpleases
 /usr/local/etc/rc.backup_netflow
@@ -139,6 +132,7 @@
 /usr/local/etc/rc.update_bogons
 /usr/local/etc/rc.update_urltables
 /usr/local/etc/ssl/opnsense.cnf
+/usr/local/opnsense/contrib/IXR_Library.php
 /usr/local/opnsense/contrib/base32/Base32.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Auth/Abstract.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Auth/AppIdentity.php
@@ -148,7 +142,6 @@
 /usr/local/opnsense/contrib/google-api-php-client/Google/Auth/LoginTicket.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Auth/OAuth2.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Auth/Simple.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/autoload.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Cache/Abstract.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Cache/Apc.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Cache/Exception.php
@@ -162,29 +155,30 @@
 /usr/local/opnsense/contrib/google-api-php-client/Google/Http/Batch.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Http/CacheParser.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Http/MediaFileUpload.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Http/Request.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Http/REST.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Http/Request.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/IO/Abstract.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/IO/cacerts.pem
 /usr/local/opnsense/contrib/google-api-php-client/Google/IO/Curl.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/IO/Exception.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/IO/Stream.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/IO/cacerts.pem
 /usr/local/opnsense/contrib/google-api-php-client/Google/Logger/Abstract.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Logger/Exception.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Logger/File.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Logger/Null.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Logger/Psr.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Model.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Service.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeSeller.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Service/Admin.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AdSense.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AdSenseHost.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Service/Admin.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Analytics.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AndroidEnterprise.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AndroidPublisher.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Service/Appsactivity.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/AppState.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Service/Appsactivity.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Audit.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Autoscaler.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Bigquery.php
@@ -192,8 +186,8 @@
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Books.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Calendar.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/CivicInfo.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/CloudMonitoring.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Compute.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Container.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Coordinate.php
@@ -236,10 +230,10 @@
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Reseller.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Resource.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Resourceviews.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Service/SQLAdmin.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/ShoppingContent.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/SiteVerification.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Spectrum.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Service/SQLAdmin.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Storage.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/TagManager.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Taskqueue.php
@@ -250,19 +244,21 @@
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/Webmasters.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/YouTube.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Service.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Signer/Abstract.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Signer/P12.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Task/Exception.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Task/Retryable.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Task/Runner.php
-/usr/local/opnsense/contrib/google-api-php-client/Google/Utils/URITemplate.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Utils.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/Utils/URITemplate.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Verifier/Abstract.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.php
-/usr/local/opnsense/contrib/IXR_Library.php
+/usr/local/opnsense/contrib/google-api-php-client/Google/autoload.php
+/usr/local/opnsense/contrib/mobile-broadband-provider-info/serviceproviders.xml
 /usr/local/opnsense/contrib/simplepie/.gitignore
 /usr/local/opnsense/contrib/simplepie/.travis.yml
+/usr/local/opnsense/contrib/simplepie/LICENSE.txt
+/usr/local/opnsense/contrib/simplepie/README.markdown
 /usr/local/opnsense/contrib/simplepie/autoloader.php
 /usr/local/opnsense/contrib/simplepie/build/charset.php
 /usr/local/opnsense/contrib/simplepie/build/compile.php
@@ -270,17 +266,18 @@
 /usr/local/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt
 /usr/local/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php
 /usr/local/opnsense/contrib/simplepie/composer.json
-/usr/local/opnsense/contrib/simplepie/idn/idna_convert.class.php
 /usr/local/opnsense/contrib/simplepie/idn/LICENCE
-/usr/local/opnsense/contrib/simplepie/idn/npdata.ser
 /usr/local/opnsense/contrib/simplepie/idn/ReadMe.txt
+/usr/local/opnsense/contrib/simplepie/idn/idna_convert.class.php
+/usr/local/opnsense/contrib/simplepie/idn/npdata.ser
+/usr/local/opnsense/contrib/simplepie/library/SimplePie.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Author.php
+/usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php
-/usr/local/opnsense/contrib/simplepie/library/SimplePie/Cache.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Caption.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Category.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php
@@ -291,7 +288,6 @@
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Exception.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/File.php
-/usr/local/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/IRI.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Item.php
@@ -306,10 +302,9 @@
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/Source.php
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php
-/usr/local/opnsense/contrib/simplepie/library/SimplePie.php
-/usr/local/opnsense/contrib/simplepie/LICENSE.txt
+/usr/local/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php
 /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist
-/usr/local/opnsense/contrib/simplepie/README.markdown
+/usr/local/opnsense/contrib/tzdata/iso3166.tab
 /usr/local/opnsense/mvc/app/cache/README
 /usr/local/opnsense/mvc/app/config/config.php
 /usr/local/opnsense/mvc/app/config/loader.php
@@ -326,49 +321,49 @@
 /usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SessionController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/SettingsController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/VoucherController.php
-/usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/SessionController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/VoucherController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/Api/MenuController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/FirmwareController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Cron/Api/ServiceController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Cron/Api/SettingsController.php
-/usr/local/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Cron/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Cron/ItemController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/ActivityController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/NetflowController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/NetworkinsightController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php
-/usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/netflow_capture.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetflowController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetworkinsightController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/netflow_capture.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/Api/ServiceController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/Api/SettingsController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogAlert.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogRule.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogRuleset.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/forms/generalSettings.xml
-/usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/dialogEditBlacklist.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
-/usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/ServiceController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/SettingsController.php
+/usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/IndexController.php
 /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogQueue.xml
 /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml
-/usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/IndexController.php
 /usr/local/opnsense/mvc/app/library/Google/API/Drive.php
 /usr/local/opnsense/mvc/app/library/OPNsense/Auth/API.php
 /usr/local/opnsense/mvc/app/library/OPNsense/Auth/AuthenticationFactory.php
@@ -397,11 +392,11 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AutoNumberField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BooleanField.php
+/usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ContainerField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CountryField.php
-/usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/EmailField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/IntegerField.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php
@@ -450,13 +445,6 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
-/usr/local/opnsense/mvc/app/views/layout_partials/base_dialog.volt
-/usr/local/opnsense/mvc/app/views/layout_partials/base_dialog_processing.volt
-/usr/local/opnsense/mvc/app/views/layout_partials/base_form.volt
-/usr/local/opnsense/mvc/app/views/layout_partials/base_menu_system.volt
-/usr/local/opnsense/mvc/app/views/layout_partials/form_input_tr.volt
-/usr/local/opnsense/mvc/app/views/layout_partials/sample_input_field.volt
-/usr/local/opnsense/mvc/app/views/layouts/default.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt
@@ -472,8 +460,16 @@
 /usr/local/opnsense/mvc/app/views/OPNsense/IDS/index.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/Proxy/index.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
+/usr/local/opnsense/mvc/app/views/layout_partials/base_dialog.volt
+/usr/local/opnsense/mvc/app/views/layout_partials/base_dialog_processing.volt
+/usr/local/opnsense/mvc/app/views/layout_partials/base_form.volt
+/usr/local/opnsense/mvc/app/views/layout_partials/base_menu_system.volt
+/usr/local/opnsense/mvc/app/views/layout_partials/form_input_tr.volt
+/usr/local/opnsense/mvc/app/views/layout_partials/sample_input_field.volt
+/usr/local/opnsense/mvc/app/views/layouts/default.volt
 /usr/local/opnsense/mvc/script/load_phalcon.php
 /usr/local/opnsense/mvc/script/run_migrations.php
+/usr/local/opnsense/mvc/tests/PHPunit.xml
 /usr/local/opnsense/mvc/tests/app/config/config.php
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M0_0_1.php
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
@@ -481,14 +477,44 @@
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.php
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.xml
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
-/usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest/config.xml
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest.php
+/usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest/config.xml
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AutoNumberFieldTest.php
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/BooleanFieldTest.php
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/Field_Framework_TestCase.php
 /usr/local/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/IntegerFieldTest.php
-/usr/local/opnsense/mvc/tests/PHPunit.xml
 /usr/local/opnsense/mvc/tests/setup.php
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/allow.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/cp-background-process.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/disconnect.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/fetch_template.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/generate_certs.php
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap-theme.min.css
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap.min.css
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/signin.css
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/exclude.list
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.eot
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.svg
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.ttf
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff2
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/default-logo.png
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/favicon.png
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/index.html
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/bootstrap.min.js
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/jquery-1.11.2.min.js
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/__init__.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/arp.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/daemonize.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/ipfw.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/listARPtable.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/listClients.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/overlay_template.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/process_accounting_messages.php
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql
+/usr/local/opnsense/scripts/OPNsense/CaptivePortal/strip_template.py
 /usr/local/opnsense/scripts/dns/unbound_dhcpd.py
 /usr/local/opnsense/scripts/filter/delete_table.py
 /usr/local/opnsense/scripts/filter/download_geoip.py
@@ -537,37 +563,6 @@
 /usr/local/opnsense/scripts/netflow/lib/aggregates/ports.py
 /usr/local/opnsense/scripts/netflow/lib/aggregates/source.py
 /usr/local/opnsense/scripts/netflow/lib/parse.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/allow.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/cp-background-process.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/disconnect.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/fetch_template.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/generate_certs.php
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap-theme.min.css
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap.min.css
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/signin.css
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/exclude.list
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.eot
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.svg
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.ttf
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff2
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/default-logo.png
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/favicon.png
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/index.html
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/bootstrap.min.js
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/jquery-1.11.2.min.js
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/__init__.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/arp.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/daemonize.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/db.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/lib/ipfw.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/listARPtable.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/listClients.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/overlay_template.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/process_accounting_messages.php
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql
-/usr/local/opnsense/scripts/OPNsense/CaptivePortal/strip_template.py
 /usr/local/opnsense/scripts/proxy/fetchACLs.py
 /usr/local/opnsense/scripts/proxy/generate_cert.php
 /usr/local/opnsense/scripts/proxy/setup.sh
@@ -646,9 +641,9 @@
 /usr/local/opnsense/service/templates/OPNsense/Cron/user.cron
 /usr/local/opnsense/service/templates/OPNsense/IDS/+MANIFEST
 /usr/local/opnsense/service/templates/OPNsense/IDS/+TARGETS
+/usr/local/opnsense/service/templates/OPNsense/IDS/OPNsense.rules
 /usr/local/opnsense/service/templates/OPNsense/IDS/classification.config
 /usr/local/opnsense/service/templates/OPNsense/IDS/newsyslog.conf
-/usr/local/opnsense/service/templates/OPNsense/IDS/OPNsense.rules
 /usr/local/opnsense/service/templates/OPNsense/IDS/rc.conf.d
 /usr/local/opnsense/service/templates/OPNsense/IDS/reference.config
 /usr/local/opnsense/service/templates/OPNsense/IDS/rule-updater.config
@@ -703,6 +698,8 @@
 /usr/local/opnsense/www/.htaccess
 /usr/local/opnsense/www/api.php
 /usr/local/opnsense/www/css/bootstrap-datepicker3.min.css
+/usr/local/opnsense/www/css/font-awesome.css
+/usr/local/opnsense/www/css/font-awesome.min.css
 /usr/local/opnsense/www/css/font-awesome/less/animated.less
 /usr/local/opnsense/www/css/font-awesome/less/bordered-pulled.less
 /usr/local/opnsense/www/css/font-awesome/less/core.less
@@ -729,24 +726,23 @@
 /usr/local/opnsense/www/css/font-awesome/scss/_stacked.scss
 /usr/local/opnsense/www/css/font-awesome/scss/_variables.scss
 /usr/local/opnsense/www/css/font-awesome/scss/font-awesome.scss
-/usr/local/opnsense/www/css/font-awesome.css
-/usr/local/opnsense/www/css/font-awesome.min.css
 /usr/local/opnsense/www/css/jquery.bootgrid.css
 /usr/local/opnsense/www/css/jquery.tokenize.css
 /usr/local/opnsense/www/css/nv.d3.css
 /usr/local/opnsense/www/css/nv.d3.min.css
+/usr/local/opnsense/www/fonts/FontAwesome.otf
 /usr/local/opnsense/www/fonts/fontawesome-webfont.eot
 /usr/local/opnsense/www/fonts/fontawesome-webfont.svg
 /usr/local/opnsense/www/fonts/fontawesome-webfont.ttf
 /usr/local/opnsense/www/fonts/fontawesome-webfont.woff
 /usr/local/opnsense/www/fonts/fontawesome-webfont.woff2
-/usr/local/opnsense/www/fonts/FontAwesome.otf
 /usr/local/opnsense/www/fonts/glyphicons-halflings-regular.eot
 /usr/local/opnsense/www/fonts/glyphicons-halflings-regular.svg
 /usr/local/opnsense/www/fonts/glyphicons-halflings-regular.ttf
 /usr/local/opnsense/www/fonts/glyphicons-halflings-regular.woff
 /usr/local/opnsense/www/fonts/glyphicons-halflings-regular.woff2
 /usr/local/opnsense/www/index.php
+/usr/local/opnsense/www/js/Tokenize.LICENSE
 /usr/local/opnsense/www/js/bootstrap-datepicker.min.js
 /usr/local/opnsense/www/js/bootstrap-dialog.js
 /usr/local/opnsense/www/js/bootstrap-dialog.min.js
@@ -760,8 +756,8 @@
 /usr/local/opnsense/www/js/d3.min.js.LICENSE
 /usr/local/opnsense/www/js/jquery-1.12.0.min.js
 /usr/local/opnsense/www/js/jquery-sortable.js
-/usr/local/opnsense/www/js/jquery.bootgrid.js
 /usr/local/opnsense/www/js/jquery.bootgrid.LICENSE
+/usr/local/opnsense/www/js/jquery.bootgrid.js
 /usr/local/opnsense/www/js/jquery.qrcode.js
 /usr/local/opnsense/www/js/jquery.qrcode.js.LICENSE
 /usr/local/opnsense/www/js/jquery.tokenize.js
@@ -772,11 +768,7 @@
 /usr/local/opnsense/www/js/opnsense_bootgrid_plugin.js
 /usr/local/opnsense/www/js/opnsense_ui.js
 /usr/local/opnsense/www/js/qrcode.js
-/usr/local/opnsense/www/js/Tokenize.LICENSE
-/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
-/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
-/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
-/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
+/usr/local/opnsense/www/themes/opnsense/LICENSE
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.eot
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.otf
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf
@@ -789,9 +781,16 @@
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.otf
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff
+/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
+/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
+/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
+/usr/local/opnsense/www/themes/opnsense/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/_bootstrap-compass.scss
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/_bootstrap-mincer.scss
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/_bootstrap-sprockets.scss
+/usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap-dialog.less
+/usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap-select/less/bootstrap-select.less
+/usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap-select/less/variables.less
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap/_alerts.scss
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap/_badges.scss
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap/_breadcrumbs.scss
@@ -861,17 +860,10 @@
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_text-overflow.scss
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
-/usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap-dialog.less
-/usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap-select/less/bootstrap-select.less
-/usr/local/opnsense/www/themes/opnsense/assets/stylesheets/bootstrap-select/less/variables.less
 /usr/local/opnsense/www/themes/opnsense/assets/stylesheets/main.scss
 /usr/local/opnsense/www/themes/opnsense/build/css/bootstrap-dialog.css
 /usr/local/opnsense/www/themes/opnsense/build/css/bootstrap-select.css
 /usr/local/opnsense/www/themes/opnsense/build/css/main.css
-/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.eot
-/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.svg
-/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.ttf
-/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.woff
 /usr/local/opnsense/www/themes/opnsense/build/fonts/LICENSE.SourceSansPro.txt
 /usr/local/opnsense/www/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.eot
 /usr/local/opnsense/www/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.otf
@@ -885,11 +877,14 @@
 /usr/local/opnsense/www/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.otf
 /usr/local/opnsense/www/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf
 /usr/local/opnsense/www/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff
+/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.eot
+/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.svg
+/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.ttf
+/usr/local/opnsense/www/themes/opnsense/build/fonts/bootstrap/glyphicons-halflings-regular.woff
 /usr/local/opnsense/www/themes/opnsense/build/images/caret.png
 /usr/local/opnsense/www/themes/opnsense/build/images/default-logo.png
 /usr/local/opnsense/www/themes/opnsense/build/images/favicon.png
 /usr/local/opnsense/www/themes/opnsense/build/images/icon-logo.png
-/usr/local/opnsense/www/themes/opnsense/LICENSE
 /usr/local/sbin/3gstats.php
 /usr/local/sbin/beep.sh
 /usr/local/sbin/configctl
@@ -1140,3 +1135,8 @@
 /usr/local/www/widgets/widgets/wake_on_lan.widget.php
 /usr/local/www/wizard.php
 /usr/local/www/xmlrpc.php
+@shadow /usr/local/etc/bogons.sample
+@shadow /usr/local/etc/bogonsv6.sample
+@shadow /usr/local/etc/config.xml.sample
+@shadow /usr/local/etc/pkg/repos/FreeBSD.conf.sample
+@shadow /usr/local/etc/pkg/repos/origin.conf.sample