Import of pkgsrc-2016Q3

x11/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.767 2015/09/01 00:28:39 khorben Exp $
+# $NetBSD: Makefile,v 1.799 2016/09/20 08:01:07 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -6,7 +6,6 @@ COMMENT=	Packages to support the X window system
 SUBDIR+=	9term
 SUBDIR+=	XaoS
 SUBDIR+=	Xaw-Xpm
-SUBDIR+=	Xaw3d
 SUBDIR+=	Xbae
 SUBDIR+=	Xfixes
 SUBDIR+=	XmHTML
@@ -15,6 +14,7 @@ SUBDIR+=	alacarte
 SUBDIR+=	antiright
 SUBDIR+=	appmenu-qt
 SUBDIR+=	appres
+SUBDIR+=	arandr
 SUBDIR+=	asnap
 SUBDIR+=	aterm
 SUBDIR+=	autocutsel
@@ -30,6 +30,7 @@ SUBDIR+=	clisp-gtk2
 SUBDIR+=	clisp-mit-clx
 SUBDIR+=	clisp-new-clx
 SUBDIR+=	compositeproto
+SUBDIR+=	compton
 SUBDIR+=	damageproto
 SUBDIR+=	deforaos-integration
 SUBDIR+=	deforaos-keyboard
@@ -46,6 +47,7 @@ SUBDIR+=	dri2proto
 SUBDIR+=	dri3proto
 SUBDIR+=	driconf
 SUBDIR+=	dtx11session
+SUBDIR+=	dunst
 SUBDIR+=	dxpc
 SUBDIR+=	ede
 SUBDIR+=	editres
@@ -67,6 +69,7 @@ SUBDIR+=	fltk2
 SUBDIR+=	fontcacheproto
 SUBDIR+=	fontsproto
 SUBDIR+=	fox
+SUBDIR+=	frameworkintegration
 SUBDIR+=	fspanel
 SUBDIR+=	ftmenu
 SUBDIR+=	fvwm-wharf
@@ -130,12 +133,16 @@ SUBDIR+=	hs-X11
 SUBDIR+=	hs-X11-xft
 SUBDIR+=	hsetroot
 SUBDIR+=	hyena
+SUBDIR+=	i3lock
 SUBDIR+=	iceauth
 SUBDIR+=	ico
 SUBDIR+=	imwheel
 SUBDIR+=	inputproto
 SUBDIR+=	kactivities
+SUBDIR+=	kactivities-stats
+SUBDIR+=	kactivities5
 SUBDIR+=	kbproto
+SUBDIR+=	kconfigwidgets
 SUBDIR+=	kde-baseapps4
 SUBDIR+=	kde-runtime4
 SUBDIR+=	kde-workspace4
@@ -258,15 +265,27 @@ SUBDIR+=	kde4-l10n-zh_CN
 SUBDIR+=	kde4-l10n-zh_TW
 SUBDIR+=	kdebase3
 SUBDIR+=	kdebindings-ruby
+SUBDIR+=	kded
 SUBDIR+=	kdelibdocs3
 SUBDIR+=	kdelibs3
 SUBDIR+=	kdelibs4
+SUBDIR+=	kdelibs4support
+SUBDIR+=	kdesignerplugin
 SUBDIR+=	keybinder
 SUBDIR+=	keylaunch
+SUBDIR+=	kglobalaccel
+SUBDIR+=	kguiaddons
+SUBDIR+=	kinit
+SUBDIR+=	kitemviews
+SUBDIR+=	kjobwidgets
 SUBDIR+=	kkbswitch
 SUBDIR+=	kmessage
 SUBDIR+=	konsole
 SUBDIR+=	kterm
+SUBDIR+=	ktextwidgets
+SUBDIR+=	kwidgetsaddons
+SUBDIR+=	kwindowsystem
+SUBDIR+=	kxmlgui
 SUBDIR+=	lablgtk1
 SUBDIR+=	labltk
 SUBDIR+=	lbxproxy
@@ -288,6 +307,7 @@ SUBDIR+=	libXevie
 SUBDIR+=	libXext
 SUBDIR+=	libXfixes
 SUBDIR+=	libXfont
+SUBDIR+=	libXfont2
 SUBDIR+=	libXft
 SUBDIR+=	libXi
 SUBDIR+=	libXinerama
@@ -311,7 +331,9 @@ SUBDIR+=	libdesktop-agnostic
 SUBDIR+=	libdrm
 SUBDIR+=	libfakekey
 SUBDIR+=	libgnomekbd
+SUBDIR+=	libkactivities4
 SUBDIR+=	liblbxutil
+SUBDIR+=	libmatekbd
 SUBDIR+=	liboldXrandr
 SUBDIR+=	libunique
 SUBDIR+=	libunique3
@@ -328,21 +350,40 @@ SUBDIR+=	libxshmfence
 SUBDIR+=	listres
 SUBDIR+=	lua-keybinder
 SUBDIR+=	luit
+SUBDIR+=	lxappearance
+SUBDIR+=	lxde-common
+SUBDIR+=	lxinput
+SUBDIR+=	lxlauncher
+SUBDIR+=	lxrandr
 SUBDIR+=	lxsession
+SUBDIR+=	lxterminal
 SUBDIR+=	matchbox-common
 SUBDIR+=	matchbox-desktop
 SUBDIR+=	matchbox-nest
 SUBDIR+=	matchbox-panel
 SUBDIR+=	matchbox-panel-manager
 SUBDIR+=	matchbox-themes-extra
