1 files changed, 33 insertions, 96 deletions

diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index ec91aac278fe..1db73a3ec15f 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-apps
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -15,100 +15,15 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org apps meta-port
 
-RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
-		appres:${PORTSDIR}/x11/appres \
-		beforelight:${PORTSDIR}/x11/beforelight \
-		bitmap:${PORTSDIR}/x11/bitmap \
-		editres:${PORTSDIR}/x11/editres \
-		fonttosfnt:${PORTSDIR}/x11-fonts/fonttosfnt \
-		fslsfonts:${PORTSDIR}/x11-fonts/fslsfonts \
-		fstobdf:${PORTSDIR}/x11/fstobdf \
-		iceauth:${PORTSDIR}/x11/iceauth \
-		ico:${PORTSDIR}/x11/ico \
-		listres:${PORTSDIR}/x11/listres \
-		luit:${PORTSDIR}/x11/luit \
-		${PREFIX}/sbin/mkcomposecache:${PORTSDIR}/x11/mkcomposecache \
-		oclock:${PORTSDIR}/x11/oclock \
-		showrgb:${PORTSDIR}/x11/rgb \
-		rstart:${PORTSDIR}/x11/rstart \
-		xon:${PORTSDIR}/x11/scripts \
-		sessreg:${PORTSDIR}/x11/sessreg \
-		setxkbmap:${PORTSDIR}/x11/setxkbmap \
-		showfont:${PORTSDIR}/x11-fonts/showfont \
-		smproxy:${PORTSDIR}/x11/smproxy \
-		twm:${PORTSDIR}/x11-wm/twm \
-		viewres:${PORTSDIR}/x11/viewres \
-		x11perf:${PORTSDIR}/x11/x11perf \
-		xauth:${PORTSDIR}/x11/xauth \
-		xbacklight:${PORTSDIR}/x11/xbacklight \
-		xbiff:${PORTSDIR}/x11/xbiff \
-		xcalc:${PORTSDIR}/x11/xcalc \
-		xclipboard:${PORTSDIR}/x11/xclipboard \
-		xclock:${PORTSDIR}/x11/xclock \
-		xcmsdb:${PORTSDIR}/x11/xcmsdb \
-		xconsole:${PORTSDIR}/x11/xconsole \
-		xcursorgen:${PORTSDIR}/x11/xcursorgen \
-		xdbedizzy:${PORTSDIR}/x11/xdbedizzy \
-		xditview:${PORTSDIR}/x11/xditview \
-		xdm:${PORTSDIR}/x11/xdm \
-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo \
-		xdriinfo:${PORTSDIR}/x11/xdriinfo \
-		xedit:${PORTSDIR}/x11/xedit \
-		xev:${PORTSDIR}/x11/xev \
-		xeyes:${PORTSDIR}/x11/xeyes \
-		dga:${PORTSDIR}/x11/xf86dga \
-		xfd:${PORTSDIR}/x11/xfd \
-		xfindproxy:${PORTSDIR}/x11/xfindproxy \
-		xfontsel:${PORTSDIR}/x11-fonts/xfontsel \
-		xfs:${PORTSDIR}/x11-fonts/xfs \
-		xfsinfo:${PORTSDIR}/x11-fonts/xfsinfo \
-		xfwp:${PORTSDIR}/x11/xfwp \
-		xgamma:${PORTSDIR}/x11/xgamma \
-		xgc:${PORTSDIR}/x11/xgc \
-		xhost:${PORTSDIR}/x11/xhost \
-		xinit:${PORTSDIR}/x11/xinit \
-		xkbcomp:${PORTSDIR}/x11/xkbcomp \
-		xkbevd:${PORTSDIR}/x11/xkbevd \
-		xkbprint:${PORTSDIR}/x11/xkbprint \
-		xkbvleds:${PORTSDIR}/x11/xkbutils \
-		xkill:${PORTSDIR}/x11/xkill \
-		xload:${PORTSDIR}/x11/xload \
-		xlogo:${PORTSDIR}/x11/xlogo \
-		xlsatoms:${PORTSDIR}/x11/xlsatoms \
-		xlsclients:${PORTSDIR}/x11/xlsclients \
-		xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts \
-		xmag:${PORTSDIR}/x11/xmag \
-		xman:${PORTSDIR}/x11/xman \
-		xmessage:${PORTSDIR}/x11/xmessage \
-		xmodmap:${PORTSDIR}/x11/xmodmap \
-		xmore:${PORTSDIR}/x11/xmore \
-		xphelloworld:${PORTSDIR}/x11/xphelloworld \
-		xplsprinters:${PORTSDIR}/x11/xplsprinters \
-		xpr:${PORTSDIR}/x11/xpr \
-		xprehashprinterlist:${PORTSDIR}/x11/xprehashprinterlist \
-		xprop:${PORTSDIR}/x11/xprop \
-		xrandr:${PORTSDIR}/x11/xrandr \
-		xrdb:${PORTSDIR}/x11/xrdb \
-		xrefresh:${PORTSDIR}/x11/xrefresh \
-		xrx:${PORTSDIR}/x11/xrx \
-		xset:${PORTSDIR}/x11/xset \
-		xsetmode:${PORTSDIR}/x11/xsetmode \
-		xsetpointer:${PORTSDIR}/x11/xsetpointer \
-		xsetroot:${PORTSDIR}/x11/xsetroot \
-		xstdcmap:${PORTSDIR}/x11/xstdcmap \
-		xtrapchar:${PORTSDIR}/x11/xtrap \
-		xvidtune:${PORTSDIR}/x11/xvidtune \
-		xvinfo:${PORTSDIR}/x11/xvinfo \
-		xwd:${PORTSDIR}/x11/xwd \
-		xwininfo:${PORTSDIR}/x11/xwininfo \
-		xwud:${PORTSDIR}/x11/xwud \
-		xterm:${PORTSDIR}/x11/xterm
-
-.if exists(/usr/bin/rsh)
-RUN_DEPENDS+=	xsm:${PORTSDIR}/x11/xsm
-.endif
+COMPONENTS=	appres bitmap xf86dga:dga iceauth luit \
+		x11-fonts/mkfontdir:mkfontdir \
+		x11-fonts/mkfontscale:mkfontscale sessreg \
+		setxkbmap smproxy x11perf xauth xbacklight xcalc \
+		xcmsdb xcursorgen xdpyinfo xdriinfo xev xgamma xgc \
+		xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \
+		xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \
+		xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \
+		xwud
 
 NO_BUILD=	yes
 
@@ -116,4 +31,26 @@ do-install:
 		${MKDIR} ${PREFIX}/libdata/xorg
 		${TOUCH} ${PREFIX}/libdata/xorg/apps
 
-.include <bsd.port.mk>
+.for comp in ${COMPONENTS}
+OPTIONS+=	${comp:C/:.*//:C/.*\///:U} "Install ${comp:C/:.*//:C/.*\///} application" on
+.endfor
+
+.include <bsd.port.pre.mk>
+
+.for comp in ${COMPONENTS}
+. if !defined(WITHOUT_${comp:C/:.*//:C/.*\///:U})
+.  if ${comp:M:}==""
+port=${comp}
+check=${comp:C/.*\///} # doesn't work
+.  else
+port=${comp:C/:.*//}
+check=${comp:C/.*://}
+.  endif
+.  if ${port:M*/*}==""
+port:=x11/${port}
+.  endif
+RUN_DEPENDS:=	${RUN_DEPENDS} ${check}:${PORTSDIR}/${port}
+. endif
+.endfor
+
+.include <bsd.port.post.mk>