xorg-font-common: use BPN instead of XORG_PN

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Conflicts:
	recipes/xorg-font/xorg-font-common.inc

diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc
index 0fc2e8f..e82f2f5 100644 (file)
--- a/recipes/xorg-font/xorg-font-common.inc
+++ b/recipes/xorg-font/xorg-font-common.inc
@@ -5,11 +5,10 @@ LICENSE = "MIT-X"
 DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
 RDEPENDS = "encodings font-util font-alias"
 
-XORG_PN = "${PN}"
-INC_PR = "r1"
+INC_PR = "r2"
 
-SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2;name=archive"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+SRC_URI = "${XORG_MIRROR}/individual/font/${BPN}-${PV}.tar.bz2;name=archive"
+S = "${WORKDIR}/${BPN}-${PV}"
 
 inherit autotools pkgconfig