rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

8 files changed, 233 insertions, 0 deletions

diff --git a/recipes/rdesktop/rdesktop-1.3.1/configure.patch b/recipes/rdesktop/rdesktop-1.3.1/configure.patch
new file mode 100644
index 0000000000..7a662a26a6
--- /dev/null
+++ b/recipes/rdesktop/rdesktop-1.3.1/configure.patch
@@ -0,0 +1,134 @@
+--- rdesktop-1.3.1/configure	2003-12-11 07:59:54.000000000 -0700
++++ rdesktop-1.3.1.new/configure	2004-05-25 11:17:14.661455560 -0700
+@@ -53,6 +53,9 @@
+   --with-libvncserver-config=*)
+     vncserverconfig=$optarg
+     ;;
++  --with-oss)
++    withoss=yes
++    ;;
+   --with-debug)
+     cflags="$cflags -g -DWITH_DEBUG"
+     ;;
+@@ -83,6 +86,7 @@
+     echo " --with-libvncserver     make rdp2vnc"
+     echo " --with-libvncserver-config=CMD"
+     echo "                         use CMD as libvncserver-config"
++    echo " --with-oss              Specify that we should use the OSS system"
+     echo " --with-debug            enable protocol debugging output"
+     echo " --with-debug-kbd        enable debugging of keyboard handling"
+     echo " --with-debug-rdp5       enable debugging of RDP5 code"
+@@ -139,7 +143,9 @@
+ 
+ # Find X installation
+ 
+-xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
++#xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
++
++xdirs="$extraxdir"
+ 
+ for dir in $xdirs; do
+     if [ -f $dir/include/X11/Xlib.h ]; then
+@@ -178,7 +184,10 @@
+ #withoutopenssl not currently supported
+ #if [ -z "$withoutopenssl" ]; then
+     # Find OpenSSL installation if available
+-    ssldirs="$extrassldir /usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
++
++#ssldirs="$extrassldir /usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
++
++ssldirs="$extrassldir"
+     
+     for dir in $ssldirs; do
+     	if [ -f $dir/include/openssl/rc4.h ]; then
+@@ -259,22 +268,27 @@
+ 
+ # Check for OSS sound support
+ 
+-if [ -f /usr/include/sys/soundcard.h ]; then
+-    echo Sound support enabled: Open Sound System
+-    echo
+-    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
+-    cflags="$cflags -DWITH_RDPSND"
+-elif [ -f /usr/include/sys/audioio.h ]; then
+-    echo Sound support enabled: Sun/BSD
+-    echo
+-    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
+-    cflags="$cflags -DWITH_RDPSND"
+-else
+-    echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
+-    echo "Currently supported systems are Open Sound System and Sun"
+-    echo
++if [ -z "$withoss" ]; then
++	if [ -f /usr/include/sys/soundcard.h ]; then
++		withoss=yes
++	elif [ -f /usr/include/sys/audioio.h ]; then
++    		echo Sound support enabled: Sun/BSD
++    		echo
++    		echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
++    		cflags="$cflags -DWITH_RDPSND"
++	else
++    		echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
++    		echo "Currently supported systems are Open Sound System and Sun"
++    		echo
++	fi
+ fi
+ 
++if [ ! -z "$withoss" ]; then	
++	echo Sound support enabled: Open Sound System
++    	echo
++    	echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
++    	cflags="$cflags -DWITH_RDPSND"
++fi
+ 
+ # Platform-specific options
+ 
+@@ -294,8 +308,8 @@
+ esac
+ 
+ 
+-echo "CFLAGS      = $cflags" >>Makeconf
+-echo "LDFLAGS     = $ldflags" >>Makeconf
++echo "LCFLAGS      = $cflags" >>Makeconf
++echo "LLDFLAGS     = $ldflags" >>Makeconf
+ echo "TARGETS     = $targets" >>Makeconf
+ 
+ echo "configure complete - now run make"
+--- rdesktop-1.3.1/Makefile	2004-01-21 20:26:01.000000000 -0700
++++ rdesktop-1.3.1.new/Makefile	2004-05-25 11:16:59.338784960 -0700
+@@ -25,22 +25,22 @@
+ all: $(TARGETS)
+ 
+ rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
+-	$(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) -lX11
++	$(CC) $(CFLAGS) $(LCFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LLDFLAGS) -lX11 
+ 
+ rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
+-	$(CCLD) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LDVNC)
++	$(CCLD) $(CFLAGS) $(LCFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LLDFLAGS) $(LDVNC)
+ 
+ vnc/rdp2vnc.o: rdesktop.c
+-	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
++	$(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
+ 
+ vnc/vnc.o: vnc/vnc.c
+-	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
++	$(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
+ 
+ vnc/xkeymap.o: xkeymap.c
+-	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/xkeymap.o -c xkeymap.c
++	$(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -DRDP2VNC -o vnc/xkeymap.o -c xkeymap.c
+ 
+ vnc/x11stubs.o: vnc/x11stubs.c
+-	$(CC) $(CFLAGS) $(VNCINC) -o vnc/x11stubs.o -c vnc/x11stubs.c
++	$(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -o vnc/x11stubs.o -c vnc/x11stubs.c
+ 
+ Makeconf:
+ 	./configure
+@@ -106,5 +106,5 @@
+ .SUFFIXES: .c .o
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(LCFLAGS) -o $@ -c $<
+ 
diff --git a/recipes/rdesktop/rdesktop-1.4.1/strip.patch b/recipes/rdesktop/rdesktop-1.4.1/strip.patch
new file mode 100644
index 0000000000..6977b990aa
--- /dev/null
+++ b/recipes/rdesktop/rdesktop-1.4.1/strip.patch
@@ -0,0 +1,30 @@
+--- rdesktop/configure.ac	2005-06-06 15:14:45.000000000 +0100
++++ rdesktop/configure.ac-new	2005-12-11 16:48:35.000000000 +0000
+@@ -23,6 +23,8 @@
+ AC_CHECK_HEADER(locale.h, AC_DEFINE(HAVE_LOCALE_H))
+ AC_CHECK_HEADER(langinfo.h, AC_DEFINE(HAVE_LANGINFO_H))
+ 
++AC_CHECK_TOOL(STRIP, strip, :)
++
+ rpath=""
+ 
+ #
+--- rdesktop/Makefile.in	2005-08-25 21:39:58.000000000 +0100
++++ rdesktop/Makefile.in-new	2005-12-11 16:50:04.000000000 +0000
+@@ -17,6 +17,7 @@
+ INSTALL     = @INSTALL@
+ CFLAGS      = @CFLAGS@ @X_CFLAGS@ @DEFS@ -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
+ LDFLAGS     = @LDFLAGS@ @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++STRIP       = @STRIP@
+ 
+ TARGETS     = rdesktop @RDP2VNCTARGET@
+ VNCINC      = @VNCINC@
+@@ -56,7 +57,7 @@
+ installbin: rdesktop
+ 	mkdir -p $(DESTDIR)$(bindir)
+ 	$(INSTALL) rdesktop $(DESTDIR)$(bindir)
+-	strip $(DESTDIR)$(bindir)/rdesktop
++	$(STRIP) $(DESTDIR)$(bindir)/rdesktop
+ 	chmod 755 $(DESTDIR)$(bindir)/rdesktop
+ 
+ .PHONY: installman
diff --git a/recipes/rdesktop/rdesktop.inc b/recipes/rdesktop/rdesktop.inc
new file mode 100644
index 0000000000..4c832cae3f
--- /dev/null
+++ b/recipes/rdesktop/rdesktop.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+HOMEPAGE = "http://www.rdesktop.org"
+DEPENDS = "virtual/libx11 openssl"
+SECTION = "x11/network"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
diff --git a/recipes/rdesktop/rdesktop_1.3.1.bb b/recipes/rdesktop/rdesktop_1.3.1.bb
new file mode 100644
index 0000000000..d50a0c1e8c
--- /dev/null
+++ b/recipes/rdesktop/rdesktop_1.3.1.bb
@@ -0,0 +1,27 @@
+require rdesktop.inc
+
+SRC_URI +="file://configure.patch;patch=1"
+
+# Note - rdesktop 1.3.1 doesn't use autotools - don't make the same
+# mistakes I did.. :)
+
+do_configure() {
+	${S}/configure \
+	--prefix=${prefix} \
+	--exec-prefix=${exec_prefix} \
+	--bindir=${bindir} \
+	--mandir=${mandir} \
+	--sharedir=${datadir} \
+	--with-x=${STAGING_EXECPREFIXDIR} \
+	--with-openssl=${STAGING_EXECPREFIXDIR} \
+	--with-oss \
+	--without-debug
+}
+
+do_compile() {
+	oe_runmake 'KEYMAP_PATH=${datadir}/keymaps/'
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} install
+}
diff --git a/recipes/rdesktop/rdesktop_1.4.1.bb b/recipes/rdesktop/rdesktop_1.4.1.bb
new file mode 100644
index 0000000000..8682c8ee98
--- /dev/null
+++ b/recipes/rdesktop/rdesktop_1.4.1.bb
@@ -0,0 +1,9 @@
+require rdesktop.inc
+
+PR = "r1"
+
+SRC_URI += "file://strip.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/recipes/rdesktop/rdesktop_1.5.0.bb b/recipes/rdesktop/rdesktop_1.5.0.bb
new file mode 100644
index 0000000000..d652dfe633
--- /dev/null
+++ b/recipes/rdesktop/rdesktop_1.5.0.bb
@@ -0,0 +1,7 @@
+require rdesktop.inc
+
+PR = "r0"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/recipes/rdesktop/rdesktop_1.6.0.bb b/recipes/rdesktop/rdesktop_1.6.0.bb
new file mode 100644
index 0000000000..d652dfe633
--- /dev/null
+++ b/recipes/rdesktop/rdesktop_1.6.0.bb
@@ -0,0 +1,7 @@
+require rdesktop.inc
+
+PR = "r0"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/recipes/rdesktop/rdesktop_cvs.bb b/recipes/rdesktop/rdesktop_cvs.bb
new file mode 100644
index 0000000000..0b76ee7535
--- /dev/null
+++ b/recipes/rdesktop/rdesktop_cvs.bb
@@ -0,0 +1,12 @@
+require rdesktop.inc
+
+PV = "1.6.0+cvs${SRCDATE}"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
+S = "${WORKDIR}/rdesktop"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+