20 files changed, 55 insertions, 30 deletions

diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile
index 806eb835f7b5..5a2ceb1cb2e0 100644
--- a/x11-toolkits/XawPlus/Makefile
+++ b/x11-toolkits/XawPlus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XawPlus
 PORTVERSION=	3.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://people.freenet.de/kra/XawPlus/
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index c94e5679e5b8..f3984c0b0116 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fltk
 PORTVERSION=	2.0.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	fltk/snapshots
@@ -42,6 +43,7 @@ LATEST_LINK=	fltk2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
+USE_XORG=	xi
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index bfd84de4c20d..af191e88ecea 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +21,7 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 WRKSRC=		${WRKDIR}/${PORTNAME}/1.0
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_XORG=	x11 xt
 MAKE_ARGS=	DIRS=src
 
 PLIST_SUB=	INCSDIR="${INCSDIR:S,^${PREFIX}/,,}"
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index f54b2f2a5a21..9a5c0c428aa4 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ COMMENT=	An OpenGL extension to GTK
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GL=		yes
+USE_XORG=	xt
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index dba8db895184..3bad9aeb14ec 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	glut
 PORTVERSION=	2.1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index 4f1af9e9f244..4d1546019e95 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	2.2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${GHC_VERSION}/
 PKGNAMEPREFIX=	hs-
@@ -21,6 +21,7 @@ COMMENT=	OpenGL bindings for Haskell programs
 
 USE_BZIP2=	yes
 USE_GL=		yes
+USE_XORG=	x11 xt
 
 GHC_VERSION=	6.8.3
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
diff --git a/x11-toolkits/hs-glut-ghc/Makefile b/x11-toolkits/hs-glut-ghc/Makefile
index dba8db895184..3bad9aeb14ec 100644
--- a/x11-toolkits/hs-glut-ghc/Makefile
+++ b/x11-toolkits/hs-glut-ghc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	glut
 PORTVERSION=	2.1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
diff --git a/x11-toolkits/hs-opengl-ghc/Makefile b/x11-toolkits/hs-opengl-ghc/Makefile
index 4f1af9e9f244..4d1546019e95 100644
--- a/x11-toolkits/hs-opengl-ghc/Makefile
+++ b/x11-toolkits/hs-opengl-ghc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	2.2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${GHC_VERSION}/
 PKGNAMEPREFIX=	hs-
@@ -21,6 +21,7 @@ COMMENT=	OpenGL bindings for Haskell programs
 
 USE_BZIP2=	yes
 USE_GL=		yes
+USE_XORG=	x11 xt
 
 GHC_VERSION=	6.8.3
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index fa438018306a..b4f75c2ea341 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXaw
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index e99e5c7481e4..2c2e16094895 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXaw-1.0.4.tar.bz2) = 73671d8f1cf36fdd81395328cc3539c9
-SHA256 (xorg/lib/libXaw-1.0.4.tar.bz2) = 11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
-SIZE (xorg/lib/libXaw-1.0.4.tar.bz2) = 517275
+MD5 (xorg/lib/libXaw-1.0.5.tar.bz2) = 64e7782db4653cb57c7f7e660b2431c3
+SHA256 (xorg/lib/libXaw-1.0.5.tar.bz2) = 2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
+SIZE (xorg/lib/libXaw-1.0.5.tar.bz2) = 513408
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index 75a563df538b..ae9f9425ed95 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -32,8 +32,6 @@ include/X11/Xaw/Panner.h
 include/X11/Xaw/PannerP.h
 include/X11/Xaw/Porthole.h
 include/X11/Xaw/PortholeP.h
-include/X11/Xaw/Print.h
-include/X11/Xaw/PrintSP.h
 include/X11/Xaw/Repeater.h
 include/X11/Xaw/RepeaterP.h
 include/X11/Xaw/Reports.h
@@ -74,7 +72,6 @@ include/X11/Xaw/XawInit.h
 lib/libXaw.so
 lib/libXaw.so.6
 lib/libXaw.so.7
