New commits:
commit 061ca2467ae9cbf45de742762a5e047d1c4d3206
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
cairo: back to 1.8.8 again
commit 3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
cairo: added patch to stable so it compiles with libpng 1.4*
commit 1f7a52d952c5a1187820fe404a1d81f95eaef373
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
make: => 3.82
commit 6761f8a6f6bccce8f47ad0bc3bf5db8f5094aa06
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>
scribus4: fixed source name (upstream renamed it)
commit 02a579072460295069404b56c67f8d53af5e7a6c
Author: Finn Haedicke <finn AT sourcemage.org>
Commit: Finn Haedicke <finn AT sourcemage.org>
boost => 1_44_0
commit f80064aae53f0b08c1211775cc5e30889ebf7934
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>
net/rrdtool: Added missing dependency on intltool
commit 1fff95e203ffddfeca349e93cb29e677d31153fe
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
linux: Updated latest 2.6 to 2.6.35.3
This kernel seems to fix the numerous kernel BUG faults 2.6.35.2
was giving me, making my machine unusable most times (constant hangs)
and even unbootable (hang during boot).
commit 248c0b50f2928841054de53c6377dc77220adc24
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
wine: Updated devel to 1.3.1
commit c048a831fe87cd293a1ffc3d4870b6b038d2af0c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mod_geoip2: new spell, Apache 2 module for finding the country of web
requests
commit 1994f70cf66830dade63453c11cc88687982cebd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
geany: => 0.19.1
commit c0d5536809fccd4f61cfb380d6904a636f05f7b3
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>
Resubmit of previous commit. Version bump fpr gtk-gnutella 0.96.6 ->
0.96.8.
commit 9faeb4a79a70d6372cda28073adc6ae355f19f44
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>
Commit was not complete and am reverting this small bump so that I can
try and resubmit correctly.
Revert "Update spell to version 0.96.8. Swapped out the sig file
with a new one. The"
This reverts commit 43854ad5b209dded71ed59d25d8508f18609ee4f.
commit 5cb526552e5391c74c00488d9f03c78365f65191
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
squashfs-tools: update to v4.0, inkernel squashfs doesn't have backwards
compatibility so all existing squashfs fs' need to be rebuilt using v4 tools
commit 43854ad5b209dded71ed59d25d8508f18609ee4f
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>
Update spell to version 0.96.8. Swapped out the sig file with a new one.
The
SHA512 has field was commented out, but I updated this as well and
updated teh
file accordingly.
commit 799f7cd4dbc6534a35a92443b4676468f14b20cf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
git 1.7.2.2
commit e714cd06a3601aacc27fe97c00bfcff5b438606b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mysql: => 5.1.50 (stable)
commit d11a0e8ea841e2878fdcf023d95a7ef427c8c090
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
mesalib: small fixes for latest scm version
commit 0521d9ccfb35ad1c8a4d86deac4a5a0186d6e262
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
evolution-exchange 2.30.3
commit fcae7b8e4ca7d54c79ed5f4e12a0a43d933b4b63
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
netpbm: small filename change in the advanced version
commit 142a27bf97abb4d148ee78a5d8c4148dbb9d94a9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
evolution 2.30.3
commit 097eb16701622b7ad6004456d241165c83ce388c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
evolution-data-server 2.30.3
commit 384cee9d030dd0e31c91c4b745c9d48b7ff1252c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
tracker 0.8.16
commit bbaca9b4aa0df3baad26d37356c3270953758d69
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
whois 5.0.7
commit 138de827ac3b5c46e54725fa5ed0e41aae938a7c
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>
Adding libnotify as a dependency for firefox regardless if CVS used or
not. During compile of devel version it was found that firefox would not
compile unless libnotify (version >= 0.4) was cast. Stable also requires
libnotify but is pulled in indirectly as a dependency for xulrunner.
commit 72e1e310ab4a7d28b12782feb6484b295f27a454
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>
Updating DEPENDS file for CVS(devel) dependencies. Unable to compile
firefox from CVS without libnotify (version >= 0.4) cast. Once this
dependency is
in place there were no issues in casting firefox. I have confirmed that
firefox (stable, currently 3.6.8) does NOT require libnotify. Due to this the
depends statement has been located in the proper place within the DEPENDS
file.
commit 64f1104a2c5b332764de6260de90593aba82a1d2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nss-pam-ldapd: => 0.7.8
commit 83923b564a0883969bee2369839e9d483c22ff88
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
lvm 2.02.73
commit ed43f92ab02d0b06d6512ebfa601aa492e36900b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
vlc 1.1.3, SECURITY_PATCH=13
commit 290b1ae0bdbe62e5cf9a79687f3bbf9c72987c3f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
zgv: fixed build for new gcc
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 c0c4c49129e693932f7c83dc0daf90df0d9ecc2b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Revert "glibc: disable stripping, so thread debugging works #15017"
This reverts commit 5baabea0403c9d39b7442f9eb6b192bd451a35fc.
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/ChangeLog b/ChangeLog
index 14c7c29..d493d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * http/mod_geoip2: new spell, Apache 2 module for finding the country
of
+ web requests
+
2010-08-17 George Sherwood <gsherwood AT sourcemage.org>
* gnome2-libs/gdk-pixbuf2: new spell for devel gtk+3
* x11-toolkits/gtk+3: new spell with latest gtk toolkit
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index 2a36468..b700979 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -4,7 +4,7 @@ if [[ $OLD == y ]]; then
SECURITY_PATCH=4
else
- VERSION=5.1.49
+ VERSION=5.1.50
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
@@ -12,9 +12,9 @@ fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=MySQL-${VERSION%\.*}/$SOURCE
- SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/$SOURCE_URI
+ SOURCE_URL[0]=http://ftp.gwdg.de/pub/misc/mysql/Downloads/$SOURCE_URI
SOURCE_URL[1]=http://mysql.he.net/Downloads/$SOURCE_URI
- SOURCE_URL[2]=ftp://ftp.mysql.com/$SOURCE_URI
+ SOURCE_URL[2]=ftp://mirror.switch.ch/mirror/mysql/Downloads/$SOURCE_URI
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 560b4ff..e031042 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated stable to 5.1.50; renewed source urls
+
2010-07-23 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 5.1.49
diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index f6f7964..23f15d4 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,5 +1,5 @@
SPELL=geany
- VERSION=0.19
+ VERSION=0.19.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.geany.org/$SOURCE
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 3e7d9e1..119d7a7 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.19.1
+
2010-06-12 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.19
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 081e899..52852e1 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.7.2.1
+ VERSION=1.7.2.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index d033a84..372e7c6 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2010-08-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.2.2
+
2010-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.2.1
diff --git a/devel/make/DETAILS b/devel/make/DETAILS
index bf9d4c0..09dabb7 100755
--- a/devel/make/DETAILS
+++ b/devel/make/DETAILS
@@ -1,16 +1,19 @@
SPELL=make
- VERSION=3.81
+ VERSION=3.82
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
LICENSE[0]=GPL
WEB_SITE=http://www.gnu.org/software/make/make.html
ENTERED=20010922
- UPDATED=20050721
KEYWORDS="devel"
- SHORT="make generates executables and other non-source programs."
+ SHORT="make generates executables and other non-source programs"
cat << EOF
make - Generates executables and other non-source programs
Make examines a set of related files, determines which of them are out
diff --git a/devel/make/HISTORY b/devel/make/HISTORY
index 538c3fd..c9ef3c5 100644
--- a/devel/make/HISTORY
+++ b/devel/make/HISTORY
@@ -1,3 +1,7 @@
+2010-08-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.82; quoting paths
+ converted to upstream signature checking
+
2009-06-18 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: fixed WEB_SITE
if [[ $MESALIB_VER == "git" ]]; then
cd "$SOURCE_DIRECTORY" &&
- sedit "/.*configure.*/d" autogen.sh &&
+ patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch" &&
./autogen.sh
+ cd bin &&
+ ln -s install-sh minstall
fi
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 3fc56f6..3721e17 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1 +1,2 @@
OPENGL
+GLUT
diff --git a/graphics-libs/mesalib/autogen.patch
b/graphics-libs/mesalib/autogen.patch
new file mode 100644
index 0000000..eb50e7f
--- /dev/null
+++ b/graphics-libs/mesalib/autogen.patch
@@ -0,0 +1,9 @@
+--- autogen.sh 2010-08-19 17:21:46.000000000 +0200
++++ autogen.sh-fixed 2010-08-19 18:14:37.332895438 +0200
+@@ -14,5 +14,4 @@
+ MAKEFLAGS=""
+
+ autoreconf -v --install || exit 1
+-
+-"$srcdir"/configure "$@"
++automake --add-missing
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index 1ce7655..0714186 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: sedit conig.mk instead of Makefile.common for recent scm
version
+
2010-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: use ln -sf for symlinking
diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 7be99a2..77b5d3c 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -12,5 +12,5 @@ sed -i "s:/link:/lib:g" lib/Makefile &&
if [[ $NETPBM_RELEASE != advanced ]] && [[ $NETPBM_RELEASE != trunk ]]; then
sed -i "s:misc:share/netpbm:;s:/man/:/share/man/:g" Makefile.common
elif [[ $NETPBM_RELEASE == advanced ]]; then
- sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
Makefile.common
+ sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
common.mk
fi
diff --git a/graphics/zgv/HISTORY b/graphics/zgv/HISTORY
index f747093..84f5246 100644
--- a/graphics/zgv/HISTORY
+++ b/graphics/zgv/HISTORY
@@ -1,3 +1,7 @@
+2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD: sed to allow compilation with newer gcc
+ sed to install man pages in /usr/share
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/graphics/zgv/PRE_BUILD b/graphics/zgv/PRE_BUILD
new file mode 100755
index 0000000..c53776e
--- /dev/null
+++ b/graphics/zgv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '650i\ break;' src/zgv_io.c &&
+sedit 's/^#SHARE_INFIX=/SHARE_INFIX=/' config.mk
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++