[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (48df479fca48b1334305660c84f93357ee152eea)

Remko van der Vossen scm at sourcemage.org
Wed Feb 4 16:14:23 EST 2009


GIT changes to master grimoire by Remko van der Vossen <wich at stack.nl>:

 http/xshttpd/CONFIGURE |   16 ++++++++++----
 http/xshttpd/DEPENDS   |   53 ++++++++++++++++++++++++++-----------------------
 http/xshttpd/DETAILS   |    4 +--
 http/xshttpd/HISTORY   |    3 ++
 http/xshttpd/PRE_BUILD |    6 +++++
 5 files changed, 51 insertions(+), 31 deletions(-)

New commits:
commit 48df479fca48b1334305660c84f93357ee152eea
Author: Remko van der Vossen <wich at stack.nl>
Commit: Remko van der Vossen <wich at stack.nl>

    xshttpd: Devel version 37b06, Stable version 36g01

diff --git a/http/xshttpd/CONFIGURE b/http/xshttpd/CONFIGURE
index f48823e..47aae9f 100755
--- a/http/xshttpd/CONFIGURE
+++ b/http/xshttpd/CONFIGURE
@@ -1,4 +1,4 @@
-unset XSHTTPD_OPTS
+unset XSHTTPD_OPTS &&
 
 config_query_list XSHTTPD_PP \
   "Which configuration preprocessor would you like to use?" \
@@ -9,14 +9,13 @@ config_query_list XSHTTPD_PP \
 case $XSHTTPD_PP in 
   none)
     list_add XSHTTPD_OPTS "--without-preprocessor"
-
   ;;
   *)
     list_add XSHTTPD_OPTS "--with-preprocessor=$XSHTTPD_PP"
   ;;
 esac &&
 
-XSHTTPD_OLD_USE_PREFIX=$XSHTTPD_USE_PREFIX
+XSHTTPD_OLD_USE_PREFIX=$XSHTTPD_USE_PREFIX &&
 
 config_query XSHTTPD_USE_PREFIX \
   "Do you want to use a binary prefix? (To install xshttpd alongside another httpd)" \
@@ -26,7 +25,7 @@ if [[ $XSHTTPD_USE_PREFIX == "y" ]]; then
   list_add XSHTTPD_OPTS "--program-transform-name=s/^httpd/xs&/"
 fi &&
 
-unset XSHTTPD_CAST_TYPE
+unset XSHTTPD_CAST_TYPE &&
 
 if spell_ok xshttpd; then
   if [[ $XSHTTPD_OLD_USE_PREFIX == $XSHTTPD_USE_PREFIX ]]; then
@@ -38,7 +37,7 @@ else
   XSHTTPD_CAST_TYPE=new
 fi &&
 
-persistent_add XSHTTPD_CAST_TYPE
+persistent_add XSHTTPD_CAST_TYPE &&
 
 config_query_string XSHTTPD_ROOTDIR \
   "What do you want xshttpd to use as root directory?" \
@@ -46,4 +45,11 @@ config_query_string XSHTTPD_ROOTDIR \
 
 list_add XSHTTPD_OPTS "--with-rootdir=$XSHTTPD_ROOTDIR" &&
 
+config_query_option XSHTTPD_SSL "Support SSL connections?" \
+  y \
+  "--with-ssl" \
+  "--without-ssl" &&
+
+list_add XSHTTPD_OPTS $XSHTTPD_SSL &&
+
 persistent_add XSHTTPD_OPTS
diff --git a/http/xshttpd/DEPENDS b/http/xshttpd/DEPENDS
index 07125f4..5af2e3b 100755
--- a/http/xshttpd/DEPENDS
+++ b/http/xshttpd/DEPENDS
@@ -1,40 +1,45 @@
-optional_depends openssl \
-  '--with-ssl' \
-  '--without-ssl' \
-  'for SSL connection support' &&
+if [[ $XSHTTPD_BRANCH == "devel" || $XSHTTPD_SSL == "--with-ssl" ]]; then
+  depends openssl
+fi &&
 
 optional_depends pcre \
   '--with-pcre' \
   '--without-pcre' \
   'for rewrite support' &&
 
-optional_depends openldap \
-  '--with-ldap' \
-  '--without-ldap' \
-  'for LDAP support' &&
-
 optional_depends curl \
   '--with-curl' \
   '--without-curl' \
   'for reverse proxy support' &&
 
-if [[ "$XSHTTPD_BRANCH" == 'devel' ]]; then
-  optional_depends perl \
-    '--with-perl' \
-    '--without-perl' \
-    'for embedded Perl support (experimental)'
+if [[ $XSHTTPD_BRANCH == "devel" ]]; then
+  optional_depends gzip \
+    '--with-gzip' \
+    '--without-gzip' \
+    'for gzip compression support' &&
+
+  optional_depends bzip2 \
+    '--with-bzip2' \
+    '--without-bzip2' \
+    'for bzip2 compression support'
 fi &&
 
+optional_depends openldap \
+  '--with-ldap' \
+  '--without-ldap' \
+  'for LDAP support' &&
+
+optional_depends perl \
+  '--with-perl' \
+  '--without-perl' \
+  'for embedded Perl support (experimental)' &&
+
 optional_depends python \
   '--with-python' \
   '--without-python' \
-  'for embedded Python support (experimental)'
-
-# temporarily disabled, not working well under linux, the build is trying to
-# link with libruby18 instead of libruby
-#if [[ "$XSHTTPD_BRANCH" == 'devel' ]]; then
-#  optional_depends ruby \
-#    '--with-ruby' \
-#    '--witout-ruby' \
-#    'for embedded Ruby support (experimental)'
-#fi
+  'for embedded Python support (experimental)' &&
+
+optional_depends ruby \
+  '--with-ruby' \
+  '--without-ruby' \
+  'for embedded Ruby support (experimental)'
diff --git a/http/xshttpd/DETAILS b/http/xshttpd/DETAILS
index b74a363..a1aa657 100755
--- a/http/xshttpd/DETAILS
+++ b/http/xshttpd/DETAILS
@@ -1,10 +1,10 @@
            SPELL=xshttpd
   case $XSHTTPD_BRANCH in
     devel)
-         VERSION=36b23
+         VERSION=37b06
     ;;
     *)
-         VERSION=35g06
+         VERSION=36g01
     ;;
   esac
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
index 9e777b5..0347e7d 100644
--- a/http/xshttpd/HISTORY
+++ b/http/xshttpd/HISTORY
@@ -1,3 +1,6 @@
+2009-02-01 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS, CONFIGURE, DEPENDS: Devel version 37b06, Stable version 36g01
+
 2008-12-01 Remko van der Vossen <wich at sourcemage.org>
 	* DETAILS: Devel version 36b23
 
diff --git a/http/xshttpd/PRE_BUILD b/http/xshttpd/PRE_BUILD
new file mode 100755
index 0000000..4a8bb30
--- /dev/null
+++ b/http/xshttpd/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+if [[ $XSHTTPD_BRANCH == "stable" ]]; then
+  cd $SOURCE_DIRECTORY &&
+  RUBY_SO_NAME=$(ruby -r mkmf -e 'print %&#{CONFIG["RUBY_SO_NAME"]}&') &&
+  sedit "s/ruby18/$RUBY_SO_NAME/" configure
+fi



More information about the SM-Commit mailing list