consolidate x86/x86_64 support

use hardware profiles, instead of extra target dirs.
fix dependencies.

8 files changed, 7 insertions, 9 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 474821f88..12692b86b 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -22,7 +22,7 @@ PKGSD_GLXGEARS:=	Nice little OpenGL demo application
 PKGSC_GLXGEARS:=	x11/apps
 
 PKG_HOST_DEPENDS:=	!cygwin !darwin
-PKG_TARGET_DEPENDS:=	ibmx40 lemote
+PKG_TARGET_DEPENDS:=	x86 lemote
 
 WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 853f3e4ce..f98b709ba 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -16,7 +16,7 @@ PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 
 PKG_HOST_DEPENDS:=	!cygwin
-PKG_TARGET_DEPENDS:=	ibmx40 lemote
+PKG_TARGET_DEPENDS:=	x86 lemote
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 163d740f6..98ac0c41e 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 
-PKG_TARGET_DEPENDS:=	alix x86_qemu x86_64_qemu shuttle ibmx40 lemote
+PKG_TARGET_DEPENDS:=	alix x86 x86_64 lemote
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin !darwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index d35ca0e97..37a426eee 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://www.fltk.org/
 PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
 
 PKG_SUBPKGS:=		LIBFLTK
-PKG_TARGET_DEPENDS:=	ibmx40 lemote
+PKG_TARGET_DEPENDS:=	x86 lemote
 PKG_HOST_DEPENDS:=	!cygwin !darwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index b4ba58a16..bfd13aa2c 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
 PKG_HOST_DEPENDS:=	!cygwin !darwin
-PKG_TARGET_DEPENDS:=	ibmx40 lemote
+PKG_TARGET_DEPENDS:=	x86 lemote
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 32682603f..92f74109e 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://www.libvirt.org/
 PKG_SITES:=		ftp://libvirt.org/libvirt/
 
 PKG_HOST_DEPENDS:=	!freebsd !netbsd !openbsd
-PKG_TARGET_DEPENDS:=	shuttle
+PKG_TARGET_DEPENDS:=	x86 x86_64
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 62b3cdbc1..3da200fa0 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -18,7 +18,7 @@ PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_HOST_DEPENDS:=	!darwin
-PKG_TARGET_DEPENDS:=	alix x86_qemu x86_64_qemu shuttle lemote
+PKG_TARGET_DEPENDS:=	alix x86 x86_64 lemote
 
 PKG_FLAVOURS:=		WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index 50e4d30db..fc634f708 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server libdrm
 PKG_BUILDDEP:=		xorg-server libdrm
 PKG_SITES:=		http://www.x.org/releases/X11R7.5/src/driver/
 
-PKG_TARGET_DEPENDS:=	ibmx40
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_INTEL,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))