diff --git a/contrib/Makefile b/contrib/Makefile index 9d033f898..521cb8b0c 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,4 +1,5 @@ ROOT= /usr/local/opnsense/contrib -TREES= mobile-broadband-provider-info tzdata +TREES= base32 google-api-php-client mobile-broadband-provider-info \ + simplepie tzdata .include "../Mk/tree.mk" diff --git a/src/opnsense/contrib/base32/Base32.php b/contrib/base32/Base32.php similarity index 100% rename from src/opnsense/contrib/base32/Base32.php rename to contrib/base32/Base32.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/Abstract.php b/contrib/google-api-php-client/Google/Auth/Abstract.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/Abstract.php rename to contrib/google-api-php-client/Google/Auth/Abstract.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/AppIdentity.php b/contrib/google-api-php-client/Google/Auth/AppIdentity.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/AppIdentity.php rename to contrib/google-api-php-client/Google/Auth/AppIdentity.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/AssertionCredentials.php b/contrib/google-api-php-client/Google/Auth/AssertionCredentials.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/AssertionCredentials.php rename to contrib/google-api-php-client/Google/Auth/AssertionCredentials.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/ComputeEngine.php b/contrib/google-api-php-client/Google/Auth/ComputeEngine.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/ComputeEngine.php rename to contrib/google-api-php-client/Google/Auth/ComputeEngine.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/Exception.php b/contrib/google-api-php-client/Google/Auth/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/Exception.php rename to contrib/google-api-php-client/Google/Auth/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/LoginTicket.php b/contrib/google-api-php-client/Google/Auth/LoginTicket.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/LoginTicket.php rename to contrib/google-api-php-client/Google/Auth/LoginTicket.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/OAuth2.php b/contrib/google-api-php-client/Google/Auth/OAuth2.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/OAuth2.php rename to contrib/google-api-php-client/Google/Auth/OAuth2.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Auth/Simple.php b/contrib/google-api-php-client/Google/Auth/Simple.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Auth/Simple.php rename to contrib/google-api-php-client/Google/Auth/Simple.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Cache/Abstract.php b/contrib/google-api-php-client/Google/Cache/Abstract.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Cache/Abstract.php rename to contrib/google-api-php-client/Google/Cache/Abstract.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Cache/Apc.php b/contrib/google-api-php-client/Google/Cache/Apc.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Cache/Apc.php rename to contrib/google-api-php-client/Google/Cache/Apc.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Cache/Exception.php b/contrib/google-api-php-client/Google/Cache/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Cache/Exception.php rename to contrib/google-api-php-client/Google/Cache/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Cache/File.php b/contrib/google-api-php-client/Google/Cache/File.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Cache/File.php rename to contrib/google-api-php-client/Google/Cache/File.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Cache/Memcache.php b/contrib/google-api-php-client/Google/Cache/Memcache.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Cache/Memcache.php rename to contrib/google-api-php-client/Google/Cache/Memcache.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Cache/Null.php b/contrib/google-api-php-client/Google/Cache/Null.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Cache/Null.php rename to contrib/google-api-php-client/Google/Cache/Null.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Client.php b/contrib/google-api-php-client/Google/Client.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Client.php rename to contrib/google-api-php-client/Google/Client.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Collection.php b/contrib/google-api-php-client/Google/Collection.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Collection.php rename to contrib/google-api-php-client/Google/Collection.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Config.php b/contrib/google-api-php-client/Google/Config.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Config.php rename to contrib/google-api-php-client/Google/Config.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Exception.php b/contrib/google-api-php-client/Google/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Exception.php rename to contrib/google-api-php-client/Google/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Http/Batch.php b/contrib/google-api-php-client/Google/Http/Batch.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Http/Batch.php rename to contrib/google-api-php-client/Google/Http/Batch.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Http/CacheParser.php b/contrib/google-api-php-client/Google/Http/CacheParser.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Http/CacheParser.php rename to contrib/google-api-php-client/Google/Http/CacheParser.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Http/MediaFileUpload.php b/contrib/google-api-php-client/Google/Http/MediaFileUpload.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Http/MediaFileUpload.php rename to contrib/google-api-php-client/Google/Http/MediaFileUpload.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Http/REST.php b/contrib/google-api-php-client/Google/Http/REST.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Http/REST.php rename to contrib/google-api-php-client/Google/Http/REST.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Http/Request.php b/contrib/google-api-php-client/Google/Http/Request.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Http/Request.php rename to contrib/google-api-php-client/Google/Http/Request.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/IO/Abstract.php b/contrib/google-api-php-client/Google/IO/Abstract.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/IO/Abstract.php rename to contrib/google-api-php-client/Google/IO/Abstract.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/IO/Curl.php b/contrib/google-api-php-client/Google/IO/Curl.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/IO/Curl.php rename to contrib/google-api-php-client/Google/IO/Curl.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/IO/Exception.php b/contrib/google-api-php-client/Google/IO/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/IO/Exception.php rename to contrib/google-api-php-client/Google/IO/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/IO/Stream.php b/contrib/google-api-php-client/Google/IO/Stream.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/IO/Stream.php rename to contrib/google-api-php-client/Google/IO/Stream.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/IO/cacerts.pem b/contrib/google-api-php-client/Google/IO/cacerts.pem similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/IO/cacerts.pem rename to contrib/google-api-php-client/Google/IO/cacerts.pem diff --git a/src/opnsense/contrib/google-api-php-client/Google/Logger/Abstract.php b/contrib/google-api-php-client/Google/Logger/Abstract.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Logger/Abstract.php rename to contrib/google-api-php-client/Google/Logger/Abstract.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Logger/Exception.php b/contrib/google-api-php-client/Google/Logger/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Logger/Exception.php rename to contrib/google-api-php-client/Google/Logger/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Logger/File.php b/contrib/google-api-php-client/Google/Logger/File.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Logger/File.php rename to contrib/google-api-php-client/Google/Logger/File.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Logger/Null.php b/contrib/google-api-php-client/Google/Logger/Null.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Logger/Null.php rename to contrib/google-api-php-client/Google/Logger/Null.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Logger/Psr.php b/contrib/google-api-php-client/Google/Logger/Psr.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Logger/Psr.php rename to contrib/google-api-php-client/Google/Logger/Psr.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Model.php b/contrib/google-api-php-client/Google/Model.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Model.php rename to contrib/google-api-php-client/Google/Model.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service.php b/contrib/google-api-php-client/Google/Service.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service.php rename to contrib/google-api-php-client/Google/Service.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php b/contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php rename to contrib/google-api-php-client/Google/Service/AdExchangeBuyer.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeSeller.php b/contrib/google-api-php-client/Google/Service/AdExchangeSeller.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AdExchangeSeller.php rename to contrib/google-api-php-client/Google/Service/AdExchangeSeller.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AdSense.php b/contrib/google-api-php-client/Google/Service/AdSense.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AdSense.php rename to contrib/google-api-php-client/Google/Service/AdSense.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AdSenseHost.php b/contrib/google-api-php-client/Google/Service/AdSenseHost.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AdSenseHost.php rename to contrib/google-api-php-client/Google/Service/AdSenseHost.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Admin.php b/contrib/google-api-php-client/Google/Service/Admin.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Admin.php rename to contrib/google-api-php-client/Google/Service/Admin.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Analytics.php b/contrib/google-api-php-client/Google/Service/Analytics.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Analytics.php rename to contrib/google-api-php-client/Google/Service/Analytics.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AndroidEnterprise.php b/contrib/google-api-php-client/Google/Service/AndroidEnterprise.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AndroidEnterprise.php rename to contrib/google-api-php-client/Google/Service/AndroidEnterprise.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AndroidPublisher.php b/contrib/google-api-php-client/Google/Service/AndroidPublisher.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AndroidPublisher.php rename to contrib/google-api-php-client/Google/Service/AndroidPublisher.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/AppState.php b/contrib/google-api-php-client/Google/Service/AppState.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/AppState.php rename to contrib/google-api-php-client/Google/Service/AppState.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Appsactivity.php b/contrib/google-api-php-client/Google/Service/Appsactivity.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Appsactivity.php rename to contrib/google-api-php-client/Google/Service/Appsactivity.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Audit.php b/contrib/google-api-php-client/Google/Service/Audit.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Audit.php rename to contrib/google-api-php-client/Google/Service/Audit.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Autoscaler.php b/contrib/google-api-php-client/Google/Service/Autoscaler.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Autoscaler.php rename to contrib/google-api-php-client/Google/Service/Autoscaler.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Bigquery.php b/contrib/google-api-php-client/Google/Service/Bigquery.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Bigquery.php rename to contrib/google-api-php-client/Google/Service/Bigquery.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Blogger.php b/contrib/google-api-php-client/Google/Service/Blogger.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Blogger.php rename to contrib/google-api-php-client/Google/Service/Blogger.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Books.php b/contrib/google-api-php-client/Google/Service/Books.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Books.php rename to contrib/google-api-php-client/Google/Service/Books.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Calendar.php b/contrib/google-api-php-client/Google/Service/Calendar.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Calendar.php rename to contrib/google-api-php-client/Google/Service/Calendar.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/CivicInfo.php b/contrib/google-api-php-client/Google/Service/CivicInfo.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/CivicInfo.php rename to contrib/google-api-php-client/Google/Service/CivicInfo.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/CloudMonitoring.php b/contrib/google-api-php-client/Google/Service/CloudMonitoring.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/CloudMonitoring.php rename to contrib/google-api-php-client/Google/Service/CloudMonitoring.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php b/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Cloudlatencytest.php rename to contrib/google-api-php-client/Google/Service/Cloudlatencytest.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Compute.php b/contrib/google-api-php-client/Google/Service/Compute.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Compute.php rename to contrib/google-api-php-client/Google/Service/Compute.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Container.php b/contrib/google-api-php-client/Google/Service/Container.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Container.php rename to contrib/google-api-php-client/Google/Service/Container.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Coordinate.php b/contrib/google-api-php-client/Google/Service/Coordinate.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Coordinate.php rename to contrib/google-api-php-client/Google/Service/Coordinate.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Customsearch.php b/contrib/google-api-php-client/Google/Service/Customsearch.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Customsearch.php rename to contrib/google-api-php-client/Google/Service/Customsearch.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Dataflow.php b/contrib/google-api-php-client/Google/Service/Dataflow.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Dataflow.php rename to contrib/google-api-php-client/Google/Service/Dataflow.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Datastore.php b/contrib/google-api-php-client/Google/Service/Datastore.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Datastore.php rename to contrib/google-api-php-client/Google/Service/Datastore.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Deploymentmanager.php b/contrib/google-api-php-client/Google/Service/Deploymentmanager.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Deploymentmanager.php rename to contrib/google-api-php-client/Google/Service/Deploymentmanager.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Dfareporting.php b/contrib/google-api-php-client/Google/Service/Dfareporting.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Dfareporting.php rename to contrib/google-api-php-client/Google/Service/Dfareporting.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Directory.php b/contrib/google-api-php-client/Google/Service/Directory.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Directory.php rename to contrib/google-api-php-client/Google/Service/Directory.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Dns.php b/contrib/google-api-php-client/Google/Service/Dns.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Dns.php rename to contrib/google-api-php-client/Google/Service/Dns.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/DoubleClickBidManager.php b/contrib/google-api-php-client/Google/Service/DoubleClickBidManager.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/DoubleClickBidManager.php rename to contrib/google-api-php-client/Google/Service/DoubleClickBidManager.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Doubleclicksearch.php b/contrib/google-api-php-client/Google/Service/Doubleclicksearch.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Doubleclicksearch.php rename to contrib/google-api-php-client/Google/Service/Doubleclicksearch.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Drive.php b/contrib/google-api-php-client/Google/Service/Drive.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Drive.php rename to contrib/google-api-php-client/Google/Service/Drive.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Exception.php b/contrib/google-api-php-client/Google/Service/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Exception.php rename to contrib/google-api-php-client/Google/Service/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Fitness.php b/contrib/google-api-php-client/Google/Service/Fitness.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Fitness.php rename to contrib/google-api-php-client/Google/Service/Fitness.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Freebase.php b/contrib/google-api-php-client/Google/Service/Freebase.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Freebase.php rename to contrib/google-api-php-client/Google/Service/Freebase.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Fusiontables.php b/contrib/google-api-php-client/Google/Service/Fusiontables.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Fusiontables.php rename to contrib/google-api-php-client/Google/Service/Fusiontables.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Games.php b/contrib/google-api-php-client/Google/Service/Games.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Games.php rename to contrib/google-api-php-client/Google/Service/Games.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/GamesConfiguration.php b/contrib/google-api-php-client/Google/Service/GamesConfiguration.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/GamesConfiguration.php rename to contrib/google-api-php-client/Google/Service/GamesConfiguration.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/GamesManagement.php b/contrib/google-api-php-client/Google/Service/GamesManagement.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/GamesManagement.php rename to contrib/google-api-php-client/Google/Service/GamesManagement.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Genomics.php b/contrib/google-api-php-client/Google/Service/Genomics.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Genomics.php rename to contrib/google-api-php-client/Google/Service/Genomics.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Gmail.php b/contrib/google-api-php-client/Google/Service/Gmail.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Gmail.php rename to contrib/google-api-php-client/Google/Service/Gmail.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/GroupsMigration.php b/contrib/google-api-php-client/Google/Service/GroupsMigration.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/GroupsMigration.php rename to contrib/google-api-php-client/Google/Service/GroupsMigration.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Groupssettings.php b/contrib/google-api-php-client/Google/Service/Groupssettings.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Groupssettings.php rename to contrib/google-api-php-client/Google/Service/Groupssettings.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/IdentityToolkit.php b/contrib/google-api-php-client/Google/Service/IdentityToolkit.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/IdentityToolkit.php rename to contrib/google-api-php-client/Google/Service/IdentityToolkit.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Licensing.php b/contrib/google-api-php-client/Google/Service/Licensing.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Licensing.php rename to contrib/google-api-php-client/Google/Service/Licensing.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Manager.php b/contrib/google-api-php-client/Google/Service/Manager.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Manager.php rename to contrib/google-api-php-client/Google/Service/Manager.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/MapsEngine.php b/contrib/google-api-php-client/Google/Service/MapsEngine.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/MapsEngine.php rename to contrib/google-api-php-client/Google/Service/MapsEngine.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Mirror.php b/contrib/google-api-php-client/Google/Service/Mirror.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Mirror.php rename to contrib/google-api-php-client/Google/Service/Mirror.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Oauth2.php b/contrib/google-api-php-client/Google/Service/Oauth2.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Oauth2.php rename to contrib/google-api-php-client/Google/Service/Oauth2.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Pagespeedonline.php b/contrib/google-api-php-client/Google/Service/Pagespeedonline.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Pagespeedonline.php rename to contrib/google-api-php-client/Google/Service/Pagespeedonline.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Plus.php b/contrib/google-api-php-client/Google/Service/Plus.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Plus.php rename to contrib/google-api-php-client/Google/Service/Plus.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/PlusDomains.php b/contrib/google-api-php-client/Google/Service/PlusDomains.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/PlusDomains.php rename to contrib/google-api-php-client/Google/Service/PlusDomains.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Prediction.php b/contrib/google-api-php-client/Google/Service/Prediction.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Prediction.php rename to contrib/google-api-php-client/Google/Service/Prediction.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Pubsub.php b/contrib/google-api-php-client/Google/Service/Pubsub.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Pubsub.php rename to contrib/google-api-php-client/Google/Service/Pubsub.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/QPXExpress.php b/contrib/google-api-php-client/Google/Service/QPXExpress.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/QPXExpress.php rename to contrib/google-api-php-client/Google/Service/QPXExpress.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Replicapool.php b/contrib/google-api-php-client/Google/Service/Replicapool.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Replicapool.php rename to contrib/google-api-php-client/Google/Service/Replicapool.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Replicapoolupdater.php b/contrib/google-api-php-client/Google/Service/Replicapoolupdater.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Replicapoolupdater.php rename to contrib/google-api-php-client/Google/Service/Replicapoolupdater.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Reports.php b/contrib/google-api-php-client/Google/Service/Reports.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Reports.php rename to contrib/google-api-php-client/Google/Service/Reports.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Reseller.php b/contrib/google-api-php-client/Google/Service/Reseller.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Reseller.php rename to contrib/google-api-php-client/Google/Service/Reseller.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Resource.php b/contrib/google-api-php-client/Google/Service/Resource.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Resource.php rename to contrib/google-api-php-client/Google/Service/Resource.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Resourceviews.php b/contrib/google-api-php-client/Google/Service/Resourceviews.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Resourceviews.php rename to contrib/google-api-php-client/Google/Service/Resourceviews.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/SQLAdmin.php b/contrib/google-api-php-client/Google/Service/SQLAdmin.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/SQLAdmin.php rename to contrib/google-api-php-client/Google/Service/SQLAdmin.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/ShoppingContent.php b/contrib/google-api-php-client/Google/Service/ShoppingContent.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/ShoppingContent.php rename to contrib/google-api-php-client/Google/Service/ShoppingContent.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/SiteVerification.php b/contrib/google-api-php-client/Google/Service/SiteVerification.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/SiteVerification.php rename to contrib/google-api-php-client/Google/Service/SiteVerification.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Spectrum.php b/contrib/google-api-php-client/Google/Service/Spectrum.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Spectrum.php rename to contrib/google-api-php-client/Google/Service/Spectrum.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Storage.php b/contrib/google-api-php-client/Google/Service/Storage.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Storage.php rename to contrib/google-api-php-client/Google/Service/Storage.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/TagManager.php b/contrib/google-api-php-client/Google/Service/TagManager.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/TagManager.php rename to contrib/google-api-php-client/Google/Service/TagManager.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Taskqueue.php b/contrib/google-api-php-client/Google/Service/Taskqueue.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Taskqueue.php rename to contrib/google-api-php-client/Google/Service/Taskqueue.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Tasks.php b/contrib/google-api-php-client/Google/Service/Tasks.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Tasks.php rename to contrib/google-api-php-client/Google/Service/Tasks.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Translate.php b/contrib/google-api-php-client/Google/Service/Translate.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Translate.php rename to contrib/google-api-php-client/Google/Service/Translate.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Urlshortener.php b/contrib/google-api-php-client/Google/Service/Urlshortener.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Urlshortener.php rename to contrib/google-api-php-client/Google/Service/Urlshortener.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Webfonts.php b/contrib/google-api-php-client/Google/Service/Webfonts.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Webfonts.php rename to contrib/google-api-php-client/Google/Service/Webfonts.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/Webmasters.php b/contrib/google-api-php-client/Google/Service/Webmasters.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/Webmasters.php rename to contrib/google-api-php-client/Google/Service/Webmasters.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/YouTube.php b/contrib/google-api-php-client/Google/Service/YouTube.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/YouTube.php rename to contrib/google-api-php-client/Google/Service/YouTube.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php b/contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php rename to contrib/google-api-php-client/Google/Service/YouTubeAnalytics.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Signer/Abstract.php b/contrib/google-api-php-client/Google/Signer/Abstract.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Signer/Abstract.php rename to contrib/google-api-php-client/Google/Signer/Abstract.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Signer/P12.php b/contrib/google-api-php-client/Google/Signer/P12.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Signer/P12.php rename to contrib/google-api-php-client/Google/Signer/P12.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Task/Exception.php b/contrib/google-api-php-client/Google/Task/Exception.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Task/Exception.php rename to contrib/google-api-php-client/Google/Task/Exception.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Task/Retryable.php b/contrib/google-api-php-client/Google/Task/Retryable.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Task/Retryable.php rename to contrib/google-api-php-client/Google/Task/Retryable.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Task/Runner.php b/contrib/google-api-php-client/Google/Task/Runner.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Task/Runner.php rename to contrib/google-api-php-client/Google/Task/Runner.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Utils.php b/contrib/google-api-php-client/Google/Utils.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Utils.php rename to contrib/google-api-php-client/Google/Utils.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Utils/URITemplate.php b/contrib/google-api-php-client/Google/Utils/URITemplate.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Utils/URITemplate.php rename to contrib/google-api-php-client/Google/Utils/URITemplate.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Verifier/Abstract.php b/contrib/google-api-php-client/Google/Verifier/Abstract.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Verifier/Abstract.php rename to contrib/google-api-php-client/Google/Verifier/Abstract.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.php b/contrib/google-api-php-client/Google/Verifier/Pem.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.php rename to contrib/google-api-php-client/Google/Verifier/Pem.php diff --git a/src/opnsense/contrib/google-api-php-client/Google/autoload.php b/contrib/google-api-php-client/Google/autoload.php similarity index 100% rename from src/opnsense/contrib/google-api-php-client/Google/autoload.php rename to contrib/google-api-php-client/Google/autoload.php diff --git a/src/opnsense/contrib/simplepie/.gitignore b/contrib/simplepie/.gitignore similarity index 100% rename from src/opnsense/contrib/simplepie/.gitignore rename to contrib/simplepie/.gitignore diff --git a/src/opnsense/contrib/simplepie/.travis.yml b/contrib/simplepie/.travis.yml similarity index 100% rename from src/opnsense/contrib/simplepie/.travis.yml rename to contrib/simplepie/.travis.yml diff --git a/src/opnsense/contrib/simplepie/LICENSE.txt b/contrib/simplepie/LICENSE.txt similarity index 100% rename from src/opnsense/contrib/simplepie/LICENSE.txt rename to contrib/simplepie/LICENSE.txt diff --git a/src/opnsense/contrib/simplepie/README.markdown b/contrib/simplepie/README.markdown similarity index 100% rename from src/opnsense/contrib/simplepie/README.markdown rename to contrib/simplepie/README.markdown diff --git a/src/opnsense/contrib/simplepie/autoloader.php b/contrib/simplepie/autoloader.php similarity index 100% rename from src/opnsense/contrib/simplepie/autoloader.php rename to contrib/simplepie/autoloader.php diff --git a/src/opnsense/contrib/simplepie/build/charset.php b/contrib/simplepie/build/charset.php similarity index 100% rename from src/opnsense/contrib/simplepie/build/charset.php rename to contrib/simplepie/build/charset.php diff --git a/src/opnsense/contrib/simplepie/build/compile.php b/contrib/simplepie/build/compile.php similarity index 100% rename from src/opnsense/contrib/simplepie/build/compile.php rename to contrib/simplepie/build/compile.php diff --git a/src/opnsense/contrib/simplepie/build/header.txt b/contrib/simplepie/build/header.txt similarity index 100% rename from src/opnsense/contrib/simplepie/build/header.txt rename to contrib/simplepie/build/header.txt diff --git a/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt b/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt similarity index 100% rename from src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt rename to contrib/simplepie/compatibility_test/COMPATIBILITY README.txt diff --git a/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php b/contrib/simplepie/compatibility_test/sp_compatibility_test.php similarity index 100% rename from src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php rename to contrib/simplepie/compatibility_test/sp_compatibility_test.php diff --git a/src/opnsense/contrib/simplepie/composer.json b/contrib/simplepie/composer.json similarity index 100% rename from src/opnsense/contrib/simplepie/composer.json rename to contrib/simplepie/composer.json diff --git a/src/opnsense/contrib/simplepie/idn/LICENCE b/contrib/simplepie/idn/LICENCE similarity index 100% rename from src/opnsense/contrib/simplepie/idn/LICENCE rename to contrib/simplepie/idn/LICENCE diff --git a/src/opnsense/contrib/simplepie/idn/ReadMe.txt b/contrib/simplepie/idn/ReadMe.txt similarity index 100% rename from src/opnsense/contrib/simplepie/idn/ReadMe.txt rename to contrib/simplepie/idn/ReadMe.txt diff --git a/src/opnsense/contrib/simplepie/idn/idna_convert.class.php b/contrib/simplepie/idn/idna_convert.class.php similarity index 100% rename from src/opnsense/contrib/simplepie/idn/idna_convert.class.php rename to contrib/simplepie/idn/idna_convert.class.php diff --git a/src/opnsense/contrib/simplepie/idn/npdata.ser b/contrib/simplepie/idn/npdata.ser similarity index 100% rename from src/opnsense/contrib/simplepie/idn/npdata.ser rename to contrib/simplepie/idn/npdata.ser diff --git a/src/opnsense/contrib/simplepie/library/SimplePie.php b/contrib/simplepie/library/SimplePie.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie.php rename to contrib/simplepie/library/SimplePie.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Author.php b/contrib/simplepie/library/SimplePie/Author.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Author.php rename to contrib/simplepie/library/SimplePie/Author.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache.php b/contrib/simplepie/library/SimplePie/Cache.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Cache.php rename to contrib/simplepie/library/SimplePie/Cache.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php b/contrib/simplepie/library/SimplePie/Cache/Base.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php rename to contrib/simplepie/library/SimplePie/Cache/Base.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php b/contrib/simplepie/library/SimplePie/Cache/DB.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php rename to contrib/simplepie/library/SimplePie/Cache/DB.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php b/contrib/simplepie/library/SimplePie/Cache/File.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php rename to contrib/simplepie/library/SimplePie/Cache/File.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php b/contrib/simplepie/library/SimplePie/Cache/Memcache.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php rename to contrib/simplepie/library/SimplePie/Cache/Memcache.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php b/contrib/simplepie/library/SimplePie/Cache/MySQL.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php rename to contrib/simplepie/library/SimplePie/Cache/MySQL.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Caption.php b/contrib/simplepie/library/SimplePie/Caption.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Caption.php rename to contrib/simplepie/library/SimplePie/Caption.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Category.php b/contrib/simplepie/library/SimplePie/Category.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Category.php rename to contrib/simplepie/library/SimplePie/Category.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php b/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php rename to contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Copyright.php b/contrib/simplepie/library/SimplePie/Copyright.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Copyright.php rename to contrib/simplepie/library/SimplePie/Copyright.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Core.php b/contrib/simplepie/library/SimplePie/Core.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Core.php rename to contrib/simplepie/library/SimplePie/Core.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Credit.php b/contrib/simplepie/library/SimplePie/Credit.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Credit.php rename to contrib/simplepie/library/SimplePie/Credit.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php b/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php rename to contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php b/contrib/simplepie/library/SimplePie/Enclosure.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php rename to contrib/simplepie/library/SimplePie/Enclosure.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Exception.php b/contrib/simplepie/library/SimplePie/Exception.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Exception.php rename to contrib/simplepie/library/SimplePie/Exception.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/File.php b/contrib/simplepie/library/SimplePie/File.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/File.php rename to contrib/simplepie/library/SimplePie/File.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php b/contrib/simplepie/library/SimplePie/HTTP/Parser.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php rename to contrib/simplepie/library/SimplePie/HTTP/Parser.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/IRI.php b/contrib/simplepie/library/SimplePie/IRI.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/IRI.php rename to contrib/simplepie/library/SimplePie/IRI.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Item.php b/contrib/simplepie/library/SimplePie/Item.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Item.php rename to contrib/simplepie/library/SimplePie/Item.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Locator.php b/contrib/simplepie/library/SimplePie/Locator.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Locator.php rename to contrib/simplepie/library/SimplePie/Locator.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Misc.php b/contrib/simplepie/library/SimplePie/Misc.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Misc.php rename to contrib/simplepie/library/SimplePie/Misc.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Net/IPv6.php b/contrib/simplepie/library/SimplePie/Net/IPv6.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Net/IPv6.php rename to contrib/simplepie/library/SimplePie/Net/IPv6.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Parse/Date.php b/contrib/simplepie/library/SimplePie/Parse/Date.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Parse/Date.php rename to contrib/simplepie/library/SimplePie/Parse/Date.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Parser.php b/contrib/simplepie/library/SimplePie/Parser.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Parser.php rename to contrib/simplepie/library/SimplePie/Parser.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Rating.php b/contrib/simplepie/library/SimplePie/Rating.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Rating.php rename to contrib/simplepie/library/SimplePie/Rating.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Registry.php b/contrib/simplepie/library/SimplePie/Registry.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Registry.php rename to contrib/simplepie/library/SimplePie/Registry.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Restriction.php b/contrib/simplepie/library/SimplePie/Restriction.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Restriction.php rename to contrib/simplepie/library/SimplePie/Restriction.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php b/contrib/simplepie/library/SimplePie/Sanitize.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php rename to contrib/simplepie/library/SimplePie/Sanitize.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Source.php b/contrib/simplepie/library/SimplePie/Source.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/Source.php rename to contrib/simplepie/library/SimplePie/Source.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php b/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php rename to contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php b/contrib/simplepie/library/SimplePie/gzdecode.php similarity index 100% rename from src/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php rename to contrib/simplepie/library/SimplePie/gzdecode.php diff --git a/src/opnsense/contrib/simplepie/phpunit.xml.dist b/contrib/simplepie/phpunit.xml.dist similarity index 100% rename from src/opnsense/contrib/simplepie/phpunit.xml.dist rename to contrib/simplepie/phpunit.xml.dist diff --git a/plist b/plist index c103d8d1c..300284515 100644 --- a/plist +++ b/plist @@ -255,7 +255,6 @@ /usr/local/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.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/.travis.yml /usr/local/opnsense/contrib/simplepie/LICENSE.txt /usr/local/opnsense/contrib/simplepie/README.markdown /usr/local/opnsense/contrib/simplepie/autoloader.php