5 files changed, 123 insertions, 148 deletions

diff --git a/x11/linux-c6-pixman/Makefile b/x11/linux-c6-pixman/Makefile
index f9f2947ad362..9fcdec9e3087 100644
--- a/x11/linux-c6-pixman/Makefile
+++ b/x11/linux-c6-pixman/Makefile
@@ -7,10 +7,9 @@ CATEGORIES=	x11 linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Low-level pixel manipulation library (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	amd64 i386
 RPMVERSION=	1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-USE_LINUX=	c6
 USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/x11/linux-c6-xorg-libs/Makefile b/x11/linux-c6-xorg-libs/Makefile
index f966feb0ad9c..a369d018bb65 100644
--- a/x11/linux-c6-xorg-libs/Makefile
+++ b/x11/linux-c6-xorg-libs/Makefile
@@ -5,44 +5,40 @@ PORTNAME=	xorg-libs
 PORTVERSION=	7.4
 PORTREVISION=	5
 CATEGORIES=	x11 linux
-MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
-DISTFILES:=	#hack
-LIB_DISTFILES=	libICE-1.0.6-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libSM-1.2.1-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libX11-1.6.3-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXScrnSaver-1.2.2-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXau-1.0.6-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXaw-1.0.11-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXcomposite-0.4.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXcursor-1.1.14-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXdamage-1.1.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXdmcp-1.1.1-3.el6.${LINUX_RPM_ARCH}.rpm \
-		libXevie-1.0.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXext-1.3.3-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXfixes-5.0.1-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXfont-1.5.1-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXft-2.3.2-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXi-1.7.4-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXinerama-1.1.3-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXmu-1.1.1-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXp-1.0.2-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXpm-3.5.10-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXrandr-1.4.2-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXrender-0.9.8-2.1.el6_8.1.${LINUX_RPM_ARCH}.rpm \
-		libXres-1.0.7-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXt-1.1.4-6.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXtst-1.2.2-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXv-1.0.9-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXvMC-1.0.8-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXxf86dga-1.1.4-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXxf86misc-1.0.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXxf86vm-1.1.3-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libfontenc-1.1.2-3.el6.${LINUX_RPM_ARCH}.rpm \
-		libxcb-1.11-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libxkbfile-1.0.6-1.1.el6.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGLw-6.5.1-10.el6.${LINUX_RPM_ARCH}.rpm
-
-.if defined(PACKAGE_BUILDING)
+LIB_DISTFILES=	libICE-1.0.6-1.el6${EXTRACT_SUFX} \
+		libSM-1.2.1-2.el6${EXTRACT_SUFX} \
+		libX11-1.6.3-2.el6${EXTRACT_SUFX} \
+		libXScrnSaver-1.2.2-2.el6${EXTRACT_SUFX} \
+		libXau-1.0.6-4.el6${EXTRACT_SUFX} \
+		libXaw-1.0.11-2.el6${EXTRACT_SUFX} \
+		libXcomposite-0.4.3-4.el6${EXTRACT_SUFX} \
+		libXcursor-1.1.14-2.1.el6${EXTRACT_SUFX} \
+		libXdamage-1.1.3-4.el6${EXTRACT_SUFX} \
+		libXdmcp-1.1.1-3.el6${EXTRACT_SUFX} \
+		libXevie-1.0.3-4.el6${EXTRACT_SUFX} \
+		libXext-1.3.3-1.el6${EXTRACT_SUFX} \
+		libXfixes-5.0.1-2.1.el6${EXTRACT_SUFX} \
+		libXfont-1.5.1-2.el6${EXTRACT_SUFX} \
+		libXft-2.3.2-1.el6${EXTRACT_SUFX} \
+		libXi-1.7.4-1.el6${EXTRACT_SUFX} \
+		libXinerama-1.1.3-2.1.el6${EXTRACT_SUFX} \
+		libXmu-1.1.1-2.el6${EXTRACT_SUFX} \
+		libXp-1.0.2-2.1.el6${EXTRACT_SUFX} \
+		libXpm-3.5.10-2.el6${EXTRACT_SUFX} \
+		libXrandr-1.4.2-1.el6${EXTRACT_SUFX} \
+		libXrender-0.9.8-2.1.el6_8.1${EXTRACT_SUFX} \
+		libXres-1.0.7-2.1.el6${EXTRACT_SUFX} \
+		libXt-1.1.4-6.1.el6${EXTRACT_SUFX} \
+		libXtst-1.2.2-2.1.el6${EXTRACT_SUFX} \
+		libXv-1.0.9-2.1.el6${EXTRACT_SUFX} \
+		libXvMC-1.0.8-2.1.el6${EXTRACT_SUFX} \
+		libXxf86dga-1.1.4-2.1.el6${EXTRACT_SUFX} \
+		libXxf86misc-1.0.3-4.el6${EXTRACT_SUFX} \
+		libXxf86vm-1.1.3-2.1.el6${EXTRACT_SUFX} \
+		libfontenc-1.1.2-3.el6${EXTRACT_SUFX} \
+		libxcb-1.11-2.el6${EXTRACT_SUFX} \
+		libxkbfile-1.0.6-1.1.el6${EXTRACT_SUFX} \
+		mesa-libGLw-6.5.1-10.el6${EXTRACT_SUFX}
 SRC_DISTFILES=	libICE-1.0.6-1.el6.src.rpm:SOURCE \
 		libSM-1.2.1-2.el6.src.rpm:SOURCE \
 		libX11-1.6.3-2.el6.src.rpm:SOURCE \
@@ -77,20 +73,15 @@ SRC_DISTFILES=	libICE-1.0.6-1.el6.src.rpm:SOURCE \
 		libxcb-1.11-2.el6.src.rpm:SOURCE \
 		libxkbfile-1.0.6-1.1.el6.src.rpm:SOURCE \
 		mesa-libGLw-6.5.1-10.el6.src.rpm:SOURCE
-.endif
-
-MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=		linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]* linux-f10-xorg-libs-[0-9]*
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_APPS=		fontconfig
-USE_LINUX_RPM=		yes
-USE_LDCONFIG=		yes
+CONFLICTS=	linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]* linux-f10-xorg-libs-[0-9]*
 
