Merge bk://openembedded@openembedded.bkbits.net/packages

into mhcln01.hentges.local:/home/mhentges/OpenEmbedded/packages

2004/10/11 13:35:43+02:00 local!CoreDump
base section fixes

2004/10/11 13:21:10+02:00 local!CoreDump
x11 section fixes

2004/10/11 13:01:40+02:00 local!CoreDump
Section fixes: replace net with console/net

BKrev: 416a702ahGepUmVenzmpZ_GI8n7joA

64 files changed, 438 insertions, 28 deletions

diff --git a/corkscrew/corkscrew_2.0.oe b/corkscrew/corkscrew_2.0.oe
index b93e72c43e..f3360f7c89 100644
--- a/corkscrew/corkscrew_2.0.oe
+++ b/corkscrew/corkscrew_2.0.oe
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.agroman.net/corkscrew/"
 DESCRIPTION = "Tunnel SSH throught HTTP proxies"
-SECTION = "net"
+SECTION = "console/network"
 SRC_URI = "http://www.agroman.net/corkscrew/corkscrew-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
 
diff --git a/cvs/cvs_1.11.14.oe b/cvs/cvs_1.11.14.oe
index 9dcc5bfbc8..3a090a62e9 100644
--- a/cvs/cvs_1.11.14.oe
+++ b/cvs/cvs_1.11.14.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "The Concurrent Versioning System (cvs) client - Stable Version"
-SECTION = "net"
+SECTION = "console/network"
 PRIORITY = "optional"
 
 SRC_URI = "http://www.cvshome.org/files/19/10/cvs-${PV}.tar.bz2"
diff --git a/cvs/cvs_1.12.8.oe b/cvs/cvs_1.12.8.oe
index e69de29bb2..68c1c8454a 100644
--- a/cvs/cvs_1.12.8.oe
+++ b/cvs/cvs_1.12.8.oe
@@ -0,0 +1,11 @@
+DESCRIPTION = "The Concurrent Versioning System (cvs) client - Feature Version "
+SECTION = "console/network"
+PRIORITY = "optional"
+DEPENDS = "gettext-native"
+
+SRC_URI = "https://cvs.cvshome.org/files/documents/19/170/cvs-${PV}.tar.bz2 \
+	   file://m4.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-krb4=no --with-gssapi=no"
diff --git a/cvs/cvs_1.12.9.oe b/cvs/cvs_1.12.9.oe
index e69de29bb2..3daa18147a 100644
--- a/cvs/cvs_1.12.9.oe
+++ b/cvs/cvs_1.12.9.oe
@@ -0,0 +1,11 @@
+DESCRIPTION = "The Concurrent Versioning System (cvs) client - Feature Version "
+SECTION = "console/network"
+PRIORITY = "optional"
+DEPENDS = "gettext-native"
+
+SRC_URI = "http://musthave.sunbase.org/progs/ccvs/cvs-${PV}/cvs-${PV}.tar.bz2 \
+	   file://m4.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-krb4=no --with-gssapi=no"
diff --git a/dvbtools/dvbstream_cvs.oe b/dvbtools/dvbstream_cvs.oe
index 6e2d3d4b72..af5589173b 100644
--- a/dvbtools/dvbstream_cvs.oe
+++ b/dvbtools/dvbstream_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-SECTION = "dvb"
+SECTION = "console/dvb"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libxml2"
diff --git a/dvbtools/dvbtune_cvs.oe b/dvbtools/dvbtune_cvs.oe
index 9bf4ca47bf..e9d60ea766 100644
--- a/dvbtools/dvbtune_cvs.oe
+++ b/dvbtools/dvbtune_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-SECTION = "dvb"
+SECTION = "console/dvb"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libxml2"
diff --git a/etherpuppet/etherpuppet_0.1.oe b/etherpuppet/etherpuppet_0.1.oe
index e69de29bb2..3c79b073e5 100644
--- a/etherpuppet/etherpuppet_0.1.oe
+++ b/etherpuppet/etherpuppet_0.1.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Etherpuppet is a small program for Linux that will create a \
+voodoo doll for an Ethernet interface. You have to run the Etherpuppet on \
+your machine to create the doll, which will have the shape of a virtual \
+TUN/TAP interface (named by default puppet%d, where %d is a number). \
+You also have to run Etherpuppet on the victim interface's machine."
+SECTION = "console/network"
+
+SRC_URI = "http://www.cartel-securite.fr/pbiondi/projects/etherpuppet/etherpuppet.c"
+S = "${WORKDIR}"
+
+do_unpack() {
+	install -m 0644 ${DL_DIR}/etherpuppet.c ${S}
+}
+
+do_compile() {
+	${CC} ${CFLAGS} ${LFLAGS} -o etherpuppet etherpuppet.c
+}
+
+do_install() {
+	install -d ${D}/${sbindir}
+	install -m 0755 etherpuppet ${D}/${sbindir}
+}
+
diff --git a/gif2png/gif2png_2.5.1.oe b/gif2png/gif2png_2.5.1.oe
index 205c0f15a0..e6b32fc4dd 100644
--- a/gif2png/gif2png_2.5.1.oe
+++ b/gif2png/gif2png_2.5.1.oe
@@ -1,5 +1,5 @@
-DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "net"
+DESCRIPTION = "gif2png"
+SECTION = "console/utils"
 PRIORITY = "optional"
 DEPENDS = "zlib libpng"
 
