From 30d0c1760cf09d35681eea5adffbbe65b5b8c304 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 25 Sep 2016 12:50:04 +0200
Subject: [PATCH] src/contrib: aaaaand it's gone ;)

---
 {src/opnsense/contrib => contrib/IXR}/IXR_Library.php | 0
 contrib/Makefile                                      | 2 +-
 plist                                                 | 2 +-
 src/etc/inc/XMLRPC_Client.inc                         | 4 +++-
 src/etc/inc/xmlrpc.inc                                | 4 +++-
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename {src/opnsense/contrib => contrib/IXR}/IXR_Library.php (100%)

diff --git a/src/opnsense/contrib/IXR_Library.php b/contrib/IXR/IXR_Library.php
similarity index 100%
rename from src/opnsense/contrib/IXR_Library.php
rename to contrib/IXR/IXR_Library.php
diff --git a/contrib/Makefile b/contrib/Makefile
index 521cb8b0c..9416d63c9 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,5 +1,5 @@
 ROOT=	/usr/local/opnsense/contrib
-TREES=	base32 google-api-php-client mobile-broadband-provider-info \
+TREES=	base32 google-api-php-client IXR mobile-broadband-provider-info \
 	simplepie tzdata
 
 .include "../Mk/tree.mk"
diff --git a/plist b/plist
index 300284515..f2548f636 100644
--- a/plist
+++ b/plist
@@ -132,7 +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/IXR/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
diff --git a/src/etc/inc/XMLRPC_Client.inc b/src/etc/inc/XMLRPC_Client.inc
index 8d72897e7..3ecd4cc04 100644
--- a/src/etc/inc/XMLRPC_Client.inc
+++ b/src/etc/inc/XMLRPC_Client.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,7 +27,8 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
-require_once("IXR_Library.php") ;
+
+require_once("IXR/IXR_Library.php");
 
 /**
  * Simple XMLRPC client based on the components from IXR
diff --git a/src/etc/inc/xmlrpc.inc b/src/etc/inc/xmlrpc.inc
index 2e47c7f66..c34f817ff 100644
--- a/src/etc/inc/xmlrpc.inc
+++ b/src/etc/inc/xmlrpc.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,7 +27,8 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
-require_once("IXR_Library.php") ;
+
+require_once('IXR/IXR_Library.php');
 
 class XMLRPCServer
 {