Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Mar 2013 19:14:28 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r313929 - in head: Mk devel/lndir x11-drivers/xf86-video-radeonhd-devel x11-fonts/xfsinfo x11-servers/xorg-server x11-wm/xcompmgr x11/beforelight x11/editres x11/ico x11/libSM x11/libX1...
Message-ID:  <201303111914.r2BJETWR058296@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Mon Mar 11 19:14:28 2013
New Revision: 313929
URL: http://svnweb.freebsd.org/changeset/ports/313929

Log:
  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)

Modified:
  head/Mk/bsd.xorg.mk
  head/devel/lndir/Makefile
  head/x11-drivers/xf86-video-radeonhd-devel/Makefile
  head/x11-fonts/xfsinfo/Makefile
  head/x11-servers/xorg-server/Makefile
  head/x11-wm/xcompmgr/Makefile
  head/x11/beforelight/Makefile
  head/x11/editres/Makefile
  head/x11/ico/Makefile
  head/x11/libSM/Makefile
  head/x11/libX11/Makefile
  head/x11/listres/Makefile
  head/x11/rstart/Makefile
  head/x11/sessreg/Makefile
  head/x11/viewres/Makefile
  head/x11/xclipboard/Makefile
  head/x11/xditview/Makefile
  head/x11/xedit/Makefile
  head/x11/xkbcomp/Makefile
  head/x11/xkbutils/Makefile
  head/x11/xload/Makefile
  head/x11/xlogo/Makefile
  head/x11/xmag/Makefile
  head/x11/xsm/Makefile
  head/x11/xstdcmap/Makefile
  head/x11/xvinfo/Makefile

Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/Mk/bsd.xorg.mk	Mon Mar 11 19:14:28 2013	(r313929)
@@ -157,7 +157,87 @@ Xorg_Post_Include=		bsd.xorg.mk
 # Register all xorg .pc files here.
 # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
 
-XORG_MODULES=	bigreqsproto compositeproto damageproto dmx dmxproto dri2proto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pciaccess pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
+XORG_MODULES=	bigreqsproto \
+				compositeproto \
+				damageproto \
+				dmx \
+				dmxproto \
+				dri2proto \
+				evieproto \
+				fixesproto \
+				fontcacheproto \
+				fontenc \
+				fontsproto \
+				fontutil \
+				glproto \
+				ice \
+				inputproto \
+				kbproto \
+				libfs \
+				oldx \
+				pciaccess \
+				pixman \
+				printproto \
+				randrproto \
+				recordproto \
+				renderproto \
+				resourceproto \
+				scrnsaverproto \
+				sm \
+				trapproto \
+				videoproto \
+				x11 \
+				xau \
+				xaw \
+				xaw6 \
+				xaw7 \
+				xbitmaps \
+				xcmiscproto \
+				xcomposite \
+				xcursor \
+				xdamage \
+				xdmcp \
+				xevie \
+				xext \
+				xextproto \
+				xf86bigfontproto \
+				xf86dgaproto \
+				xf86driproto \
+				xf86miscproto \
+				xf86rushproto \
+				xf86vidmodeproto \
+				xfixes \
+				xfont \
+				xfontcache \
+				xft \
+				xi \
+				xinerama \
+				xineramaproto \
+				xkbfile \
+				xkbui \
+				xmu \
+				xmuu \
+				xorg-macros \
+				xorg-server \
+				xp \
+				xpm \
+				xprintapputil \
+				xprintutil \
+				xproto \
+				xproxymngproto \
+				xrandr \
+				xrender \
+				xres \
+				xscrnsaver \
+				xt \
+				xtrans \
+				xtrap \
+				xtst \
+				xv \
+				xvmc \
+				xxf86dga \
+				xxf86misc \
+				xxf86vm
 
 bigreqsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto
 compositeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto
@@ -219,6 +299,7 @@ xkbfile_LIB_PC_DEPENDS=		${LOCALBASE}/li
 xkbui_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui
 xmu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu
 xmuu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu
+xorg-macros_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
 xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server
 xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp
 xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm

Modified: head/devel/lndir/Makefile
==============================================================================
--- head/devel/lndir/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/devel/lndir/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lndir
-# Date Created:				13 Oct 2007
-# Whom:					Carlos A M dos Santos <unixmania@gmail.com>
-#
+# Created by: Carlos A M dos Santos <unixmania@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	lndir
 PORTVERSION=	1.0.3
