6 files changed, 37 insertions, 42 deletions
diff --git a/packages/xtscal/xtscal.inc b/packages/xtscal/xtscal.inc
new file mode 100644
index 0000000000..220c262a9f
--- /dev/null
+++ b/packages/xtscal/xtscal.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Touchscreen calibration utility"
+SECTION = "x11/base"
+LICENSE = "GPL"
+DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
+
+SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/packages/xtscal/xtscal/xtscal-cxk.patch b/packages/xtscal/xtscal/xtscal-cxk.patch
index 1cab8efb57..fbca56abd7 100644
--- a/packages/xtscal/xtscal/xtscal-cxk.patch
+++ b/packages/xtscal/xtscal/xtscal-cxk.patch
@@ -1,11 +1,25 @@
---- xtscal-0.6.3/xtscal.in~	2004-09-10 12:10:36.000000000 -0700
-+++ xtscal-0.6.3/xtscal.in	2005-08-04 09:26:46.000000000 -0700
-@@ -8,7 +8,7 @@
+--- xtscal-0.6.3/xtscal.in~	
++++ xtscal-0.6.3/xtscal.in
+@@ -1,16 +1,15 @@
+ #!/bin/sh
+ 
+ module_id() {
+-    # Get model name
+-    echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z`
++        awk 'BEGIN { FS=": " } /Hardware/ { print $2 }' </proc/cpuinfo | tr a-z A-Z
+ }
+ 
  case `module_id` in
- 	"HP IPAQ H3100" | "HP IPAQ H3800" )
- 		ARGS="-rotate 90" ;;
+-	"HP IPAQ H3100" | "HP IPAQ H3800" )
+-		ARGS="-rotate 90" ;;
 -	"HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE)
-+	"HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE | *SPITZ | *AKITA | *BORZOI)
- 		ARGS="-rotate 270" ;;
- 	# H2200: works without rotation
+-		ARGS="-rotate 270" ;;
+-	# H2200: works without rotation
++       "HP IPAQ H3100" | "HP IPAQ H3800" )
++               ARGS="-rotate 90" ;;
++       "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | "HTC UNIVERSAL" | *COLLIE | *POODLE | *SPITZ | *AKITA | *BORZOI)
++               ARGS="-rotate 270" ;;
++       # H2200: works without rotation
  esac
+ 
+ # the things we do for autoconf
diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb
index 60ad48eaa3..20e11bd54e 100644
--- a/packages/xtscal/xtscal_0.4.bb
+++ b/packages/xtscal/xtscal_0.4.bb
@@ -1,8 +1 @@
-DESCRIPTION = "Touchscreen calibration utility"
-SECTION = "x11/base"
-LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxft libxrandr"
-
-SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
-
-inherit autotools
+require xtscal.inc
diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb
index 33dcfe1d80..ac9fcffab7 100644
--- a/packages/xtscal/xtscal_0.5.1.bb
+++ b/packages/xtscal/xtscal_0.5.1.bb
@@ -1,11 +1,5 @@
-DESCRIPTION = "Touchscreen calibration utility"
-SECTION = "x11/base"
-LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
+require xtscal.inc
 
 PR = "r1"
 
-SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
-	   file://xtscal-poodle.patch;patch=1"
-
-inherit autotools
+SRC_URI += "file://xtscal-poodle.patch;patch=1"
diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb
index 220c262a9f..20e11bd54e 100644
--- a/packages/xtscal/xtscal_0.5.bb
+++ b/packages/xtscal/xtscal_0.5.bb
@@ -1,8 +1 @@
-DESCRIPTION = "Touchscreen calibration utility"
-SECTION = "x11/base"
-LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
-
-SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
-
-inherit autotools
+require xtscal.inc
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index 443b487065..c19fcaf93d 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/packages/xtscal/xtscal_0.6.3.bb
@@ -1,12 +1,5 @@
-LICENSE = "GPL"
-DESCRIPTION = "Touchscreen calibration utility"
-SECTION = "x11/base"
+require xtscal.inc
 
-DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
+PR = "r5"
 
-PR = "r1"
-
-SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
-           file://xtscal-cxk.patch;patch=1"
-
-inherit autotools
+SRC_URI += "file://xtscal-cxk.patch;patch=1"