+SUBDIR+=	mate-applets
+SUBDIR+=	mate-control-center
+SUBDIR+=	mate-desktop
+SUBDIR+=	mate-indicator-applet
+SUBDIR+=	mate-menus
+SUBDIR+=	mate-panel
+SUBDIR+=	mate-screensaver
+SUBDIR+=	mate-session-manager
+SUBDIR+=	mate-settings-daemon
+SUBDIR+=	mate-terminal
+SUBDIR+=	mcookie
 SUBDIR+=	mkcomposecache
 SUBDIR+=	mlterm
 SUBDIR+=	modeline
 SUBDIR+=	modular-xorg-server
 SUBDIR+=	modular-xorg-server112
 SUBDIR+=	modular-xorg-xephyr
+SUBDIR+=	modular-xorg-xquartz
 SUBDIR+=	motif
 SUBDIR+=	mowitz
+SUBDIR+=	mozo
 SUBDIR+=	mrxvt
 SUBDIR+=	multi-aterm
 SUBDIR+=	mxterm
@@ -351,7 +392,6 @@ SUBDIR+=	numlockx
 SUBDIR+=	ocaml-graphics
 SUBDIR+=	ocaml-lablgtk
 SUBDIR+=	oneko
-SUBDIR+=	openbsd-input-ws
 SUBDIR+=	p5-Alien-wxWidgets
 SUBDIR+=	p5-Clipboard
 SUBDIR+=	p5-Gtk2-Ex-FormFactory
@@ -362,6 +402,7 @@ SUBDIR+=	p5-X11-Protocol
 SUBDIR+=	p5-gtk2
 SUBDIR+=	paragui
 SUBDIR+=	pixman
+SUBDIR+=	plasma-framework
 SUBDIR+=	presentproto
 SUBDIR+=	printproto
 SUBDIR+=	proxymngr
@@ -407,7 +448,6 @@ SUBDIR+=	qt4-sqlite3
 SUBDIR+=	qt4-tiff
 SUBDIR+=	qt4-tools
 SUBDIR+=	qt5
-SUBDIR+=	qt5-dbus
 SUBDIR+=	qt5-mysql
 SUBDIR+=	qt5-odbc
 SUBDIR+=	qt5-psql
@@ -439,14 +479,15 @@ SUBDIR+=	qwt6-qt4
 SUBDIR+=	qwtplot3d-qt4
 SUBDIR+=	randrproto
 SUBDIR+=	ratmen
-SUBDIR+=	razor-qt
 SUBDIR+=	recordproto
+SUBDIR+=	redshift
 SUBDIR+=	rendercheck
 SUBDIR+=	renderproto
 SUBDIR+=	renderproto9
 SUBDIR+=	rep-gtk2
 SUBDIR+=	resourceproto
 SUBDIR+=	rgb
+SUBDIR+=	rofi
 SUBDIR+=	rox-session
 SUBDIR+=	rox-wallpaper
 SUBDIR+=	rstart
@@ -467,10 +508,12 @@ SUBDIR+=	slock
 SUBDIR+=	space_dapp
 SUBDIR+=	speyes
 SUBDIR+=	ssystem
+SUBDIR+=	st-term
 SUBDIR+=	stalonetray
 SUBDIR+=	startup-notification
 SUBDIR+=	startup-notification010
 SUBDIR+=	sxhkd
+SUBDIR+=	tabbed
 SUBDIR+=	tile
 SUBDIR+=	tint2
 SUBDIR+=	tk
@@ -495,14 +538,10 @@ SUBDIR+=	wmfstatus
 SUBDIR+=	wmweather
 SUBDIR+=	worker
 SUBDIR+=	wterm
-SUBDIR+=	wxGTK24
-SUBDIR+=	wxGTK26
-SUBDIR+=	wxGTK26-contrib
 SUBDIR+=	wxGTK28
 SUBDIR+=	wxGTK28-contrib
 SUBDIR+=	wxGTK30
 SUBDIR+=	wxWindows-docs
-SUBDIR+=	wxhaskell
 SUBDIR+=	x11perf
 SUBDIR+=	x11vnc
 SUBDIR+=	x2x
@@ -566,6 +605,8 @@ SUBDIR+=	xf86-input-mutouch
 SUBDIR+=	xf86-input-penmount
 SUBDIR+=	xf86-input-vmmouse
 SUBDIR+=	xf86-input-void
+SUBDIR+=	xf86-input-ws
+SUBDIR+=	xf86-video-amdgpu
 SUBDIR+=	xf86-video-apm
 SUBDIR+=	xf86-video-ark
 SUBDIR+=	xf86-video-ast
@@ -622,6 +663,7 @@ SUBDIR+=	xfce4-exo
 SUBDIR+=	xfce4-eyes-plugin
 SUBDIR+=	xfce4-garcon
 SUBDIR+=	xfce4-gtk2-engine
+SUBDIR+=	xfce4-indicator-plugin
 SUBDIR+=	xfce4-kbdleds-plugin
 SUBDIR+=	xfce4-notes-plugin
 SUBDIR+=	xfce4-notifyd
@@ -728,8 +770,10 @@ SUBDIR+=	xstdcmap
 SUBDIR+=	xteddy
 SUBDIR+=	xteddy2
 SUBDIR+=	xterm
+SUBDIR+=	xtermcontrol
 SUBDIR+=	xtermset
 SUBDIR+=	xtoolwait
+SUBDIR+=	xtrace
 SUBDIR+=	xtrans
 SUBDIR+=	xtrap
 SUBDIR+=	xtruss