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

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

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

1 files changed, 87 insertions, 0 deletions

diff --git a/packages/apache/apache_2.0.48.bb b/packages/apache/apache_2.0.48.bb
index e69de29bb2..adb068a575 100644
--- a/packages/apache/apache_2.0.48.bb
+++ b/packages/apache/apache_2.0.48.bb
@@ -0,0 +1,87 @@
+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
+}