4 files changed, 117 insertions, 23 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index cd9222164476..35050a731dbc 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	libX11
-PORTVERSION=	6.2.1.p2
+PORTVERSION=	6.2.1
 CATEGORIES=	x11
-MASTER_SITES=	http://pdx.freedesktop.org/~anholt/dist/
+MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 library
 
+LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
 		${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/libXtrans \
-		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
+		${LIB_PC_DEPENDS}
+RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
 USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ARGS+= --enable-xdmauth
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL -DXLOCALEDIR="\"${X11BASE}/locale\""
-WRKSRC=		${WRKDIR}/${PORTNAME}-6.2.1
-
+CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
-
-# This is a hack until we get locale files included with libX11.
-post-install:
-	${LN} -shf ${PREFIX}/lib/X11/locale ${PREFIX}/share/X11/locale
+USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 62bf7fc949ba..ec3280e880ea 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1 +1 @@
-MD5 (libX11-6.2.1.p2.tar.bz2) = fe3afd486d204a5e98cb8e155e98e4db
+MD5 (libX11-6.2.1.tar.bz2) = 59b6fa7cd6fe7ee1da92fd1b56d1cee3
diff --git a/x11/libX11/files/patch-Makefile.in b/x11/libX11/files/patch-Makefile.in
deleted file mode 100644
index 00f31a36775b..000000000000
--- a/x11/libX11/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Nov  9 23:02:21 2003
-+++ Makefile.in	Sun Nov  9 23:02:34 2003
-@@ -159,7 +159,7 @@
- target_alias = @target_alias@
- SUBDIRS = include src
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = x11.pc
- 
- EXTRA_DIST = x11.pc.in
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index e35e7bd7012b..70feec8c44b8 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -15,4 +15,111 @@ lib/libX11.so.6
 libdata/pkgconfig/x11.pc
 share/X11/XErrorDB
 share/X11/XKeysymDB
-share/X11/locale
+share/X11/locale/C/XI18N_OBJS
+share/X11/locale/C/XLC_LOCALE
+share/X11/locale/armscii-8/XI18N_OBJS
+share/X11/locale/armscii-8/XLC_LOCALE
+share/X11/locale/compose.dir
+share/X11/locale/en_US.UTF-8/XI18N_OBJS
+share/X11/locale/en_US.UTF-8/XLC_LOCALE
+share/X11/locale/georgian-academy/XI18N_OBJS
+share/X11/locale/georgian-academy/XLC_LOCALE
+share/X11/locale/georgian-ps/XI18N_OBJS
+share/X11/locale/georgian-ps/XLC_LOCALE
+share/X11/locale/ibm-cp1133/XI18N_OBJS
+share/X11/locale/ibm-cp1133/XLC_LOCALE
+share/X11/locale/iscii-dev/XI18N_OBJS
+share/X11/locale/iscii-dev/XLC_LOCALE
+share/X11/locale/isiri-3342/XI18N_OBJS
+share/X11/locale/isiri-3342/XLC_LOCALE
+share/X11/locale/iso8859-1/XI18N_OBJS
+share/X11/locale/iso8859-1/XLC_LOCALE
+share/X11/locale/iso8859-10/XI18N_OBJS
+share/X11/locale/iso8859-10/XLC_LOCALE
+share/X11/locale/iso8859-11/XI18N_OBJS
+share/X11/locale/iso8859-11/XLC_LOCALE
+share/X11/locale/iso8859-13/XI18N_OBJS
+share/X11/locale/iso8859-13/XLC_LOCALE
+share/X11/locale/iso8859-14/XI18N_OBJS
+share/X11/locale/iso8859-14/XLC_LOCALE
+share/X11/locale/iso8859-15/XI18N_OBJS
+share/X11/locale/iso8859-15/XLC_LOCALE
+share/X11/locale/iso8859-2/XI18N_OBJS
+share/X11/locale/iso8859-2/XLC_LOCALE
+share/X11/locale/iso8859-3/XI18N_OBJS
+share/X11/locale/iso8859-3/XLC_LOCALE
+share/X11/locale/iso8859-4/XI18N_OBJS
+share/X11/locale/iso8859-4/XLC_LOCALE
+share/X11/locale/iso8859-5/XI18N_OBJS
+share/X11/locale/iso8859-5/XLC_LOCALE
+share/X11/locale/iso8859-6/XI18N_OBJS
+share/X11/locale/iso8859-6/XLC_LOCALE
+share/X11/locale/iso8859-7/XI18N_OBJS
+share/X11/locale/iso8859-7/XLC_LOCALE
+share/X11/locale/iso8859-8/XI18N_OBJS
+share/X11/locale/iso8859-8/XLC_LOCALE
+share/X11/locale/iso8859-9/XI18N_OBJS
+share/X11/locale/iso8859-9/XLC_LOCALE
+share/X11/locale/iso8859-9e/XI18N_OBJS
+share/X11/locale/iso8859-9e/XLC_LOCALE
+share/X11/locale/ja.JIS/XI18N_OBJS
+share/X11/locale/ja.JIS/XLC_LOCALE
+share/X11/locale/ja.S90/XI18N_OBJS
+share/X11/locale/ja.S90/XLC_LOCALE
+share/X11/locale/ja.SJIS/XI18N_OBJS
+share/X11/locale/ja.SJIS/XLC_LOCALE
+share/X11/locale/ja.U90/XI18N_OBJS
+share/X11/locale/ja.U90/XLC_LOCALE
+share/X11/locale/ja/XI18N_OBJS
+share/X11/locale/ja/XLC_LOCALE
+share/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+share/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+share/X11/locale/ko/XI18N_OBJS
+share/X11/locale/ko/XLC_LOCALE
+share/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+share/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+share/X11/locale/koi8-c/XI18N_OBJS
+share/X11/locale/koi8-c/XLC_LOCALE
+share/X11/locale/koi8-r/XI18N_OBJS
+share/X11/locale/koi8-r/XLC_LOCALE
+share/X11/locale/koi8-u/XI18N_OBJS
+share/X11/locale/koi8-u/XLC_LOCALE
+share/X11/locale/locale.alias
+share/X11/locale/locale.dir
+share/X11/locale/microsoft-cp1251/XI18N_OBJS
+share/X11/locale/microsoft-cp1251/XLC_LOCALE
+share/X11/locale/microsoft-cp1255/XI18N_OBJS
+share/X11/locale/microsoft-cp1255/XLC_LOCALE
+share/X11/locale/microsoft-cp1256/XI18N_OBJS
+share/X11/locale/microsoft-cp1256/XLC_LOCALE
+share/X11/locale/mulelao-1/XI18N_OBJS
+share/X11/locale/mulelao-1/XLC_LOCALE
+share/X11/locale/nokhchi-1/XI18N_OBJS
+share/X11/locale/nokhchi-1/XLC_LOCALE
+share/X11/locale/tatar-cyr/XI18N_OBJS
+share/X11/locale/tatar-cyr/XLC_LOCALE
+share/X11/locale/th_TH.UTF-8/XI18N_OBJS
+share/X11/locale/th_TH.UTF-8/XLC_LOCALE
+share/X11/locale/th_TH/XI18N_OBJS
+share/X11/locale/th_TH/XLC_LOCALE
+share/X11/locale/tscii-0/XI18N_OBJS
+share/X11/locale/tscii-0/XLC_LOCALE
+share/X11/locale/vi_VN.tcvn/XI18N_OBJS
+share/X11/locale/vi_VN.tcvn/XLC_LOCALE
+share/X11/locale/vi_VN.viscii/XI18N_OBJS
+share/X11/locale/vi_VN.viscii/XLC_LOCALE
+share/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+share/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+share/X11/locale/zh_CN.gbk/XI18N_OBJS
+share/X11/locale/zh_CN.gbk/XLC_LOCALE
+share/X11/locale/zh_CN/XI18N_OBJS
+share/X11/locale/zh_CN/XLC_LOCALE
+share/X11/locale/zh_HK.big5/XLC_LOCALE
+share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+share/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+share/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+share/X11/locale/zh_TW.big5/XI18N_OBJS
+share/X11/locale/zh_TW.big5/XLC_LOCALE
+share/X11/locale/zh_TW/XI18N_OBJS
+share/X11/locale/zh_TW/XLC_LOCALE