Ahhhhhh apache hates me, move 2.0.47 into nonworking, since its m4 macros are atrocious.

BKrev: 4015b63aD2VDTG63k9iwi3hN68GUJw

diff --git a/apache/apache-2.0.47/init b/apache/apache-2.0.47/init
deleted file mode 100644 (file)
index 7a05c38..0000000
--- a/apache/apache-2.0.47/init
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# apache       Start the apache HTTP server.
-#
-
-NAME=apache
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/httpd
-SUEXEC=/usr/lib/apache/suexec
-PIDFILE=/var/run/$NAME.pid
-CONF=/etc/apache/httpd.conf
-APACHECTL=/usr/sbin/apachectl 
-
-trap "" 1
-export LANG=C
-export PATH
-
-test -f $DAEMON || exit 0
-test -f $APACHECTL || exit 0
-
-# ensure we don't leak environment vars into apachectl
-APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL"
-
-if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF
-then
-    exit 0
-fi
-
-case "$1" in
-  start)
-    echo -n "Starting web server: $NAME"
-    start-stop-daemon -S -x $DAEMON
-    ;;
-
-  stop)
-    echo -n "Stopping web server: $NAME"
-    start-stop-daemon -K -x $DAEMON
-    ;;
-
-  reload)
-    echo -n "Reloading $NAME configuration"
-    start-stop-daemon -K --signal USR1 -x $DAEMON
-    ;;
-
-  reload-modules)
-    echo -n "Reloading $NAME modules"
-    start-stop-daemon -K
-    start-stop-daemon -S -x $DAEMON
-    ;;
-
-  restart)
-    $0 reload-modules
-    exit $?
-    ;;
-
-  force-reload)
-    $0 reload-modules
-    exit $?
-    ;;
-
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}"
-    exit 1
-    ;;
-esac
-
-if [ $? == 0 ]; then
-       echo .
-       exit 0
-else
-       echo failed
-       exit 1
-fi

diff --git a/apache/apache_2.0.47.oe b/apache/apache_2.0.47.oe
deleted file mode 100644 (file)
index 9be4594..0000000
--- a/apache/apache_2.0.47.oe
+++ /dev/null
@@ -1,85 +0,0 @@
-SECTION = net
-DEPENDS = virtual/libc expat openssl
-RDEPENDS = libc6, libexpat1, libssl0.9.7
-
-SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
-         file://${FILESDIR}/configure.patch;patch=1 \
-         file://${FILESDIR}/pcre-configure.patch;patch=1
-S = ${WORKDIR}/httpd-${PV}
-
-basesysconfdir := ${sysconfdir}
-sysconfdir = /etc/apache
-
-inherit autotools libtool
-
-FILES_${PN}=${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
-           ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \
-           /bin /sbin /lib/*/ /lib/*.so* ${datadir}/${PN} ${datadir}/htdocs \
-           ${datadir}/icons ${datadir}/cgi-bin ${datadir}/error /var
-
-CFLAGS_append = " -DPATH_MAX=4096"
-CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
-EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \
-               --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no \
-               --with-gdbm=no --with-ndbm=no"
-do_configure () {
-       (cd srclib/apr && ./buildconf)
-       (cd srclib/apr-util && ./buildconf)
-
-       cp srclib/apr/build/config.guess srclib/apr/build/config.sub \
-          srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \
-          srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
-
-       (cd srclib/pcre && autoconf)
-
-       aclocal -I build
-       autoheader
-       autoconf
-       oe_runconf
-}
-
-do_compile () {
-       touch srclib/apr-util/uri/gen_uri_delims.lo
-       ${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims
-       touch srclib/pcre/dftables.lo
-       ${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables
-       cd server
-       ${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo
-       ${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo
-       ${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char
-       /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo
-       /bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo
-       touch gen_test_char
-       cd ..
-       oe_runmake
-}
-
-do_install_append () {
-       set -x
-       install -d ${D}/${basesysconfdir}/init.d
-       cat ${FILESDIR}/init | \
-               sed -e 's,/usr/sbin/,${sbindir}/,g; \
-                       s,/usr/bin/,${bindir}/,g; \
-                       s,/usr/lib,${libdir}/,g; \
-                       s,/etc/apache/,${sysconfdir}/,g; \
-                       s,/etc/,${basesysconfdir}/,g; \
-                       s,/usr/,${prefix}/,g;' > ${D}/${basesysconfdir}/init.d/httpd
-       chmod 755 ${D}/${basesysconfdir}/init.d/httpd
-       if test -e ${FILESDIR}/httpd.conf.${MACHINE}; then
-               install -m 0644 ${FILESDIR}/httpd.conf.${MACHINE} ${D}/${sysconfdir}/httpd.conf
-       fi
-}
-
-pkg_postinst () {
-       if test -n "$D"; then
-               D="-r $D"
-       fi
-       update-rc.d $D httpd defaults 91 20
-}
-
-pkg_prerm () {
-       if test -n "$D"; then
-               D="-r $D"
-       fi
-       update-rc.d $D httpd remove
-}

diff --git a/apache/apache-2.0.47/configure.patch b/nonworking/apache/apache-2.0.47/configure.patch
similarity index 100%
rename from apache/apache-2.0.47/configure.patch
rename to nonworking/apache/apache-2.0.47/configure.patch

diff --git a/apache/apache-2.0.47/pcre-configure.patch b/nonworking/apache/apache-2.0.47/init
similarity index 100%
rename from apache/apache-2.0.47/pcre-configure.patch
rename to nonworking/apache/apache-2.0.47/init

diff --git a/nonworking/apache/apache-2.0.47/pcre-configure.patch b/nonworking/apache/apache-2.0.47/pcre-configure.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/nonworking/apache/apache_2.0.47.oe b/nonworking/apache/apache_2.0.47.oe
new file mode 100644 (file)
index 0000000..e69de29