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

Remko van der Vossen scm at sourcemage.org
Wed Aug 18 14:34:58 EDT 2010


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

 http/apache-mod_ssl/CONFLICTS |   12 ++++++++----
 http/apache-mod_ssl/HISTORY   |    4 ++++
 http/apache1/CONFLICTS        |   11 +++++++----
 http/apache1/HISTORY          |    4 ++++
 http/apache2/CONFLICTS        |   12 ++++++++----
 http/apache2/HISTORY          |    4 ++++
 http/apache22/CONFLICTS       |   12 ++++++++----
 http/apache22/HISTORY         |    4 ++++
 http/httpd-dev/CONFLICTS      |   12 ++++++++++--
 http/httpd-dev/HISTORY        |    3 +++
 http/xshttpd/CONFLICTS        |    5 +++--
 http/xshttpd/DETAILS          |    2 +-
 http/xshttpd/HISTORY          |    4 ++++
 13 files changed, 68 insertions(+), 21 deletions(-)

New commits:
commit 76e41cdda5e67721eefc34ff469af24343326ac5
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    httpd-dev: fixed up CONFLICTS

commit 643a60683ad68e6ff5ab740a9993e152498d1711
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    xshttpd: devel version 37b16

commit 395673251eea4ba1f94d48fbd3825301351dafc8
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    apache22: fixed up CONFLICTS

commit 3ca2a0a484a5fd6d19d4405bb86a3a50aee8ecc0
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    apache2: fixed up CONFLICTS

commit b042aeef91ebb128fe7b68986364ca0e759cc9b1
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    apache1: fixed up CONFLICTS

commit 57aa69ebc6d6ca2a09e809df37854c91bf27425c
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    apache-mod_ssl: fixed up CONFLICTS

diff --git a/http/apache-mod_ssl/CONFLICTS b/http/apache-mod_ssl/CONFLICTS
index 64bdc8d..16a2c4f 100755
--- a/http/apache-mod_ssl/CONFLICTS
+++ b/http/apache-mod_ssl/CONFLICTS
@@ -1,8 +1,12 @@
 conflicts apache &&
+conflicts apache1 &&
 conflicts apache2 &&
 conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
-  message "apache-mod_ssl and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
-  conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+  persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+  if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+    message "apache22 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
+    conflicts xshttpd
+  fi
 fi
diff --git a/http/apache-mod_ssl/HISTORY b/http/apache-mod_ssl/HISTORY
index a5b9a66..f40cf52 100644
--- a/http/apache-mod_ssl/HISTORY
+++ b/http/apache-mod_ssl/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich at sourcemage.org>
+	* CONFLICTS: check spell_ok before persistent_read
+	             correct conflicts to apache1 and httpd-dev
+
 2008-05-27 Remko van der Vossen <wich at sourcemage.org>
 	* CONFLICTS: conflict with xshttpd if that is compiled without prefix
 
diff --git a/http/apache1/CONFLICTS b/http/apache1/CONFLICTS
index 6f5fbf0..cc991ea 100755
--- a/http/apache1/CONFLICTS
+++ b/http/apache1/CONFLICTS
@@ -2,8 +2,11 @@ conflicts apache &&
 conflicts apache-mod_ssl &&
 conflicts apache2 &&
 conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
-  message "apache and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
-  conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+  persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+  if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+    message "apache22 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
+    conflicts xshttpd
+  fi
 fi
diff --git a/http/apache1/HISTORY b/http/apache1/HISTORY
index d6c15d9..b1480e5 100644
--- a/http/apache1/HISTORY
+++ b/http/apache1/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich at sourcemage.org>
+	* CONFLICTS: check spell_ok before persistent_read
+	             correct conflicts to httpd-dev
+
 2010-05-02 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Actually rename spell so it will cast.
 	  Updated to verison 1.3.42. SECURITY_PATCH++
diff --git a/http/apache2/CONFLICTS b/http/apache2/CONFLICTS
index f000b70..e5251ae 100755
--- a/http/apache2/CONFLICTS
+++ b/http/apache2/CONFLICTS
@@ -1,8 +1,12 @@
 conflicts apache &&
 conflicts apache-mod_ssl &&