diff --git a/gpsd/gpsd_1.10.oe b/gpsd/gpsd_1.10.oe
index 8ab661ee5a..51792fedc2 100644
--- a/gpsd/gpsd_1.10.oe
+++ b/gpsd/gpsd_1.10.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "net"
+SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
diff --git a/hdparm/hdparm_5.4.oe b/hdparm/hdparm_5.4.oe
index ab54f68141..3633f6e97b 100644
--- a/hdparm/hdparm_5.4.oe
+++ b/hdparm/hdparm_5.4.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "hdparm is a Linux shell utility for viewing \
 and manipulating various IDE drive and driver parameters."
-SECTION = "utils"
+SECTION = "console/utils"
 PRIORITY = "optional"
 PR = "r1"
 
diff --git a/ifupdown-roam/ifupdown-roam_0.59.oe b/ifupdown-roam/ifupdown-roam_0.59.oe
index 9adc3665a6..b4d0eb6619 100644
--- a/ifupdown-roam/ifupdown-roam_0.59.oe
+++ b/ifupdown-roam/ifupdown-roam_0.59.oe
@@ -1,4 +1,4 @@
-SECTION = "net"
+SECTION = "console/network"
 PRIORITY = "extra"
 DESCRIPTION = "Roaming enhancements for ifupdown"
 RDEPENDS = "ifupdown"
diff --git a/ifupdown/ifupdown_0.6.4.oe b/ifupdown/ifupdown_0.6.4.oe
index 43125c9d06..34cc537c57 100644
--- a/ifupdown/ifupdown_0.6.4.oe
+++ b/ifupdown/ifupdown_0.6.4.oe
@@ -3,6 +3,8 @@ This package provides the tools ifup and ifdown which may be used to \
 configure (or, respectively, deconfigure) network interfaces, based on \
 the file /etc/network/interfaces."
 
+SECTION = "base"
+
 SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \
            ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \
            file://busybox.patch;patch=1 \
diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
index 02124da63b..5ec90b6b3c 100644
--- a/libsdl/libsdl-net_1.2.5.oe
+++ b/libsdl/libsdl-net_1.2.5.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Simple DirectMedia Layer networking library."
-SECTION = "net"
+SECTION = "libs/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl"
diff --git a/libspf2/libspf2_1.0.4.oe b/libspf2/libspf2_1.0.4.oe
index e69de29bb2..4e0313c295 100644
--- a/libspf2/libspf2_1.0.4.oe
+++ b/libspf2/libspf2_1.0.4.oe
@@ -0,0 +1,13 @@
+DESCRIPTION = "libspf2 is a complete and robust implementation of SPF which \
+provides support for many MTAs."
+SECTION = "libs/network"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+
+SRC_URI = "http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
+S = "${WORKDIR}/libspf2-${PV}"
+
+inherit autotools
+
+PACKAGES =+ "${PN}-bin"
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/microwindows/microwindows_0.90.oe b/microwindows/microwindows_0.90.oe
index 340b948639..9df952ed78 100644
--- a/microwindows/microwindows_0.90.oe
+++ b/microwindows/microwindows_0.90.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Microwindows Graphical Engine"
-SECTION = "gui"
+SECTION = "x11/wm"
 PRIORITY = "optional"
 MAINTAINER = "Jordan Crouse <jordan@cosmicpenguin.net>"
 DEPENDS = "libpng jpeg"