-#post-install:
-#	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
-#	@${INSTALL_DATA} ${FILESDIR}/xorg-x11-i386.conf ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
+USES=		linux:c6
+USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile
index f2a782e231ac..955221441598 100644
--- a/x11/linux-f10-xorg-libs/Makefile
+++ b/x11/linux-f10-xorg-libs/Makefile
@@ -3,101 +3,89 @@
 
 PORTNAME=	xorg-libs
 PORTVERSION=	7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
+BIN_DISTFILES=	libICE-1.0.4-4.fc10${EXTRACT_SUFX} \
+		libFS-1.0.1-2.fc10${EXTRACT_SUFX} \
+		libSM-1.1.0-2.fc10${EXTRACT_SUFX} \
+		libX11-1.1.5-4.fc10${EXTRACT_SUFX} \
+		libXScrnSaver-1.1.3-1.fc10${EXTRACT_SUFX} \
+		libXTrap-1.0.0-6.fc10${EXTRACT_SUFX} \
+		libXau-1.0.4-1.fc10${EXTRACT_SUFX} \
+		libXaw-1.0.4-3.fc10${EXTRACT_SUFX} \
+		libXcomposite-0.4.0-5.fc10${EXTRACT_SUFX} \
+		libXcursor-1.1.9-3.fc10${EXTRACT_SUFX} \
+		libXdamage-1.1.1-4.fc9${EXTRACT_SUFX} \
+		libXdmcp-1.0.2-6.fc10${EXTRACT_SUFX} \
+		libXevie-1.0.2-4.fc10${EXTRACT_SUFX} \
+		libXext-1.0.4-1.fc9${EXTRACT_SUFX} \
+		libXfixes-4.0.3-4.fc10${EXTRACT_SUFX} \
+		libXfont-1.3.3-1.fc10${EXTRACT_SUFX} \
+		libXft-2.1.13-1.fc10${EXTRACT_SUFX} \
+		libXi-1.1.3-4.fc9${EXTRACT_SUFX} \
+		libXinerama-1.0.3-2.fc10${EXTRACT_SUFX} \
+		libXmu-1.0.4-1.fc9${EXTRACT_SUFX} \
+		libXp-1.0.0-11.fc9${EXTRACT_SUFX} \
+		libXpm-3.5.7-4.fc9${EXTRACT_SUFX} \
+		libXrandr-1.2.3-1.fc10${EXTRACT_SUFX} \
+		libXrender-0.9.4-3.fc9${EXTRACT_SUFX} \
+		libXres-1.0.3-5.fc10${EXTRACT_SUFX} \
+		libXt-1.0.5-1.fc10${EXTRACT_SUFX} \
+		libXtst-1.0.3-3.fc9${EXTRACT_SUFX} \
+		libXv-1.0.4-1.fc10${EXTRACT_SUFX} \
+		libXvMC-1.0.4-5.fc10${EXTRACT_SUFX} \
+		libXxf86dga-1.0.2-3.fc10${EXTRACT_SUFX} \
+		libXxf86misc-1.0.1-6.fc10${EXTRACT_SUFX} \
+		libXxf86vm-1.0.2-1.fc10${EXTRACT_SUFX} \
+		libfontenc-1.0.4-6.fc10${EXTRACT_SUFX} \
+		libxcb-1.1.91-5.fc10${EXTRACT_SUFX} \
+		libxkbfile-1.0.4-5.fc9${EXTRACT_SUFX} \
+		mesa-libGLw-6.5.1-5.fc9${EXTRACT_SUFX}
+SRC_DISTFILES=	libICE-1.0.4-4.fc10.src.rpm:SOURCE \
+		libFS-1.0.1-2.fc10.src.rpm:SOURCE \
+		libSM-1.1.0-2.fc10.src.rpm:SOURCE \
+		libX11-1.1.5-4.fc10.src.rpm:SOURCE \
+		libXScrnSaver-1.1.3-1.fc10.src.rpm:SOURCE \
+		libXTrap-1.0.0-6.fc10.src.rpm:SOURCE \
+		libXau-1.0.4-1.fc10.src.rpm:SOURCE \
+		libXaw-1.0.4-3.fc10.src.rpm:SOURCE \
+		libXcomposite-0.4.0-5.fc10.src.rpm:SOURCE \
+		libXcursor-1.1.9-3.fc10.src.rpm:SOURCE \
+		libXdamage-1.1.1-4.fc9.src.rpm:SOURCE \
+		libXdmcp-1.0.2-6.fc10.src.rpm:SOURCE \
+		libXevie-1.0.2-4.fc10.src.rpm:SOURCE \
+		libXext-1.0.4-1.fc9.src.rpm:SOURCE \
+		libXfixes-4.0.3-4.fc10.src.rpm:SOURCE \
+		libXfont-1.3.3-1.fc10.src.rpm:SOURCE \
+		libXft-2.1.13-1.fc10.src.rpm:SOURCE \
+		libXi-1.1.3-4.fc9.src.rpm:SOURCE \
+		libXinerama-1.0.3-2.fc10.src.rpm:SOURCE \
+		libXmu-1.0.4-1.fc9.src.rpm:SOURCE \
+		libXp-1.0.0-11.fc9.src.rpm:SOURCE \
+		libXpm-3.5.7-4.fc9.src.rpm:SOURCE \
+		libXrandr-1.2.3-1.fc10.src.rpm:SOURCE \
+		libXrender-0.9.4-3.fc9.src.rpm:SOURCE \
+		libXres-1.0.3-5.fc10.src.rpm:SOURCE \
+		libXt-1.0.5-1.fc10.src.rpm:SOURCE \
+		libXtst-1.0.3-3.fc9.src.rpm:SOURCE \
+		libXv-1.0.4-1.fc10.src.rpm:SOURCE \
+		libXvMC-1.0.4-5.fc10.src.rpm:SOURCE \
+		libXxf86dga-1.0.2-3.fc10.src.rpm:SOURCE \
+		libXxf86misc-1.0.1-6.fc10.src.rpm:SOURCE \
+		libXxf86vm-1.0.2-1.fc10.src.rpm:SOURCE \
+		libfontenc-1.0.4-6.fc10.src.rpm:SOURCE \
+		libxcb-1.1.91-5.fc10.src.rpm:SOURCE \
+		libxkbfile-1.0.4-5.fc9.src.rpm:SOURCE \
+		mesa-libGLw-6.5.1-5.fc9.src.rpm:SOURCE
 
