virtuoso: A little clean up here. We don't use init.d anymore so gett…

…ing rid of that.

Adding a PRE_BUILD and adjusting the BUILD accordingly.

sql/virtuoso/BUILD

@@ -1,17 +1,4 @@
 
-  sedit "s:AM_CONFIG_HEADER:AC_CONFIG_HEADER:" configure.in &&
-  autoreconf -i &&
-
-  sedit "s:\(test \"\${with_editline+set\}\" = set\):\1 -a \"\${with_editline}\" != no": configure &&
-
-  sedit "s:iodbcext.h:libiodbc/iodbcext.h:g" libsrc/Wi/odbcinc.h &&
-  sedit "s:iodbcinst.h:libiodbc/iodbcinst.h:g" libsrc/Wi/odbcinc.h &&
-
-  if [ -f /var/lib/virtuoso/db/virtuoso.lck ] ; then
-        /etc/init.d/virtuosod stop
-  fi  &&
-
-   OPTS+=" --without-debug --with-pthreads --program-transform-name='s/isql*/vt-isql/' \
-           --with-iodbc" &&
+  OPTS+=" --without-debug --with-pthreads --program-transform-name='s/isql*/vt-isql/'" &&
 
   default_build 

sql/virtuoso/DEPENDS

@@ -1,4 +1,4 @@
-depends libiodbc
+#depends libiodbc
 
 #Leaving perl commented out. Make failes if this is enabled.
 #optional_depends perl        "--enable-perl"        "--disable-perl"        "for perl hosting support"

sql/virtuoso/POST_INSTALL

@@ -1,9 +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
+ 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}"
+       message "${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

sql/virtuoso/PRE_BUILD

@@ -0,0 +1,14 @@
+ default_pre_build &&
+
+ sedit "s:AM_CONFIG_HEADER:AC_CONFIG_HEADER:" configure.in &&
+ mv configure.in configure.ac &&
+ autoreconf -i &&
+
+ sedit "s:\(test \"\${with_editline+set\}\" = set\):\1 -a \"\${with_editline}\" != no": configure &&
+
+ sedit "s:iodbcext.h:libiodbc/iodbcext.h:g" libsrc/Wi/odbcinc.h &&
+ sedit "s:iodbcinst.h:libiodbc/iodbcinst.h:g" libsrc/Wi/odbcinc.h &&
+
+ if [ -f /var/lib/virtuoso/db/virtuoso.lck ] ; then
+       systemctl stop virtuoso.service
+ fi