diff --git a/nsd/nsd_2.0.0.oe b/nsd/nsd_2.0.0.oe
index fc667d57d5..86f0e5714e 100644
--- a/nsd/nsd_2.0.0.oe
+++ b/nsd/nsd_2.0.0.oe
@@ -1,5 +1,5 @@
-DESCRIPTION = "NSD is an authoritative only, high performance, simple andopen source name server"
-SECTION = "net"
+DESCRIPTION = "NSD is an authoritative only, high performance, simple and opensource name server"
+SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
diff --git a/ntp/ntp_4.1.2.oe b/ntp/ntp_4.1.2.oe
index 26e2472c6f..3bf0c38758 100644
--- a/ntp/ntp_4.1.2.oe
+++ b/ntp/ntp_4.1.2.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "The Network Time Protocol (NTP) is used to \
 synchronize the time of a computer client or server to \
 another server or reference time source, such as a radio \
 or satellite receiver or modem."
-SECTION = "net"
+SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "openssl"
 
@@ -23,4 +23,4 @@ FILES_ntpdate = "/usr/bin/ntpdate /etc/init.d/ntpdate"
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d
-}
\ No newline at end of file
+}
diff --git a/offlineimap/offlineimap_4.0.3.oe b/offlineimap/offlineimap_4.0.3.oe
index e9ea45f59e..0e4fa99569 100644
--- a/offlineimap/offlineimap_4.0.3.oe
+++ b/offlineimap/offlineimap_4.0.3.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "OfflineIMAP is a tool to simplify your e-mail reading."
 HOMEPAGE = "http://gopher.quux.org:70/devel/offlineimap"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "net"
+SECTION = "console/network"
 LICENSE = "GPL PSF"
 
 SRC_URI = "http://gopher.quux.org:70/devel/offlineimap/offlineimap_${PV}.tar.gz"
diff --git a/openssh/openssh_3.7.1p1.oe b/openssh/openssh_3.7.1p1.oe
index cd25486e5d..f4678806db 100644
--- a/openssh/openssh_3.7.1p1.oe
+++ b/openssh/openssh_3.7.1p1.oe
@@ -1,5 +1,5 @@
 DEPENDS = "zlib openssl"
-SECTION = "net"
+SECTION = "console/network"
 DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
 Ssh (Secure Shell) is a program for logging into a remote machine \
 and for executing commands on a remote machine. \
diff --git a/openssh/openssh_3.7.1p2.oe b/openssh/openssh_3.7.1p2.oe
index cd25486e5d..f4678806db 100644
--- a/openssh/openssh_3.7.1p2.oe
+++ b/openssh/openssh_3.7.1p2.oe
@@ -1,5 +1,5 @@
 DEPENDS = "zlib openssl"
-SECTION = "net"
+SECTION = "console/network"
 DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
 Ssh (Secure Shell) is a program for logging into a remote machine \
 and for executing commands on a remote machine. \
diff --git a/openssh/openssh_3.8p1.oe b/openssh/openssh_3.8p1.oe
index 2e0c9d3319..55bddc1dd8 100644
--- a/openssh/openssh_3.8p1.oe
+++ b/openssh/openssh_3.8p1.oe
@@ -1,5 +1,5 @@
 DEPENDS = "zlib openssl"
-SECTION = "net"
+SECTION = "console/network"
 DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
 Ssh (Secure Shell) is a program for logging into a remote machine \
 and for executing commands on a remote machine. \
diff --git a/picocom/picocom_1.3.oe b/picocom/picocom_1.3.oe
index d263541e81..830f625445 100644
--- a/picocom/picocom_1.3.oe
+++ b/picocom/picocom_1.3.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Picocom is a lightweight and minimal (~20K) dumb-terminal emulation program. "
-SECTION = "utils"
+SECTION = "console/utils"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
diff --git a/procps/procps_3.1.15.oe b/procps/procps_3.1.15.oe
index 1c20b59a4b..683c2f6afa 100644
--- a/procps/procps_3.1.15.oe
+++ b/procps/procps_3.1.15.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Procps is the package that has a bunch \
 of small useful utilities that give information \
 about processes using the /proc filesystem. The package \
 includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "net"
+SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "ncurses"
 
diff --git a/procps/procps_3.2.1.oe b/procps/procps_3.2.1.oe
index 99990c5648..6323dc02b6 100644
--- a/procps/procps_3.2.1.oe
+++ b/procps/procps_3.2.1.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Procps is the package that has a bunch \
 of small useful utilities that give information \
 about processes using the /proc filesystem. The package \
 includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "net"
+SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "ncurses"
 