+conflicts apache1 &&
 conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
-  message "apache2 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
-  conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+  persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+  if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+    message "apache22 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
+    conflicts xshttpd
+  fi
 fi
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 4bfc7d7..8974576 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich at sourcemage.org>
+	* CONFLICTS: check spell_ok before persistent_read
+	             correct conflicts to apache1 and httpd-dev
+
 2008-10-07 David Kowis <dkowis at shlrm.org>
 	* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUBDEPENDS:
 	  Provided UNIQ sub dependency for mod_unique_id (copied from apache22 spell)
diff --git a/http/apache22/CONFLICTS b/http/apache22/CONFLICTS
index 8b14455..dced333 100755
--- a/http/apache22/CONFLICTS
+++ b/http/apache22/CONFLICTS
@@ -1,8 +1,12 @@
 conflicts apache &&
 conflicts apache-mod_ssl &&
+conflicts apache1 &&
 conflicts apache2 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
-  message "apache22 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
-  conflicts xshttpd
+conflicts httpd-dev &&
+if spell_ok xshttpd; then
+  persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+  if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+    message "apache22 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
+    conflicts xshttpd
+  fi
 fi
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 01571ea..44ab1a1 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich at sourcemage.org>
+	* CONFLICTS: check spell_ok before persistent_read
+	             correct conflicts to apache1 and httpd-dev
+
 2010-07-25 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.2.16; .gz -> .bz2; SECURITY_PATCH++
 
diff --git a/http/httpd-dev/CONFLICTS b/http/httpd-dev/CONFLICTS
index 9542469..9e09b65 100755
--- a/http/httpd-dev/CONFLICTS
+++ b/http/httpd-dev/CONFLICTS
@@ -1,3 +1,11 @@
 conflicts apache-mod_ssl &&
-conflicts apache         &&
-conflicts apache2
+conflicts apache1        &&
+conflicts apache2        &&
+conflicts apache22       &&
+if spell_ok xshttpd; then
+  persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+  if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+    message "apache22 and xshttpd both provide the httpd binary, recast xshttpd with the binary prefix if you wish to keep both spells installed." 1>&2
+    conflicts xshttpd
+  fi
+fi
diff --git a/http/httpd-dev/HISTORY b/http/httpd-dev/HISTORY
index 2120324..1a3c215 100644
--- a/http/httpd-dev/HISTORY
+++ b/http/httpd-dev/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Remko van der Vossen <wich at sourcemage.org>
+	CONFLICTS: added apache22 and xshttpd
+
 2006-09-29 Arjan Bouter <abouter at sourcemage.org>
 	CONFIGURE, DETAILS: removed 2.2.3 version option
 	  it is incompatible with 2.0.
diff --git a/http/xshttpd/CONFLICTS b/http/xshttpd/CONFLICTS
index 3135b31..58b62da 100755
--- a/http/xshttpd/CONFLICTS
+++ b/http/xshttpd/CONFLICTS
@@ -1,6 +1,7 @@
 if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
-  conflicts apache &&
   conflicts apache-mod_ssl &&
+  conflicts apache1 &&
   conflicts apache2 &&
-  conflicts apache22
+  conflicts apache22 &&
+  conflicts httpd-dev
 fi
diff --git a/http/xshttpd/DETAILS b/http/xshttpd/DETAILS
index c995f24..2dbae50 100755
--- a/http/xshttpd/DETAILS
+++ b/http/xshttpd/DETAILS
@@ -1,7 +1,7 @@
            SPELL=xshttpd
   case $XSHTTPD_BRANCH in
     devel)
-         VERSION=37b13
+         VERSION=37b16
     ;;
     *)
          VERSION=36g01
diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
index 7abcbf6..a85f055 100644
--- a/http/xshttpd/HISTORY
+++ b/http/xshttpd/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS: devel version 37b16
+	* CONFLICTS: conflicts httpd-dev
+
 2010-02-25 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 



More information about the SM-Commit mailing list