summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-06-09 17:26:25 +0000
committerChris Larson <clarson@kergoth.com>2004-06-09 17:26:25 +0000
commit1f301254b4fe7470fdd97d8ca5c442d2cecc05ca (patch)
tree2d3b33d3e32d6c9b8dffdeb5e828f610715c4483
parent818d628b6fec963041efb767040e44f18c78753d (diff)
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
-rw-r--r--netbase/netbase-4.17/busybox.patch (renamed from netbase/netbase-4.16/busybox.patch)0
-rw-r--r--netbase/netbase-4.17/epia/interfaces (renamed from netbase/netbase-4.16/epia/interfaces)0
-rw-r--r--netbase/netbase-4.17/hosts (renamed from netbase/netbase-4.16/hosts)0
-rw-r--r--netbase/netbase-4.17/init (renamed from netbase/netbase-4.16/init)0
-rw-r--r--netbase/netbase-4.17/interfaces (renamed from netbase/netbase-4.16/interfaces)0
-rw-r--r--netbase/netbase-4.17/options (renamed from netbase/netbase-4.16/options)0
-rw-r--r--netbase/netbase_4.16.oe36
-rw-r--r--netbase/netbase_4.17.oe (renamed from rxvt-unicode/rxvt-unicode-1.9/include.patch)0
-rw-r--r--rxvt-unicode/rxvt-unicode-1.9/xim.patch0
-rw-r--r--rxvt-unicode/rxvt-unicode-2.2/include.patch0
-rw-r--r--rxvt-unicode/rxvt-unicode_1.9.oe54
-rw-r--r--rxvt-unicode/rxvt-unicode_2.2.oe52
12 files changed, 0 insertions, 142 deletions
diff --git a/netbase/netbase-4.16/busybox.patch b/netbase/netbase-4.17/busybox.patch
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.16/busybox.patch
+++ b/netbase/netbase-4.17/busybox.patch
diff --git a/netbase/netbase-4.16/epia/interfaces b/netbase/netbase-4.17/epia/interfaces
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.16/epia/interfaces
+++ b/netbase/netbase-4.17/epia/interfaces
diff --git a/netbase/netbase-4.16/hosts b/netbase/netbase-4.17/hosts
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.16/hosts
+++ b/netbase/netbase-4.17/hosts
diff --git a/netbase/netbase-4.16/init b/netbase/netbase-4.17/init
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.16/init
+++ b/netbase/netbase-4.17/init
diff --git a/netbase/netbase-4.16/interfaces b/netbase/netbase-4.17/interfaces
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.16/interfaces
+++ b/netbase/netbase-4.17/interfaces
diff --git a/netbase/netbase-4.16/options b/netbase/netbase-4.17/options
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.16/options
+++ b/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
index e69de29bb2..e69de29bb2 100644
--- a/rxvt-unicode/rxvt-unicode-1.9/include.patch
+++ b/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
--- a/rxvt-unicode/rxvt-unicode-1.9/xim.patch
+++ /dev/null
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
--- a/rxvt-unicode/rxvt-unicode-2.2/include.patch
+++ /dev/null
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 <<EOF
-#define RXVT_UTMP_FILE "/var/run/utmp"
-/* #undef RXVT_UTMPX_FILE */
-#define RXVT_WTMP_FILE "/var/log/wtmp"
-/* #undef RXVT_WTMPX_FILE */
-#define RXVT_LASTLOG_FILE "/var/log/lastlog"
-/* #undef RXVT_LASTLOGX_FILE */
-#define HAVE_XLOCALE 1
-EOF
-}
-
-do_compile () {
- if test -e ${S}/${HOST_SYS}-libtool; then
- LIBTOOL=${S}/${HOST_SYS}-libtool
- else
- LIBTOOL=${S}/libtool
- fi
- oe_runmake "LIBTOOL=$LIBTOOL"
-}
diff --git a/rxvt-unicode/rxvt-unicode_2.2.oe b/rxvt-unicode/rxvt-unicode_2.2.oe
deleted file mode 100644
index d267659740..0000000000
--- a/rxvt-unicode/rxvt-unicode_2.2.oe
+++ /dev/null
@@ -1,52 +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://include.patch;patch=1"
-
-inherit autotools
-
-#EXTRA_OECONF = "--enable-utmp --enable-wtmp --enable-lastlog \
-# --disable-strings --with-term=rxvt --enable-keepscrolling \
-# --enable-xft --with-name=rxvt --enable-frills \
-# --enable-swapscreen --enable-transparency \
-# --with-codesets=eu,jp --enable-menubar \
-# --enable-cursor-blink --enable-pointer-blank \
-# --enable-text-blink --enable-plain-scroll \
-# --with-x=${STAGING_LIBDIR}/.. \
-# --enable-combining"
-
-EXTRA_OECONF = "--disable-menubar --disable-xim \
- --enable-utmp --enable-wtmp --enable-lastlog \
- --disable-strings --with-term=rxvt --enable-keepscrolling \
- --enable-xft --with-name=rxvt --enable-frills \
- --enable-swapscreen --enable-transparency \
- --with-codesets=eu,jp \
- --enable-cursor-blink --enable-pointer-blank \
- --enable-text-blink --enable-plain-scroll \
- --enable-combining --enable-shared \
- --with-x=${STAGING_LIBDIR}/.."
-EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
- 'XLIB=-L${STAGING_LIBDIR} -lX11'"
-
-do_configure () {
- mv autoconf/configure.in configure.in
- autotools_do_configure
- echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> 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"
-}