@@ -12,10 +8,8 @@ CATEGORIES=	devel
 MAINTAINER=	unixmania@gmail.com
 COMMENT=	Create a shadow directory of symbolic links to another directory tree
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
-
 XORG_CAT=	util
-USE_XORG=	xproto
+USE_XORG=	xproto xorg-macros
 
 PLIST_FILES=	bin/lndir
 

Modified: head/x11-drivers/xf86-video-radeonhd-devel/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-radeonhd-devel/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11-drivers/xf86-video-radeonhd-devel/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86-video-radeonhd-devel
-# Date Created:				2008-09-07
-# Whom:					nork@FreeBSD.org
-#
+# Created by: nork@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-radeonhd
 PORTVERSION=	1.3.0.20091101

Modified: head/x11-fonts/xfsinfo/Makefile
==============================================================================
--- head/x11-fonts/xfsinfo/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11-fonts/xfsinfo/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -8,9 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font server information utility
 
 XORG_CAT=	app
-USE_XORG=	x11 libfs
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	x11 libfs xorg-macros
 
 PLIST_FILES=	bin/xfsinfo
 

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11-servers/xorg-server/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -48,7 +48,8 @@ USE_XORG?=	xf86driproto glproto xdmcp x1
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
 		resourceproto fontsproto inputproto xf86dgaproto \
 		videoproto compositeproto trapproto recordproto xineramaproto \
-		xinerama evieproto xfont fontenc xkbui pixman pciaccess
+		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
+		xorg-macros
 
 MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes

Modified: head/x11-wm/xcompmgr/Makefile
==============================================================================
--- head/x11-wm/xcompmgr/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11-wm/xcompmgr/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -9,9 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A sample X compositing manager
 
 XORG_CAT=	app
-USE_XORG=	x11 xcomposite xfixes xdamage xrender
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
+USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
 
 PLIST_FILES=	bin/${PORTNAME}
 

Modified: head/x11/beforelight/Makefile
==============================================================================
--- head/x11/beforelight/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/beforelight/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/editres/Makefile
==============================================================================
--- head/x11/editres/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/editres/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/ico/Makefile
==============================================================================
--- head/x11/ico/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/ico/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/libSM/Makefile
==============================================================================
--- head/x11/libSM/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/libSM/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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 
 
 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
 

Modified: head/x11/libX11/Makefile
==============================================================================
--- head/x11/libX11/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/libX11/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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 \

Modified: head/x11/listres/Makefile
==============================================================================
--- head/x11/listres/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/listres/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/rstart/Makefile
==============================================================================
--- head/x11/rstart/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/rstart/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/sessreg/Makefile
==============================================================================
--- head/x11/sessreg/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/sessreg/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/viewres/Makefile
==============================================================================
--- head/x11/viewres/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/viewres/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xclipboard/Makefile
==============================================================================
--- head/x11/xclipboard/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xclipboard/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xditview/Makefile
==============================================================================
--- head/x11/xditview/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xditview/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xedit/Makefile
==============================================================================
--- head/x11/xedit/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xedit/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xkbcomp/Makefile
==============================================================================
--- head/x11/xkbcomp/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xkbcomp/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -9,10 +9,9 @@ COMMENT=	Compile XKB keyboard descriptio
 
 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

Modified: head/x11/xkbutils/Makefile
==============================================================================
--- head/x11/xkbutils/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xkbutils/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xload/Makefile
==============================================================================
--- head/x11/xload/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xload/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -10,9 +10,7 @@ COMMENT=	System load average display for
 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
 

Modified: head/x11/xlogo/Makefile
==============================================================================
--- head/x11/xlogo/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xlogo/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -10,9 +10,7 @@ COMMENT=	Displays the X Window System lo
 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
 

Modified: head/x11/xmag/Makefile
==============================================================================
--- head/x11/xmag/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xmag/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -10,9 +10,7 @@ COMMENT=	X application for screen magnif
 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
 

Modified: head/x11/xsm/Makefile
==============================================================================
--- head/x11/xsm/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xsm/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xstdcmap/Makefile
==============================================================================
--- head/x11/xstdcmap/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xstdcmap/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 

Modified: head/x11/xvinfo/Makefile
==============================================================================
--- head/x11/xvinfo/Makefile	Mon Mar 11 18:45:16 2013	(r313928)
+++ head/x11/xvinfo/Makefile	Mon Mar 11 19:14:28 2013	(r313929)
@@ -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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303111914.r2BJETWR058296>