Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/06 17:41:26+02:00 uni-frankfurt.de!mickeyl
add quake courtesy Simon Pickering

BKrev: 427b9de5X-ZR3YB9eIJ9G5OnICdYwQ

diff --git a/packages/apache/apache_2.0.48.bb b/packages/apache/apache_2.0.48.bb
deleted file mode 100644 (file)
index adb068a..0000000
--- a/packages/apache/apache_2.0.48.bb
+++ /dev/null
@@ -1,87 +0,0 @@
-BROKEN = "1"
-SECTION = "console/network"
-DEPENDS = "expat openssl"
-DESCRIPTION = "A high performance Unix-based HTTP server."
-LICENSE="Apache-2.0"
-
-SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://pcre-configure.patch;patch=1 \
-           file://init \
-          file://httpd.conf"
-S = "${WORKDIR}/httpd-${PV}"
-
-basesysconfdir := "${sysconfdir}"
-sysconfdir = "/etc/apache"
-
-inherit autotools
-
-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 ${WORKDIR}/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
-       install -m 0644 ${WORKDIR}/httpd.conf ${D}${sysconfdir}/httpd.conf
-}
-
-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/packages/apache/apache-2.0.48/configure.patch b/packages/nonworking/apache/apache/apache-2.0.48/configure.patch
similarity index 100%
rename from packages/apache/apache-2.0.48/configure.patch
rename to packages/nonworking/apache/apache/apache-2.0.48/configure.patch

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

diff --git a/packages/apache/files/httpd.conf b/packages/nonworking/apache/apache/apache_2.0.48.bb
similarity index 100%
rename from packages/apache/files/httpd.conf
rename to packages/nonworking/apache/apache/apache_2.0.48.bb

diff --git a/packages/apache/files/init b/packages/nonworking/apache/apache/files/httpd.conf
similarity index 100%
rename from packages/apache/files/init
rename to packages/nonworking/apache/apache/files/httpd.conf

diff --git a/packages/nonworking/apache/apache/files/init b/packages/nonworking/apache/apache/files/init
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/quake/files/Makefile.patch b/packages/quake/files/Makefile.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/quake/files/cl_parse.c.patch b/packages/quake/files/cl_parse.c.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/quake/files/host.c.patch b/packages/quake/files/host.c.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/quake/quake1_0.0.1.bb b/packages/quake/quake1_0.0.1.bb
new file mode 100644 (file)
index 0000000..e69de29