Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 xorg-xserver/xorg-server/CONFLICTS |    1 +
 xorg-xserver/xorg-server/HISTORY   |    3 +++
 xorg/xserver/BUILD                 |    3 +--
 xorg/xserver/HISTORY               |    5 +++++
 xorg/xserver/INSTALL               |    2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit ee1f8a26af5e2999c452539c71d8550a1b69d300
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xorg-server - now conflicts xserver

commit 65e1a75b89417e27817932d743804a564bc48a91
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xserver - now a viable alternative to xorg-server

diff --git a/xorg-xserver/xorg-server/CONFLICTS 
b/xorg-xserver/xorg-server/CONFLICTS
index 886f6ec..445448a 100755
--- a/xorg-xserver/xorg-server/CONFLICTS
+++ b/xorg-xserver/xorg-server/CONFLICTS
@@ -1,2 +1,3 @@
 conflicts glamor 
 conflicts xf86-video-modesetting
+conflicts xserver n
diff --git a/xorg-xserver/xorg-server/HISTORY 
b/xorg-xserver/xorg-server/HISTORY
index 42f28ab..55ea503 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2018-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * CONFLICTS: add xserver
+
 2018-05-10 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.20.0, redundancy--
 
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index 8dfc018..ba0c526 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -9,8 +9,7 @@ OPTS+=" xorg=$XSERVER_XORG \
         log_dir=${INSTALL_ROOT}/var/log \
         xkb_bin_dir=$INSTALL_ROOT/usr/bin \
         os_vendor='SourceMage'"
-PREFIX=/opt/xorg &&
-#PREFIX=/usr &&
+PREFIX=/usr &&
 check_tmp_noexec /tmp &&
 default_build &&
 check_tmp_noexec /tmp
diff --git a/xorg/xserver/CONFLICTS b/xorg/xserver/CONFLICTS
old mode 100644
new mode 100755
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index f744891..1ca6587 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,8 @@
+2018-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * BUILD INSTALL: install to /usr
+       * CONFLICTS: activated
+         this spell is now a viable alternative to xorg-server
+
 2018-05-10 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.20.0
        * BUILD: removed module_dir option, defaults are fine now
diff --git a/xorg/xserver/INSTALL b/xorg/xserver/INSTALL
index 0fe29c6..7690a69 100755
--- a/xorg/xserver/INSTALL
+++ b/xorg/xserver/INSTALL
@@ -1,6 +1,6 @@
 default_install &&
 # most drivers and applications reference X
-PREFIX=/opt/xorg  &&
+PREFIX=/usr  &&
 if [[ ${XSERVER_XORG} == 'true' ]];then
   TGT=${TRACK_ROOT}${PREFIX}/bin &&
   FROM=${INSTALL_ROOT}${PREFIX}/bin &&