[Lunar-commits] <moonbase> virtuoso: Addint a virtuoso.service for systemd. It was noted at

[Dennis `stumbles` Veatch]

commit 63331f1c82d77166608343d9b65a725687050c7a
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Dec 30 09:21:26 2011 -0500

    virtuoso: Addint a virtuoso.service for systemd. It was noted at
    
    http://foo-projects.org/pipermail/lunar/2011-December/008792.html that virtuoso needed
    libedit or the build would fail.
    
    Some testing here and this is what I found;
    
    1. Saying yes to kde only (disabling all VADs) was causing the make failure.
    2. the libedit enable/disable switches work fine here.
    3. Saying no to kde only and it builds fine.
    3. Disabling any combination of the tutorial/demo VADs causes the make to fail.
    
    So for now I am removing the kde only option.
---
 sql/virtuoso/BUILD        |    9 ++-------
 sql/virtuoso/CONFIGURE    |    1 -
 sql/virtuoso/DEPENDS      |   23 ++++++++++++-----------
 sql/virtuoso/DETAILS      |    1 -
 sql/virtuoso/POST_INSTALL |    5 ++++-
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/sql/virtuoso/BUILD b/sql/virtuoso/BUILD
index 25f00fe..1fc49df 100644
--- a/sql/virtuoso/BUILD
+++ b/sql/virtuoso/BUILD
@@ -6,14 +6,9 @@
         /etc/init.d/virtuosod stop
   fi  &&
 
-  if [ "$VIRT_FOR_KDE" == "y" ] ; then
-   OPTS+=" --disable-all-vads --program-transform-name='s/isql*/vt-isql/' --with-iodbc \
-           --without-debug  --with-pthreads"
-     else
    OPTS+=" --without-debug --with-pthreads --program-transform-name='s/isql*/vt-isql/' \
-           --with-iodbc"
-  fi  &&
+           --with-iodbc" &&
 
-  default_build
+  default_build 
 
 ) > $C_FIFO 2>&1
diff --git a/sql/virtuoso/CONFIGURE b/sql/virtuoso/CONFIGURE
deleted file mode 100644
index 68d303f..0000000
--- a/sql/virtuoso/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery VIRT_FOR_KDE "Compile only those things needed by KDE? (say n if you want it as a server)" y
diff --git a/sql/virtuoso/DEPENDS b/sql/virtuoso/DEPENDS
index 82eb7fe..041c539 100644
--- a/sql/virtuoso/DEPENDS
+++ b/sql/virtuoso/DEPENDS
@@ -3,15 +3,16 @@ depends libiodbc
 #Leaving perl commented out. Make failes if this is enabled.
 #optional_depends perl        "--enable-perl"        "--disable-perl"        "for perl hosting support"
 
-optional_depends readline    " --with-readline"     " --without-readline"   "for readline support"
-optional_depends libedit     "--with-editline"      "--without-editline"    "for editline support"
-optional_depends Python      "--enable-python"      "--disable-python"      "for python hosting support"
-optional_depends ruby        "--enable-ruby"        "--disable-ruby"        "for ruby hosting support"
-optional_depends ImageMagick "--enable-imagemagick" "--disable-imagemagick" "for ImageMagick plugin"
-optional_depends mono        "--enable-mono"        "--disable-mono"        "for mono extension support"
-optional_depends %PHP        "--enable-php5"        "--disable-php5 "       "for PHP extension support"
-optional_depends openldap    "--enable-openldap"    "--disable-openldap"    "for openldap support"
-optional_depends openssl     "--enable-openssl"     "--disable-openssl"     "for openssl support"
-optional_depends heimdal     "--enable-krb"         "--disable-krb"         "for Kerberos extension support"
-optional_depends libwbxml    "--enable-wbxml2"      "--disable-wbxml2"      "for Wireless Binary XML support"
+optional_depends readline    "--with-readline"         " --without-readline"   "for readline support"
+optional_depends libedit     "--with-editline"         "--without-editline"    "for editline support"
+optional_depends Python      "--enable-python"         "--disable-python"      "for python hosting support"
+optional_depends ruby        "--enable-ruby"           "--disable-ruby"        "for ruby hosting support"
+optional_depends ImageMagick "--enable-imagemagick"    "--disable-imagemagick" "for ImageMagick plugin"
+optional_depends mono        "--enable-mono"           "--disable-mono"        "for mono extension support"
+optional_depends %PHP        "--enable-php5"           "--disable-php5 "       "for PHP extension support"
+optional_depends openldap    "--enable-openldap"       "--disable-openldap"    "for openldap support"
+optional_depends openssl     "--enable-openssl"        "--disable-openssl"     "for openssl support"
+optional_depends heimdal     "--enable-krb"            "--disable-krb"         "for Kerberos extension support"
+optional_depends libwbxml    "--enable-wbxml2"         "--disable-wbxml2"      "for Wireless Binary XML support"
 optional_depends zlib        "--without-internal-zlib" "--with-internal-zlib"  "use internal or external zlib - Default external"
+optional_depends systemd     ""                        ""                      "use systemd init style sysem"
diff --git a/sql/virtuoso/DETAILS b/sql/virtuoso/DETAILS
index ce6f4ae..5aca051 100644
--- a/sql/virtuoso/DETAILS
+++ b/sql/virtuoso/DETAILS
@@ -34,5 +34,4 @@ its best to logout/in of kde if that's where you are during this bump;
  rm ~/.kde/share/apps/nepomuk/repository/main/data/virtuosobackend/*
  nepomukservicestub nepomukstorage
  akonadictl start
-
 EOF
diff --git a/sql/virtuoso/POST_INSTALL b/sql/virtuoso/POST_INSTALL
index 5f6e31a..3b59d55 100644
--- a/sql/virtuoso/POST_INSTALL
+++ b/sql/virtuoso/POST_INSTALL
@@ -1,6 +1,9 @@
+ if [ ! -f /var/lib/virtuoso/db/virtuoso.ini ]
+    then cp /var/lib/virtuoso/db/virtuoso.ini.sample /var/lib/virtuoso/db/virtuoso.ini
+ fi
+
  if [ -f /var/lib/virtuoso/db/virtuoso.db ]
     then
        printf "${PROBLEM_COLOR}Point a broswer to http://localhost:8890/index.html and change the default passwords for users: \n
        dba (passwd dba) and dav (passwd dav). \n" "${DEFAULT_COLOR}"
  fi
-