-lib/libXaw.so.8
 lib/libXaw6.a
 lib/libXaw6.la
 lib/libXaw6.so
@@ -83,12 +80,6 @@ lib/libXaw7.a
 lib/libXaw7.la
 lib/libXaw7.so
 lib/libXaw7.so.7
-lib/libXaw8.a
-lib/libXaw8.la
-lib/libXaw8.so
-lib/libXaw8.so.8
 libdata/pkgconfig/xaw6.pc
 libdata/pkgconfig/xaw7.pc
-libdata/pkgconfig/xaw8.pc
-share/aclocal/xaw.m4
 @dirrm include/X11/Xaw
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 9c876068e346..ae15ab4c5dd2 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXmu
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo
index 4cf9425d699e..98c90347ba31 100644
--- a/x11-toolkits/libXmu/distinfo
+++ b/x11-toolkits/libXmu/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (xorg/lib/libXmu-1.0.4.tar.bz2) = fb372a5f3ab42b5ba16d7af4d833a0cb
+SHA256 (xorg/lib/libXmu-1.0.4.tar.bz2) = f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0
+SIZE (xorg/lib/libXmu-1.0.4.tar.bz2) = 305347
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index fb347139fb1d..2af4c60a67c9 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nucleo
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/latest/ \
 		http://freebsd.nsu.ru/distfiles/metisse/
@@ -22,6 +22,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		glu
+USE_XORG=	x11 xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index d9fe43d32308..3b9b0b689d55 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	open-motif
 PORTVERSION=	2.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.motifzone.com/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om${PORTVERSION}/src
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 94513e19010c..6e71af3a97ef 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	otk
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_lib_${DISTVERSION}
@@ -15,9 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Widget library based on OpenGL
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
-USE_GL=		glu gl
+USE_GL=		glut glu gl
 USE_LDCONFIG=	yes
 USE_XORG=	xmu xext x11
 WRKSRC=		${WRKDIR}/${PORTNAME}_lib
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index d0f7119336ad..28f0cf36f89f 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://plib.sourceforge.net/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A portable library for joystick/sound/OpenGL GUI/3D math
 
+USE_XORG=	xt xi xmu xext x11
 USE_GNOME=	gnometarget
 USE_GL=		glu
 USE_GMAKE=	yes
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 08196d9f038b..31259fdabf29 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.4.19
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -381,6 +382,7 @@ pre-everything::
 	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
 
 post-patch:
+	@(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch)
 	@${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in
 .if defined(BUILDING_TK_THREADS)
diff --git a/x11-toolkits/tk84/files/extra-lastevent-patch b/x11-toolkits/tk84/files/extra-lastevent-patch
new file mode 100644
index 000000000000..77c7f757a705
--- /dev/null
+++ b/x11-toolkits/tk84/files/extra-lastevent-patch
@@ -0,0 +1,25 @@
+--- generic/tk.h.orig	2008-02-06 16:31:40.000000000 +0100
++++ generic/tk.h	2008-07-24 08:21:46.000000000 +0200
+@@ -635,17 +635,15 @@
+  *
+  *---------------------------------------------------------------------------
+  */
+-#define VirtualEvent	    (LASTEvent)
+-#define ActivateNotify	    (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
++#define VirtualEvent	    (MappingNotify + 1)
++#define ActivateNotify	    (MappingNotify + 2)
++#define DeactivateNotify    (MappingNotify + 3)
++#define MouseWheelEvent     (MappingNotify + 4)
++#define TK_LASTEVENT	    (MappingNotify + 5)
+ 
+ #define MouseWheelMask	    (1L << 28)
+-
+ #define ActivateMask	    (1L << 29)
+ #define VirtualEventMask    (1L << 30)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
+ 
+ 
+ /*
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 254d1a9cd889..988636d2826c 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	v
 PORTVERSION=	1.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vgui