-DISTFILES=	libICE-1.0.4-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libFS-1.0.1-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libSM-1.1.0-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libX11-1.1.5-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXScrnSaver-1.1.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXTrap-1.0.0-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXau-1.0.4-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXaw-1.0.4-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXcomposite-0.4.0-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXcursor-1.1.9-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXdamage-1.1.1-4.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXdmcp-1.0.2-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXevie-1.0.2-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXext-1.0.4-1.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXfixes-4.0.3-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXfont-1.3.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXft-2.1.13-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXi-1.1.3-4.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXinerama-1.0.3-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXmu-1.0.4-1.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXp-1.0.0-11.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXpm-3.5.7-4.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXrandr-1.2.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXrender-0.9.4-3.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXres-1.0.3-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXt-1.0.5-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXtst-1.0.3-3.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXv-1.0.4-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXvMC-1.0.4-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXxf86dga-1.0.2-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXxf86misc-1.0.1-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXxf86vm-1.0.2-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libfontenc-1.0.4-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libxcb-1.1.91-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libxkbfile-1.0.4-5.fc9.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGLw-6.5.1-5.fc9.${LINUX_RPM_ARCH}.rpm
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Xorg libraries (Linux Fedora 10)
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	libICE-1.0.4-4.fc10.src.rpm \
-		libFS-1.0.1-2.fc10.src.rpm \
-		libSM-1.1.0-2.fc10.src.rpm \
-		libX11-1.1.5-4.fc10.src.rpm \
-		libXScrnSaver-1.1.3-1.fc10.src.rpm \
-		libXTrap-1.0.0-6.fc10.src.rpm \
-		libXau-1.0.4-1.fc10.src.rpm \
-		libXaw-1.0.4-3.fc10.src.rpm \
-		libXcomposite-0.4.0-5.fc10.src.rpm \
-		libXcursor-1.1.9-3.fc10.src.rpm \
-		libXdamage-1.1.1-4.fc9.src.rpm \
-		libXdmcp-1.0.2-6.fc10.src.rpm \
-		libXevie-1.0.2-4.fc10.src.rpm \
-		libXext-1.0.4-1.fc9.src.rpm \
-		libXfixes-4.0.3-4.fc10.src.rpm \
-		libXfont-1.3.3-1.fc10.src.rpm \
-		libXft-2.1.13-1.fc10.src.rpm \
-		libXi-1.1.3-4.fc9.src.rpm \
-		libXinerama-1.0.3-2.fc10.src.rpm \
-		libXmu-1.0.4-1.fc9.src.rpm \
-		libXp-1.0.0-11.fc9.src.rpm \
-		libXpm-3.5.7-4.fc9.src.rpm \
-		libXrandr-1.2.3-1.fc10.src.rpm \
-		libXrender-0.9.4-3.fc9.src.rpm \
-		libXres-1.0.3-5.fc10.src.rpm \
-		libXt-1.0.5-1.fc10.src.rpm \
-		libXtst-1.0.3-3.fc9.src.rpm \
-		libXv-1.0.4-1.fc10.src.rpm \
-		libXvMC-1.0.4-5.fc10.src.rpm \
-		libXxf86dga-1.0.2-3.fc10.src.rpm \
-		libXxf86misc-1.0.1-6.fc10.src.rpm \
-		libXxf86vm-1.0.2-1.fc10.src.rpm \
-		libfontenc-1.0.4-6.fc10.src.rpm \
-		libxcb-1.1.91-5.fc10.src.rpm \
-		libxkbfile-1.0.4-5.fc9.src.rpm \
-		mesa-libGLw-6.5.1-5.fc9.src.rpm
+CONFLICTS=	linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]*
 
