From 7a69d9fbf43f30ff2906614f0582814714f8e5e4 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 20 Nov 2006 15:41:34 +0000
Subject: another set of parse errors fixing

---
 packages/perl/perl_5.8.7.bb                                  | 2 +-
 packages/portabase/portabase_1.9.bb                          | 2 +-
 packages/powermanga/powermanga_0.79.bb                       | 2 +-
 packages/ppp/ppp_2.4.1.bb                                    | 2 +-
 packages/prboom/prboom_2.3.1.bb                              | 2 +-
 packages/pvrusb2-mci/pvrusb2-mci_20050921.bb                 | 8 ++++----
 packages/pvrusb2-mci/pvrusb2-mci_20060903.bb                 | 6 +++---
 packages/pwlib/pwlib_1.5.2.bb                                | 2 +-
 packages/pwlib/pwlib_1.6.6.4.bb                              | 2 +-
 packages/python/python-native_2.4.0.bb                       | 4 ++--
 packages/python/python-numarray_1.1.1.bb                     | 2 +-
 packages/qpf-fonts/terminus.bb                               | 2 +-
 packages/qplot/qplot_2.0.1+cvs20020420.bb                    | 2 +-
 packages/redfang/redfang.bb                                  | 2 +-
 packages/rxvt/rxvt_2.7.9.bb                                  | 4 ++--
 packages/rxvt/rxvt_2.8.0.bb                                  | 4 ++--
 packages/samba/samba-essential_3.0.20.bb                     | 8 ++++----
 packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb | 2 +-
 packages/socat/socat_1.3.2.1.bb                              | 2 +-
 packages/subversion/subversion_1.3.1.bb                      | 2 +-
 packages/subversion/subversion_1.4.0.bb                      | 2 +-
 21 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'packages')

diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 9e6fa12b58..a7095433a3 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -75,7 +75,7 @@ do_install_append() {
 
 # Create a perl-modules package recommending all the other perl
 # packages (actually the non modules packages and not created too)
-ALLOW_EMPTY_perl-modules = 1
+ALLOW_EMPTY_perl-modules = "1"
 PACKAGES_append = " perl-modules"
 RRECOMMENDS_perl-modules = "${PACKAGES}"
 RPROVIDES_perl-lib = "perl-lib"
diff --git a/packages/portabase/portabase_1.9.bb b/packages/portabase/portabase_1.9.bb
index 394c99f2b5..4ba5108a31 100644
--- a/packages/portabase/portabase_1.9.bb
+++ b/packages/portabase/portabase_1.9.bb
@@ -22,7 +22,7 @@ do_configure_prepend() {
 }
 
 QMAKE_PROFILES = "portabase.pro"
-QPEDIR = ${OPIEDIR}
+QPEDIR = "${OPIEDIR}"
 EXTRA_QMAKEVARS_POST += "CONFIG-=desktop"
 
 # lrelease portabase.pro
diff --git a/packages/powermanga/powermanga_0.79.bb b/packages/powermanga/powermanga_0.79.bb
index 194f245e3a..875690b06b 100644
--- a/packages/powermanga/powermanga_0.79.bb
+++ b/packages/powermanga/powermanga_0.79.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://linux.tlk.fr/games/Powermanga/download/powermanga-0.79.tgz \
 	   file://powermanga.png \
 	   file://powermanga.desktop"
 
-S = ${WORKDIR}/${PN}-${PV}/
+S = "${WORKDIR}/${PN}-${PV}/"
 
 inherit palmtop
 
diff --git a/packages/ppp/ppp_2.4.1.bb b/packages/ppp/ppp_2.4.1.bb
index 7fde334302..2c07c41a49 100644
--- a/packages/ppp/ppp_2.4.1.bb
+++ b/packages/ppp/ppp_2.4.1.bb
@@ -22,7 +22,7 @@ SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
 inherit autotools
 
 EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
-EXTRA_OECONF = --disable-strip
+EXTRA_OECONF = "--disable-strip"
 
 do_install_append () {
 	install -d ${D}${bindir}/ ${D}${sysconfdir}/init.d
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index 043a6e9c30..c14e733656 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 # This version can be started w/ -height 240 but it
 # a) doesn't load doom1.wad (crash)
 # b) crahes a few seconds after starting w/ doom2.wad
-DEFAULT_PREFERENCE = -1
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
            file://m4.patch;patch=1 \
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
index d1b51579c6..009bf45be2 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
@@ -3,11 +3,11 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
 PR = "r0"
-RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400
+RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400"
 # It in fact also requires kernel-module-saa7115", but for now is using the local ones.
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-20050921/driver"
 
@@ -19,7 +19,7 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 do_install() {   
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
index 5ad1f4f16b..c6e8c6d1c5 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
-AUTHOR = Mike Isely
+AUTHOR = "Mike Isely"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
@@ -18,7 +18,7 @@ PR = "r0"
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
            file://hotplug.functions \
            file://firmware.hotplug \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -34,7 +34,7 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
diff --git a/packages/pwlib/pwlib_1.5.2.bb b/packages/pwlib/pwlib_1.5.2.bb
index 85fe0b1f3c..a4ced1f35c 100644
--- a/packages/pwlib/pwlib_1.5.2.bb
+++ b/packages/pwlib/pwlib_1.5.2.bb
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}"
 
 # Use openSSL
 
-export OPENSSLFLAG=1
+export OPENSSLFLAG="1"
 export OPENSSLDIR="${STAGING_LIBDIR}"
 export OPENSSLLIBS="-lssl -lcrypt"
 export MACHTYPE="x86"
diff --git a/packages/pwlib/pwlib_1.6.6.4.bb b/packages/pwlib/pwlib_1.6.6.4.bb
index aa81aa24c5..efb88b35ee 100644
--- a/packages/pwlib/pwlib_1.6.6.4.bb
+++ b/packages/pwlib/pwlib_1.6.6.4.bb
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}"
 
 # Use openSSL
 
-export OPENSSLFLAG=1
+export OPENSSLFLAG="1"
 export OPENSSLDIR="${STAGING_LIBDIR}"
 export OPENSSLLIBS="-lssl -lcrypt"
 export MACHTYPE="x86"
diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb
index ff4fb14b37..5e948965ad 100644
--- a/packages/python/python-native_2.4.0.bb
+++ b/packages/python/python-native_2.4.0.bb
@@ -16,8 +16,8 @@ S = "${WORKDIR}/Python-2.4"
 
 inherit autotools native
 
-prefix = ${STAGING_DIR}/${BUILD_SYS}
-exec_prefix = ${STAGING_DIR}/${BUILD_SYS}
+prefix = "${STAGING_DIR}/${BUILD_SYS}"
+exec_prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
 EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
                 --without-cxx --with-signal-module --with-wctype-functions"
diff --git a/packages/python/python-numarray_1.1.1.bb b/packages/python/python-numarray_1.1.1.bb
index c1b9340e3c..4bc084c68a 100644
--- a/packages/python/python-numarray_1.1.1.bb
+++ b/packages/python/python-numarray_1.1.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "PYRAF"
 SRCNAME = "numarray"
 
-SRC_URI = ${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/qpf-fonts/terminus.bb b/packages/qpf-fonts/terminus.bb
index 102759e8b9..23c00e1ac2 100644
--- a/packages/qpf-fonts/terminus.bb
+++ b/packages/qpf-fonts/terminus.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "all"
 PR = "r2"
 
 SRC_URI = "http://www.mn-solutions.de/downloads/mnci/terminus-fonts.tar.bz2"
-S = ${WORKDIR}/terminus-fonts
+S = "${WORKDIR}/terminus-fonts"
 
 do_install() {
 	mkdir -p ${D}${palmqtdir}/lib/fonts
diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb
index ba556e7cc0..515eefaafc 100644
--- a/packages/qplot/qplot_2.0.1+cvs20020420.bb
+++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://qplot.sourceforge.net/"
-SRCDATE = 20020420
+SRCDATE = "20020420"
 #Change to form x.y.z+cvs${SRCDATE} when 2.0.1 changes in PV
 PV = "2.0.1-cvs-${SRCDATE}"
 PR = "r1"
diff --git a/packages/redfang/redfang.bb b/packages/redfang/redfang.bb
index ed1c4c270a..09349ad79e 100644
--- a/packages/redfang/redfang.bb
+++ b/packages/redfang/redfang.bb
@@ -1,5 +1,5 @@
 SECTION = "unknown"
-SRC_URI = "http://packetstormsecurity.org/wireless/redfang.2.5.tar.gz \ 
+SRC_URI = "http://packetstormsecurity.org/wireless/redfang.2.5.tar.gz \
     	   file://Makefile.patch;patch=1;pnum=0"
 
 DEFAULT_PREFERENCE="-1"
diff --git a/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb
index 5a66d04f9d..1d6d586f2a 100644
--- a/packages/rxvt/rxvt_2.7.9.bb
+++ b/packages/rxvt/rxvt_2.7.9.bb
@@ -11,7 +11,7 @@ inherit autotools update-alternatives
 ALTERNATIVE_NAME = "x-terminal-emulator"
 ALTERNATIVE_PATH = "${bindir}/rxvt-2.7.9"
 
-S = ${WORKDIR}/rxvt
+S = "${WORKDIR}/rxvt"
 
 EXTRA_OECONF = "--disable-menubar --disable-xim \
 		--enable-utmp --enable-wtmp --enable-lastlog \
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-menubar --disable-xim \
 		--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 -lXft'"
 
diff --git a/packages/rxvt/rxvt_2.8.0.bb b/packages/rxvt/rxvt_2.8.0.bb
index 9e4870022f..92bb2dcbf5 100644
--- a/packages/rxvt/rxvt_2.8.0.bb
+++ b/packages/rxvt/rxvt_2.8.0.bb
@@ -11,7 +11,7 @@ inherit autotools update-alternatives
 ALTERNATIVE_NAME = "x-terminal-emulator"
 ALTERNATIVE_PATH = "${bindir}/rxvt-2.8.0"
 
-S = ${WORKDIR}/rxvt
+S = "${WORKDIR}/rxvt"
 
 EXTRA_OECONF = "--disable-menubar --disable-xim \
 		--enable-utmp --enable-wtmp --enable-lastlog \
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-menubar --disable-xim \
 		--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 -lXft'"
 
diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
index 40417c717e..bbe11e9b11 100644
--- a/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -7,12 +7,12 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://init-essential \
            file://quota.patch;patch=1;pnum=0 \
 	   file://smb-essential.conf \
-	   file://smb-essential-inactive.conf \	   
+	   file://smb-essential-inactive.conf \
 	   file://Managing-Samba.txt"
-	   
+
 S := "${WORKDIR}/samba-${PV}/source"
 
-RCONFILCTS = samba
+RCONFLICTS = "samba"
 
 require samba-essential.inc
 inherit update-rc.d
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index 50227ce9ed..270cd0fbf8 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Precompiled SharpROM toolchain glue package"
 LICENSE = "GPL"
 SECTION = "base"
 PROVIDES_sharprom-compatible = "\
-  virtual/arm-linux-gcc-2.95 \      
+  virtual/arm-linux-gcc-2.95 \
   virtual/arm-linux-libc-for-gcc \
   virtual/arm-linux-binutils \
   virtual/libc \
diff --git a/packages/socat/socat_1.3.2.1.bb b/packages/socat/socat_1.3.2.1.bb
index ecbf5a56aa..612987858b 100644
--- a/packages/socat/socat_1.3.2.1.bb
+++ b/packages/socat/socat_1.3.2.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
-           file://xioopen.patch;patch=1 \ 
+           file://xioopen.patch;patch=1 \
            file://ldflags.patch;patch=1 \
            file://xioinitialize.patch;patch=1"
 
diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb
index fb9ecf4d45..8a5b18e109 100644
--- a/packages/subversion/subversion_1.3.1.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://apr-regex.patch;patch=1"
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
-                --without-berkeley-db --without-apxs --without-apache \ 
+                --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR} \
                 --with-apr-util=${STAGING_BINDIR}"
 
diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb
index 26fc1ff4a7..be55366fd0 100644
--- a/packages/subversion/subversion_1.4.0.bb
+++ b/packages/subversion/subversion_1.4.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1"
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
-                --without-berkeley-db --without-apxs --without-apache \ 
+                --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR} \
                 --with-apr-util=${STAGING_BINDIR}"
 
-- 
cgit 1.2.3-korg