5 files changed, 22 insertions, 92 deletions

diff --git a/x11/XFree86/files/patch-e b/x11/XFree86/files/patch-e
index cee217ed5cac..e69de29bb2d1 100644
--- a/x11/XFree86/files/patch-e
+++ b/x11/XFree86/files/patch-e
@@ -1,81 +0,0 @@
---- config/cf/FreeBSD.cf.orig	Wed Jan  9 15:04:16 2002
-+++ config/cf/FreeBSD.cf	Wed Jan  9 16:17:59 2002
-@@ -78,7 +78,7 @@
- #endif
- 
- #define CcCmd			cc
--#define CppCmd			/usr/libexec/cpp
-+#define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppDefines	-traditional
- #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-@@ -141,12 +141,12 @@
-  * reason for FreeBSD to assume that it knows where X libraries are installed 
-  * and they can remove it from the list of directories they add to ld.so.cache 
-  * in their /etc/rc file.
-+ *
-+ * For the ELF case, we default to the ExtraLoadFlags in bsdLib.rules
-  */
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
- #ifndef ExtraLoadFlags
--#if UseElfFormat
--#define ExtraLoadFlags		-Wl,-rpath,$(USRLIBDIRPATH)
--#else
-+#if !UseElfFormat
- #define ExtraLoadFlags		-Wl,-R,$(USRLIBDIRPATH)
- #endif
- #endif
-@@ -330,7 +330,13 @@
- # define AsmDefines		AsmElfDefines
- #endif
- 
-+#ifdef i386Architecture
- #define ServerExtraDefines GccGasOption XFree86ServerDefines
-+#endif
-+#ifdef AlphaArchitecture
-+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-+#define	XFree86ConsoleDefines	-DSYSCONS_SUPPORT
-+#endif
- 
- #define StandardDefines	-DCSRG_BASED
- 
-@@ -355,14 +361,14 @@
- /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
- #ifndef DefaultGcc2i386Opt
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2
-+#define DefaultGcc2i386Opt
- #endif
- #endif
- 
- #ifdef i386Architecture
- # define OptimizedCDebugFlags DefaultGcc2i386Opt
- #else
--# define OptimizedCDebugFlags -O2
-+# define OptimizedCDebugFlags
- #endif
- 
- #ifndef PreIncDir
-@@ -471,14 +477,18 @@
- #define DlLibrary		/**/
- #endif
- 
-+#ifdef AlphaArchitecture
-+#define IoLibrary		-lio
-+#else
-+#define IoLibrary		/**/
-+#endif
-+
- #if BuildDynamicLoading
--#define ServerExtraSysLibs	DlLibrary
-+#define ServerExtraSysLibs	DlLibrary IoLibrary
- #else
--#define ServerExtraSysLibs	/**/
-+#define ServerExtraSysLibs	IoLibrary
- #endif
- 
- #include <bsdLib.rules>
- 
--#ifdef i386Architecture
- #include <xfree86.cf>
--#endif
diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile
index ec25e4589a29..8163679953d5 100644
--- a/x11/linux-XFree86-libs/Makefile
+++ b/x11/linux-XFree86-libs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		XFree86-libs
 PORTVERSION=		4.3.99.902
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		x11 linux
 MASTER_SITES=	${MASTER_SITE_SUSE} \
 		ftp://ftp.in2p3.fr/pub/linux/suse/update/9.1/rpm/i586/ \
@@ -27,13 +27,16 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux
 
 CONFLICTS=	linux_base-7* linux_base-deb*
 USE_LINUX_PREFIX=yes
+USE_LINUX=	yes
 MD5_FILE=	${MASTERDIR}/distinfo.i386
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST=		${WRKDIR}/plist
-PLIST_DIRS=	usr/X11R6/lib/X11
+PLIST_DIRS=	usr/X11R6/lib/X11 \
+		usr/X11R6/lib \
+		usr/X11R6/bin \
+		usr/X11R6
 
 pre-install:
 	@${RM} -f ${PLIST}
diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile
index 2abe16032092..a56da1166bf3 100644
--- a/x11/linux-gnomelibs/Makefile
+++ b/x11/linux-gnomelibs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomelibs
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
@@ -17,8 +17,4 @@ RPM_SET=	gnome-libs-${PORTVERSION}-11.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
 
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/alpha/RedHat/RPMS/
-.endif
+MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/${MACHINE_ARCH}/RedHat/RPMS/
diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386
index 9f3fbc95a4de..371c3647bf78 100644
--- a/x11/linux-gnomelibs/pkg-plist.i386
+++ b/x11/linux-gnomelibs/pkg-plist.i386
@@ -116,3 +116,15 @@ usr/lib/libzvt.so.2
 @dirrm etc/sound/events
 @dirrm etc/sound
 @dirrm etc/gnome
+@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>&1 >/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>&1 >/dev/null || true
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index ba2f48c63fcc..d7d6c150aaa4 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -56,8 +56,8 @@ PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
 		LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
 
 .if !defined(WITHOUT_LINUX)
-USE_LINUX?=	yes
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+USE_LINUX=	yes
+USE_XLIB=	yes
 PLIST_SUB+=	LINUX=""
 .else
 PLIST_SUB+=	LINUX="@comment "