diff --git a/rsync/rsync_2.6.2.oe b/rsync/rsync_2.6.2.oe
index 019f68354c..ae8b1f97fe 100644
--- a/rsync/rsync_2.6.2.oe
+++ b/rsync/rsync_2.6.2.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "A file-synchronization tool"
-SECTION = "net"
+SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
diff --git a/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe b/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
index be476bf642..8274460cdd 100644
--- a/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
+++ b/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
@@ -1,4 +1,4 @@
-SECTION = "NET"
+SECTION = "console/multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl"
diff --git a/twin/twin_0.4.6.oe b/twin/twin_0.4.6.oe
index 9d661811a0..0a38f8bff8 100644
--- a/twin/twin_0.4.6.oe
+++ b/twin/twin_0.4.6.oe
@@ -1,5 +1,7 @@
 DESCRIPTION = "Twin is a text-mode windowing environment: it draws and manages text windows on a text-mode display, like X11 does for graphical windows. It has a built-in window manager and terminal emulator, and can be used as server for remote clients in the same style as X11. It can display on Linux console, on X11 and inside itself."
 MAINTAINER = "Chris Lord <cwiiis@blueyonder.co.uk>"
+SECTION = "console/utils"
+
 DEPENDS = "coreutils-native"
 
 SRC_URI = "http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz \
diff --git a/twin/twutils_0.2.oe b/twin/twutils_0.2.oe
index 45c2cffa72..c5bdc7ea66 100644
--- a/twin/twutils_0.2.oe
+++ b/twin/twutils_0.2.oe
@@ -2,6 +2,8 @@ DESCRIPTION = "Utilities for twin. Currently contains 'twkalc', a calculator der
 MAINTAINER = "Chris Lord <cwiiis@blueyonder.co.uk>"
 DEPENDS = "twin"
 
+SECTION = "console/utils"
+
 SRC_URI = "http://linuz.sns.it/~max/twin/twutils-0.2.tar.gz"
 
 inherit autotools
diff --git a/twisted/twisted_1.2.0.oe b/twisted/twisted_1.2.0.oe
index ca1615f4a9..f0275ea6c5 100644
--- a/twisted/twisted_1.2.0.oe
+++ b/twisted/twisted_1.2.0.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Twisted is an event-driven networking framework written in Python
 Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
 (including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
 HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "base"
+SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-core"
diff --git a/units/units_1.80.oe b/units/units_1.80.oe
index 1e82f408fc..fe65926756 100644
--- a/units/units_1.80.oe
+++ b/units/units_1.80.oe
@@ -1,5 +1,6 @@
 DEPENDS = "readline"
 DESCRIPTION = "GNU units converts between different systems of units."
+SECTION = "console/utils"
 
 SRC_URI = "${GNU_MIRROR}/units/units-${PV}.tar.gz \
 	   file://units.c.patch;patch=1 \
diff --git a/unzip/unzip_551.oe b/unzip/unzip_551.oe
index e69de29bb2..10633ca81c 100644
--- a/unzip/unzip_551.oe
+++ b/unzip/unzip_551.oe
@@ -0,0 +1,13 @@
+SECTION = "console/utils"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip${PV}.tar.gz"
+S = "${WORKDIR}/unzip-5.51"
+
+do_compile() {
+        make -f unix/Makefile generic
+}
+
+do_install() {
+        make -f unix/Makefile install prefix=${D}${prefix}
+}
+
+
diff --git a/usbutils/usbutils_0.11.oe b/usbutils/usbutils_0.11.oe
index 0f4d20f8dc..a9c277a7eb 100644
--- a/usbutils/usbutils_0.11.oe
+++ b/usbutils/usbutils_0.11.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "USB console utilities."
+SECTION = "console/base"
 
 SRC_URI = "http://wwwbode.cs.tum.edu/Par/arch/usb/download/usbutils/usbutils-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/vim/vim_6.2.oe b/vim/vim_6.2.oe
index 1a627bf52e..c908255dee 100644
--- a/vim/vim_6.2.oe
+++ b/vim/vim_6.2.oe
@@ -1,6 +1,7 @@
 DEPENDS = "ncurses"
 DESCRIPTION = "Vim is an almost fully-compatible \
 version of the Unix editor Vi."
+SECTION = "console/utils"
 
 SRC_URI = "ftp://ftp.vim.org/pub/vim/unix/vim-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
diff --git a/vorbis-tools/vorbis-tools_1.0.1.oe b/vorbis-tools/vorbis-tools_1.0.1.oe
index 9dced00ead..0ef2b88504 100644
--- a/