diff options
24 files changed, 201 insertions, 45 deletions
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.2.7.bb index ec1998d64b..ec1998d64b 100644 --- a/packages/apr/apr-util_1.1.2.bb +++ b/packages/apr/apr-util_1.2.7.bb diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.2.7.bb index 6374949f91..6374949f91 100644 --- a/packages/apr/apr_1.1.1.bb +++ b/packages/apr/apr_1.2.7.bb diff --git a/packages/beep/beep_1.2.2.bb b/packages/beep/beep_1.2.2.bb index e726deb5ab..87c9ee16d6 100644 --- a/packages/beep/beep_1.2.2.bb +++ b/packages/beep/beep_1.2.2.bb @@ -24,7 +24,7 @@ BINDIR_slugos = "${base_bindir}" do_install() { # this is easier than patching the Makefile... install -d "${D}${BINDIR}" - install -c -s -m 755 beep "${D}${BINDIR}/beep" + install -c -m 755 beep "${D}${BINDIR}/beep" install -d "${D}${mandir}/man1" install -c -m 644 beep.1.gz "${D}${mandir}/man1/beep.1.gz" } diff --git a/packages/boa/boa-0.94.13/cgi.patch b/packages/boa/boa-0.94.13/cgi.patch new file mode 100644 index 0000000000..4f6a0ee322 --- /dev/null +++ b/packages/boa/boa-0.94.13/cgi.patch @@ -0,0 +1,10 @@ +--- boa-0.94.13/src/cgi.c 2002-07-23 08:49:54.000000000 -0700 ++++ boa-0.94.13/src/cgi.c~ 2005-06-22 23:13:54.000000000 -0700 +@@ -214,6 +214,7 @@ + my_add_cgi_env(req, "SERVER_ADDR", req->local_ip_addr); + my_add_cgi_env(req, "SERVER_PROTOCOL", req->http_version); + my_add_cgi_env(req, "REQUEST_URI", req->request_uri); ++ my_add_cgi_env(req, "SCRIPT_FILENAME", req->request_uri); + + if (req->path_info) + my_add_cgi_env(req, "PATH_INFO", req->path_info); diff --git a/packages/boa/boa_0.94.13.bb b/packages/boa/boa_0.94.13.bb index 7dc783210e..342dce97bd 100644 --- a/packages/boa/boa_0.94.13.bb +++ b/packages/boa/boa_0.94.13.bb @@ -1,16 +1,16 @@ DESCRIPTION = "Lightweight and High Performance WebServer" SECTION = "console/network" -RPROVIDES = "httpd" LICENSE = "GPL" -PR = "r2" - -DEPENDS = "mime-support" RDEPENDS = "mime-support" +RPROVIDES = "httpd" +PR = "r3" SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \ + file://cgi.patch;patch=1;pnum=2 \ file://debian-patch.diff;patch=1;pnum=2 \ file://boa.conf \ file://boa.init" + S = "${WORKDIR}/boa-${PV}/src" inherit autotools update-rc.d @@ -31,4 +31,7 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0640 ${WORKDIR}/boa.conf ${D}${sysconfdir}/${PN} install -m 0755 ${WORKDIR}/boa.init ${D}${sysconfdir}/init.d/boa + + install -d ${D}${mandir}/man8 + install -m 0644 ${S}/../docs/boa.8 ${D}${mandir}/man8 } diff --git a/packages/boa/files/boa.conf b/packages/boa/files/boa.conf index 349da47ee0..fbe15f4fdf 100644 --- a/packages/boa/files/boa.conf +++ b/packages/boa/files/boa.conf @@ -168,7 +168,8 @@ DefaultType text/plain # Example: AddType type extension [extension ...] # Uncomment the next line if you want .cgi files to execute from anywhere -#AddType application/x-httpd-cgi cgi +AddType application/x-httpd-cgi cgi +AddType application/x-httpd-cgi php # Redirect, Alias, and ScriptAlias all have the same semantics -- they # match the beginning of a request and take appropriate action. Use diff --git a/packages/boa/files/boa.init b/packages/boa/files/boa.init index 9c05c5ada3..7ac99f29fb 100644 --- a/packages/boa/files/boa.init +++ b/packages/boa/files/boa.init @@ -26,30 +26,19 @@ case "$1" in ;; stop) echo -n "Stopping $DESC: $NAME" - start-stop-daemon --stop --quiet --oknodo --exec $DAEMON + start-stop-daemon --stop --quiet --exec $DAEMON echo "." ;; restart) echo -n "Restarting $DESC: $NAME" - start-stop-daemon --stop --signal HUP --quiet --oknodo --exec $DAEMON - echo "done." - ;; - reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - echo -n "Reloading $DESC configuration..." - start-stop-daemon --stop --signal 1 --quiet --oknodo --exec $DAEMON + start-stop-daemon --stop --exec $DAEMON + start-stop-daemon --start --exec $DAEMON echo "done." ;; *) N=/etc/init.d/$NAME # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|reload}" >&2 + echo "Usage: $N {start|stop|restart}" >&2 exit 1 ;; esac diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 425e906a57..3ed8599e2d 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -35,7 +35,6 @@ FILES_cpp-symlinks = "${bindir}/cpp" FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" FILES_gcov-symlinks = "${bindir}/gcov" -PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c-dev = "${libdir}/libg2c.so \ ${libdir}/libg2c.a \ @@ -46,7 +45,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_g++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++.la \ diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb index 0c237a9166..07387cb1bc 100644 --- a/packages/gcc/gcc_3.3.3.bb +++ b/packages/gcc/gcc_3.3.3.bb @@ -37,11 +37,8 @@ FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_${PN}-c++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" FILES_libgcc = "/lib/libgcc_s.so.*" -PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong #FILES_libstdc++ = "${libdir}/libstdc++.so.*" FILES_libstdc++ = "${libdir}/libstdc++.so.*" diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index bb52fa6a1f..f11fc36646 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -37,11 +37,8 @@ FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_${PN}-c++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" FILES_libgcc = "/lib/libgcc_s.so.*" -PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong #FILES_libstdc++ = "${libdir}/libstdc++.so.*" FILES_libstdc++ = "${libdir}/libstdc++.so.*" diff --git a/packages/python/python-pyiw-0.3.2/.mtn2git_empty b/packages/python/python-pyiw-0.3.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pyiw-0.3.2/.mtn2git_empty diff --git a/packages/python/python-pyiw-0.3.2/Makefile b/packages/python/python-pyiw-0.3.2/Makefile new file mode 100644 index 0000000000..2ea7baec08 --- /dev/null +++ b/packages/python/python-pyiw-0.3.2/Makefile @@ -0,0 +1,18 @@ +# Simple Makfile + +NAME = pyiw +LIBS += -liw + +#static: pyiw.c +# @echo "Statically Building/Linking $(NAME)" +# @$(CC) $(CFLAGS) -Istaticlibiw $(<) -shared -o $(NAME).so staticlibiw/libiw.a + +dynamic: pyiw.c + @echo "Dynamically Building/Linking $(NAME)" + @$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) $(<) -shared -o $(NAME).so + +clean: + @rm -rf *.o + @rm -rf $(NAME).so + @rm -rf $(NAME).so.t* + diff --git a/packages/python/python-pyiw_0.3.2.bb b/packages/python/python-pyiw_0.3.2.bb new file mode 100644 index 0000000000..aa86a07e8f --- /dev/null +++ b/packages/python/python-pyiw_0.3.2.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "PyIW is a simple Python extension module written in C \ +that interfaces with libiw and provides a very 'pythonic' API to programmers." +HOMEPAGE = "http://www.emperorlinux.com/etc/contrib/?page=pyiw" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "wireless-tools" +RDEPENDS = "python-core libiw" +PR = "ml0" + +SRC_URI = "http://downloads.emperorlinux.com/contrib/pyiw/pyiw-${PV}.tbz2 \ + file://Makefile" + +S="${WORKDIR}/pyiw-${PV}" + +do_unpack_real () { + tar jxvf pyiw-${PV}.tbz2 + cp Makefile pyiw-${PV}/ +} +do_unpack_real[dirs] = "${WORKDIR}" +addtask unpack_real before do_patch after do_unpack + +inherit autotools pkgconfig distutils-base + +CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}" + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -m 0755 pyiw.so ${D}${libdir}/${PYTHON_DIR}/site-packages/pyiw.so +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/pyiw.so" diff --git a/packages/python/python-pythondaap_0.4.bb b/packages/python/python-pythondaap_0.4.bb new file mode 100644 index 0000000000..2cec3d3e3b --- /dev/null +++ b/packages/python/python-pythondaap_0.4.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A pure Python DAAP client implementation" +SECTION = "devel/python" +PRIORITY = "optional" +RDEPENDS = "python-compression" +LICENSE = "LGPL" + +inherit distutils + +SRC_URI = "http://jerakeen.org/files/PythonDaap-${PV}.tar.gz" + +S = "${WORKDIR}/PythonDaap-${PV}" diff --git a/packages/python/python-pywpa-0.3.4/.mtn2git_empty b/packages/python/python-pywpa-0.3.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pywpa-0.3.4/.mtn2git_empty diff --git a/packages/python/python-pywpa-0.3.4/Makefile b/packages/python/python-pywpa-0.3.4/Makefile new file mode 100644 index 0000000000..0206f1c229 --- /dev/null +++ b/packages/python/python-pywpa-0.3.4/Makefile @@ -0,0 +1,28 @@ +# Simple Makefile + +NAME = pywpa/_pywpa +CFLAGS += -Iwpactrl +OBJS = pywpa.o + +%.o: %.c + @echo "Compiling $(<)" + @$(CC) $(CFLAGS) -c $(<) -o $(@) + +$(NAME).so: objects libwpactrl + @echo "Statically Linking $(NAME)" + @$(CC) $(CFLAGS) $(OBJS) wpactrl/wpa_ctrl.o -shared -o $(NAME).so + +main: objects libwpactrl + @echo "Creating test" + @$(CC) $(CFLAGS) $(OBJS) wpactrl/wpa_ctrl.o -o test -lpython2.4 + +objects: $(OBJS) + +libwpactrl: + @make -C wpactrl > /dev/null + +clean: + @rm -rf *.o + @rm -rf $(NAME).so + @rm -rf $(NAME).so.t* + @make -C wpactrl clean 2>/dev/null diff --git a/packages/python/python-pywpa-0.3.4/Makefile.wpactrl b/packages/python/python-pywpa-0.3.4/Makefile.wpactrl new file mode 100644 index 0000000000..b956e0e015 --- /dev/null +++ b/packages/python/python-pywpa-0.3.4/Makefile.wpactrl @@ -0,0 +1,8 @@ +# Simple Makefile + +libwpa: wpa_ctrl.c wpa_ctrl.h + @echo "Building our small WPA Control Library..." + $(CC) -c -W -Wall -g wpa_ctrl.c + +clean: + @rm -rf *.o diff --git a/packages/python/python-pywpa_0.3.4.bb b/packages/python/python-pywpa_0.3.4.bb new file mode 100644 index 0000000000..e8886625b6 --- /dev/null +++ b/packages/python/python-pywpa_0.3.4.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "PyWPA is another Python extension module written in C \ + that interfaces with wpa_supplicant" +HOMEPAGE = "http://www.emperorlinux.com/etc/contrib/?page=pywpa" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core" +PR = "ml0" + +SRC_URI = "http://downloads.emperorlinux.com/contrib/pywpa/pywpa-${PV}.tbz2 \ + file://Makefile \ + file://Makefile.wpactrl" + +S="${WORKDIR}/pywpa-${PV}" + +do_unpack_real () { + tar jxvf pywpa-${PV}.tbz2 + cp Makefile pywpa-${PV}/ + cp Makefile.wpactrl pywpa-${PV}/wpactrl/Makefile +} +do_unpack_real[dirs] = "${WORKDIR}" +addtask unpack_real before do_patch after do_unpack + +inherit autotools pkgconfig distutils-base + +CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}" + +do_compile() { + cd ${S}/wpactrl + oe_runmake HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" + cd ${S} + oe_runmake HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/pywpa + install -m 0755 pywpa/__init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/pywpa/__init__.py + install -m 0755 pywpa/_pywpa.so ${D}${libdir}/${PYTHON_DIR}/site-packages/pywpa/_pywpa.so +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/pywpa/__init__.py ${libdir}/${PYTHON_DIR}/site-packages/pywpa/_pywpa.so" diff --git a/packages/python/python-pyzeroconf_0.12.bb b/packages/python/python-pyzeroconf_0.12.bb new file mode 100644 index 0000000000..d2efbbddf2 --- /dev/null +++ b/packages/python/python-pyzeroconf_0.12.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A pure Python implementation of Zeroconf" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "LGPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pyzeroconf/pyzeroconf-${PV}.tgz" + +S = "${WORKDIR}/pyzeroconf-${PV}" + +inherit distutils-base + +do_install() { + + install -d ${D}${libdir} + install -d ${D}${libdir}/${PYTHON_DIR} + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages + + install -m 0644 Zeroconf.py ${D}${libdir}/${PYTHON_DIR}/site-packages/ +} diff --git a/packages/uim/uim-native_1.1.0.bb b/packages/uim/uim-native_1.2.1.bb index 5249ac6394..5249ac6394 100644 --- a/packages/uim/uim-native_1.1.0.bb +++ b/packages/uim/uim-native_1.2.1.bb diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc index f934757c66..a4b0215896 100644 --- a/packages/uim/uim.inc +++ b/packages/uim/uim.inc @@ -14,6 +14,6 @@ EXTRA_OECONF += "--disable-applet \ --without-mana \ --without-eb" -SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz" +SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.bz2" S = "${WORKDIR}/uim-${PV}" diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.2.1.bb index 669475339b..5d82945df7 100644 --- a/packages/uim/uim_1.1.0.bb +++ b/packages/uim/uim_1.2.1.bb @@ -1,5 +1,5 @@ require uim.inc -DEPENDS = "gtk+ uim-native anthy fontconfig virtual/libx11 libxft xt glib-2.0 ncurses" +DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses" SRC_URI += "file://uim-module-manager.patch;patch=1" diff --git a/packages/vmedit/vmedit_0.01.bb b/packages/vmedit/vmedit_0.01.bb deleted file mode 100644 index 7850095f3b..0000000000 --- a/packages/vmedit/vmedit_0.01.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DEPENDS = "gtk+ libgpewidget gpe-icons" -RDEPENDS = "gpe-icons" -SECTION = "gpe" -DESCRIPTION = "This is a small GTK based multi-tab text editor." -AUTHOR = "Vladimir Martinek <vm@sykora.cz>" - -SRC_URI="http://194.213.43.198/${PN}/${P}.tar.gz" - -do_install () { - oe_runmake install-program DESTDIR=${D} PREFIX=${prefix} -} diff --git a/packages/vmedit/vmedit_0.02.bb b/packages/vmedit/vmedit_0.02.bb new file mode 100644 index 0000000000..aa5de2743a --- /dev/null +++ b/packages/vmedit/vmedit_0.02.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "This is a small GTK based multi-tab text editor." +HOMEPAGE = "http://194.213.43.198/" +AUTHOR = "Vladimir Martinek <vm@sykora.cz>" +SECTION = "gpe" +LICENSE = "GPL" +RDEPENDS = "gpe-icons" + +inherit gpe autotools + +SRC_URI = "http://194.213.43.198/${PN}/${P}.tar.gz" |