From: Chris Larson Date: Wed, 9 Jun 2004 17:26:25 +0000 (+0000) Subject: Merge openembedded@openembedded.bkbits.net:packages X-Git-Tag: Release-2010-05/1~18778 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f301254b4fe7470fdd97d8ca5c442d2cecc05ca;p=openembedded.git Merge openembedded@openembedded.bkbits.net:packages into zelda.tuxnami.org:/home/kergoth/code/packages 2004/06/09 13:17:28-04:00 local!kergoth Upgrade netbase to 4.17. BKrev: 40c74841o7apzSGceMYSqKHwtOMFQw --- diff --git a/netbase/netbase-4.16/busybox.patch b/netbase/netbase-4.17/busybox.patch similarity index 100% rename from netbase/netbase-4.16/busybox.patch rename to netbase/netbase-4.17/busybox.patch diff --git a/netbase/netbase-4.16/epia/interfaces b/netbase/netbase-4.17/epia/interfaces similarity index 100% rename from netbase/netbase-4.16/epia/interfaces rename to netbase/netbase-4.17/epia/interfaces diff --git a/netbase/netbase-4.16/hosts b/netbase/netbase-4.17/hosts similarity index 100% rename from netbase/netbase-4.16/hosts rename to netbase/netbase-4.17/hosts diff --git a/netbase/netbase-4.16/init b/netbase/netbase-4.17/init similarity index 100% rename from netbase/netbase-4.16/init rename to netbase/netbase-4.17/init diff --git a/netbase/netbase-4.16/interfaces b/netbase/netbase-4.17/interfaces similarity index 100% rename from netbase/netbase-4.16/interfaces rename to netbase/netbase-4.17/interfaces diff --git a/netbase/netbase-4.16/options b/netbase/netbase-4.17/options similarity index 100% rename from netbase/netbase-4.16/options rename to netbase/netbase-4.17/options diff --git a/netbase/netbase_4.16.oe b/netbase/netbase_4.16.oe deleted file mode 100644 index 0f51337e75..0000000000 --- a/netbase/netbase_4.16.oe +++ /dev/null @@ -1,36 +0,0 @@ -PR = "r4" -DESCRIPTION = "This package provides the necessary \ -infrastructure for basic TCP/IP based networking." -DEPENDS = "update-rc.d" -RDEPENDS = "update-rc.d" - -inherit update-rc.d - -INITSCRIPT_NAME = "networking" -INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." - -SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ - file://options \ - file://init \ - file://hosts \ - file://epia/interfaces \ - file://interfaces" - -do_install () { - install -d ${D}/${sysconfdir}/init.d \ - ${D}/${sbindir} \ - ${D}/${mandir}/man8 \ - ${D}/${sysconfdir}/network/if-pre-up.d \ - ${D}/${sysconfdir}/network/if-up.d \ - ${D}/${sysconfdir}/network/if-down.d \ - ${D}/${sysconfdir}/network/if-post-down.d - install -m 0644 ${WORKDIR}/options ${D}/${sysconfdir}/network/options - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/networking - install -m 0644 ${WORKDIR}/hosts ${D}/${sysconfdir}/hosts - install -m 0644 etc-rpc ${D}/${sysconfdir}/rpc - install -m 0644 etc-protocols ${D}/${sysconfdir}/protocols - install -m 0644 etc-services ${D}/${sysconfdir}/services - install -m 0755 update-inetd ${D}/${sbindir}/ - install -m 0644 update-inetd.8 ${D}/${mandir}/man8/ - oe_machinstall -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces -} diff --git a/rxvt-unicode/rxvt-unicode-1.9/include.patch b/netbase/netbase_4.17.oe similarity index 100% rename from rxvt-unicode/rxvt-unicode-1.9/include.patch rename to netbase/netbase_4.17.oe diff --git a/rxvt-unicode/rxvt-unicode-1.9/xim.patch b/rxvt-unicode/rxvt-unicode-1.9/xim.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/rxvt-unicode/rxvt-unicode-2.2/include.patch b/rxvt-unicode/rxvt-unicode-2.2/include.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/rxvt-unicode/rxvt-unicode_1.9.oe b/rxvt-unicode/rxvt-unicode_1.9.oe deleted file mode 100644 index 204ac20fcf..0000000000 --- a/rxvt-unicode/rxvt-unicode_1.9.oe +++ /dev/null @@ -1,54 +0,0 @@ -DEPENDS = "x11 xft" -DESCRIPTION = "rxvt-unicode is a clone of the well known \ -terminal emulator rxvt, modified to store text in Unicode \ -(either UCS-2 or UCS-4) and to use locale-correct input and \ -output. It also supports mixing multiple fonts at the \ -same time, including Xft fonts." - -SRC_URI = "${SOURCEFORGE_MIRROR}/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \ - file://xim.patch;patch=1 \ - file://include.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-menubar \ - --enable-ttygid \ - --with-term=rxvt \ - --enable-transparency \ - --disable-xim \ - --with-x=${STAGING_LIBDIR}/.. \ - --enable-shared \ - --disable-static \ - --enable-xft" -EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ - 'XLIB=-L${STAGING_LIBDIR} -lX11'" -#CFLAGS_append = " -I${S}/W11" -#CPPFLAGS_append = "-I${S}/W11" - -do_configure () { - if test -e ${STAGING_BINDIR}/${HOST_SYS}-libtool; then - STAGING_DIR=${STAGING_DIR} \ - ${HOST_SYS}-libtoolize -c -f - fi - ./reconf - gnu-configize - oe_runconf - cat >>config.h <> config.h - echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h - echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h - echo '#define HAVE_XLOCALE 1' >> config.h -} - -do_compile () { - if test -e ${S}/${HOST_SYS}-libtool; then - LIBTOOL=${S}/${HOST_SYS}-libtool - else - LIBTOOL=${S}/libtool - fi - oe_runmake "LIBTOOL=$LIBTOOL" -}