-ALWAYS_KEEP_DISTFILES=	YES
-.endif
-
-CONFLICTS=		linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]*
-
-MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		Xorg libraries (Linux Fedora 10)
-
-USE_LINUX=	f10
-USE_LINUX_RPM=		yes
-USE_LINUX_APPS=		fontconfig
-
-USE_LDCONFIG=		yes
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
-	@${INSTALL_DATA} ${FILESDIR}/xorg-x11-i386.conf ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
+USES=		linux:f10
+USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig
+USE_LINUX_RPM=	nolib
 
 .include <bsd.port.mk>
diff --git a/x11/linux-f10-xorg-libs/pkg-plist b/x11/linux-f10-xorg-libs/pkg-plist
index 0a25a440a3bc..4bdb7060fb73 100644
--- a/x11/linux-f10-xorg-libs/pkg-plist
+++ b/x11/linux-f10-xorg-libs/pkg-plist
@@ -1,5 +1,3 @@
-@comment file listing
-etc/ld.so.conf.d/xorg-x11-i386.conf
 usr/lib/libFS.so.6
 usr/lib/libFS.so.6.0.0
 usr/lib/libGLw.so.1
@@ -419,5 +417,4 @@ usr/share/doc/libxkbfile-1.0.4/COPYING
 usr/share/doc/libxkbfile-1.0.4/ChangeLog
 usr/share/doc/mesa-libGLw-6.5.1/README
 usr/share/icons/default/index.theme
-@comment deal with empty directories installed by the port
 @dir usr/share/X11/app-defaults
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index b57a6585621d..39542b731e9f 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -96,7 +96,7 @@ PLIST_SUB+=	LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 
 .if ${PORT_OPTIONS:MLINUX}
 CONFLICTS_INSTALL=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
-USE_LINUX=	yes
+USES+=		linux
 PLIST_SUB+=	LINUX=""
 .else
 PLIST_SUB+=	LINUX="@comment "