Add a new xorg module, to use with USE_XORG: xorg-macros. This module

pulls in devel/xorg-macros.
Convert all ports that depends on xorg-macros to use this USE_XORG.
Split up the long XORG_MODULES= list in bsd.xorg.mk to have only one module
on each line.
Add xorg-macros dependency to xorg-server.

Reviewed by:	kwm, bapt
Obtained from:	xorg development repo (partly)

20 files changed, 25 insertions, 70 deletions

diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index 1301899fa1e7..f959c3290bfa 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A sample screen saver for X
 
 XORG_CAT=	app
-USE_XORG=	x11 xscrnsaver xt xaw7 xt
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	x11 xscrnsaver xt xaw7 xt xorg-macros
 
 MAN1=		beforelight.1
 
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index e014524651a4..01aeced0f162 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Dynamic resource editor for X Toolkit Applications
 
 XORG_CAT=	app
-USE_XORG=	x11 xt xmu xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	x11 xt xmu xaw xorg-macros
 
 MAN1=		editres.1
 
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index 50ef810c5a2b..dd46062ee83f 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Displays a wire-frame rotating plyhedron
 
 XORG_CAT=	app
-USE_XORG=	x11
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	x11 xorg-macros
 
 PLIST_FILES=	bin/ico
 
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 05af68453f54..1c5fa1d01a06 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libSM
-# Date Created:			09 Nov, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libSM
 PORTVERSION=	1.2.0
@@ -15,10 +11,8 @@ COMMENT=	Session Management library for X11
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
-
 XORG_CAT=	lib
-USE_XORG=	ice xproto:both xtrans
+USE_XORG=	ice xproto:both xtrans xorg-macros
 
 CONFIGURE_ARGS+=--disable-docs --without-xmlto
 
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 7b1f2faf3c34..013052c68389 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libX11
-# Date Created:			28 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libX11
 PORTVERSION=	1.4.4
@@ -15,13 +11,13 @@ COMMENT=	X11 library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb \
-		${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
 
 XORG_CAT=	lib
 USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
-		kbproto:both inputproto xf86bigfontproto xproto:both
+		kbproto:both inputproto xf86bigfontproto xproto:both \
+		xorg-macros
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
 			--without-xmlto \
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index c93496809a6a..ddba419a0df9 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	List resources in widgets
 
 XORG_CAT=	app
-USE_XORG=	xproto xt xmu xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xproto xt xmu xaw xorg-macros
 
 PLIST_FILES=	bin/listres
 
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
index 95282fb8aa5f..0925acc728bf 100644
--- a/x11/rstart/Makefile
+++ b/x11/rstart/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Sample implementation of a Remote Start client
 
 XORG_CAT=	app
-USE_XORG=	x11
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	x11 xorg-macros
 
 MAN1=		rstart.1 rstartd.1
 
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index b80097904185..ee1b12abc0ea 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -7,10 +7,8 @@ CATEGORIES=	x11
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Manage utmp/wtmp entries for non-init X clients
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
-
 XORG_CAT=	app
-USE_XORG=	x11
+USE_XORG=	x11 xorg-macros
 
 PLIST_FILES=	bin/sessreg
 
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
index 1fc4b9385d45..36cc6cf45ef6 100644
--- a/x11/viewres/Makefile
+++ b/x11/viewres/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Graphical class browser for Xt
 
 XORG_CAT=	app
-USE_XORG=	xt xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw xorg-macros
 
 MAN1=		viewres.1
 
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index e02f00388cdb..aac2518db396 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -11,9 +11,7 @@ COMMENT=	X clipboard client
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw xorg-macros
 
 MAN1=		xclipboard.1 xcutsel.1
 
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
index 68d259486cc0..3df19f2770e2 100644
--- a/x11/xditview/Makefile
+++ b/x11/xditview/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Display ditroff output
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw xorg-macros
 
 MAN1=		xditview.1
 
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index e8729be397ef..19375842d3d7 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Simple text editor for X
 
 XORG_CAT=	app
-USE_XORG=	xt xaw7
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw7 xorg-macros
 
 MAN1=		xedit.1
 
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 1c1278669651..9434ca642372 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -9,10 +9,9 @@ COMMENT=	Compile XKB keyboard description
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
 XORG_CAT=	app
-USE_XORG=	x11 xkbfile
-USE_GNOME=	gnomehack
+USE_XORG=	x11 xkbfile xorg-macros
+USES=		pathfix
 
 PLIST_FILES=	bin/xkbcomp \
 		libdata/pkgconfig/xkbcomp.pc
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
index 1f60e78a5631..66fa64535cb4 100644
--- a/x11/xkbutils/Makefile
+++ b/x11/xkbutils/Makefile
@@ -10,9 +10,7 @@ COMMENT=	XKB utility demos
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xkbfile x11 xaw inputproto
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xkbfile x11 xaw inputproto xorg-macros
 
 MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
 
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index 31d56a68e7f3..5d6a86ae9650 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -10,9 +10,7 @@ COMMENT=	System load average display for X
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw xorg-macros
 
 MAN1=		xload.1
 
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index f9feb2ecb055..c43f5eab7332 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Displays the X Window System logo
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xrender xft xext xt xaw xp xprintutil
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xrender xft xext xt xaw xp xprintutil xorg-macros
 
 MAN1=		xlogo.1
 
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index f18f57cf60b0..da27d37ddaca 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -10,9 +10,7 @@ COMMENT=	X application for screen magnifying
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xt xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw xorg-macros
 
 MAN1=		xmag.1
 
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
index 2aef0cd506df..43f713990a71 100644
--- a/x11/xsm/Makefile
+++ b/x11/xsm/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Session Manager
 
 XORG_CAT=	app
-USE_XORG=	xt xaw
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xt xaw xorg-macros
 
 MAN1=		xsm.1
 
diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile
index 4894d5a1d375..e5780f966675 100644
--- a/x11/xstdcmap/Makefile
+++ b/x11/xstdcmap/Makefile
@@ -10,9 +10,7 @@ COMMENT=	X standard colormap utility
 LICENSE=	MIT
 
 XORG_CAT=	app
-USE_XORG=	xmu x11
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xmu x11 xorg-macros
 
 PLIST_FILES=	bin/xstdcmap
 
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
index 658e14796e86..d053e294a99b 100644
--- a/x11/xvinfo/Makefile
+++ b/x11/xvinfo/Makefile
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Print out X-Video extension adaptor information
 
 XORG_CAT=	app
-USE_XORG=	xv x11
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	xv x11 xorg-macros
 
 PLIST_FILES=	bin/xvinfo