- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

3 files changed, 7 insertions, 62 deletions

diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 4381ccf00f8c..9c876068e346 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -6,27 +6,14 @@
 #
 
 PORTNAME=	libXmu
-PORTVERSION=	6.2.3
+PORTVERSION=	1.0.3
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Miscellaneous Utilities libraries
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	xproto:both x11 xt xext
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo
index 422ee145035b..4cf9425d699e 100644
--- a/x11-toolkits/libXmu/distinfo
+++ b/x11-toolkits/libXmu/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXmu-6.2.3.tar.bz2) = 7671745bd8a1b0595847541479a327d6
-SHA256 (libXmu-6.2.3.tar.bz2) = 5f3d5b39f767cd6665f36c47391465bf44aee0f0178cce13865510471b02ea40
-SIZE (libXmu-6.2.3.tar.bz2) = 254322
+MD5 (xorg/lib/libXmu-1.0.3.tar.bz2) = b926b95b811ece3e19cd590db85ee615
+SHA256 (xorg/lib/libXmu-1.0.3.tar.bz2) = b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66
+SIZE (xorg/lib/libXmu-1.0.3.tar.bz2) = 296622
diff --git a/x11-toolkits/libXmu/files/patch-Xaw-dep.diff b/x11-toolkits/libXmu/files/patch-Xaw-dep.diff
deleted file mode 100644
index 7417469b1d7f..000000000000
--- a/x11-toolkits/libXmu/files/patch-Xaw-dep.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: EditresCom.c
-===================================================================
-RCS file: /cvs/xlibs/Xmu/EditresCom.c,v
-retrieving revision 1.23
-diff -u -r1.23 EditresCom.c
---- a/EditresCom.c	12 Apr 2004 14:37:50 -0000	1.23
-+++ b/EditresCom.c	13 May 2004 04:13:52 -0000
-@@ -40,7 +40,6 @@
- #include <X11/Xatom.h>
- #include <X11/Xos.h>		/* for strcpy declaration */
- #include <X11/Xfuncs.h>
--#include <X11/Xaw/Cardinals.h>
- #include <X11/Xmu/EditresP.h>
- #include <X11/Xmd.h>
- #include <X11/Xmu/CharSet.h>
-Index: WidgetNode.c
-===================================================================
-RCS file: /cvs/xlibs/Xmu/WidgetNode.c,v
-retrieving revision 1.14
-diff -u -r1.14 WidgetNode.c
---- a/WidgetNode.c	23 Dec 2003 04:10:32 -0000	1.14
-+++ b/WidgetNode.c	13 May 2004 04:16:59 -0000
-@@ -38,10 +38,6 @@
- #include <stdlib.h>
- #include <X11/Xos.h>
- #include <X11/IntrinsicP.h>
--/* #include <X11/Xaw/Cardinals.h> */
--#ifndef ZERO
--#define ZERO	((Cardinal)0)
--#endif
- #include <X11/Xmu/CharSet.h>
- #include <X11/Xmu/WidgetNode.h>
- 
-@@ -221,7 +217,7 @@
-     if (node->have_resources) return;
- 
-     dummy = XtCreateWidget (node->label, XmuWnClass(node), toplevel,
--			    NULL, ZERO);
-+			    NULL, ((Cardinal)0));
-     if (dummy) XtDestroyWidget (dummy);
- 
-