head	1.8;
access;
symbols
	netbsd-11-0-RC4:1.8
	netbsd-11-0-RC3:1.8
	netbsd-11-0-RC2:1.8
	netbsd-11-0-RC1:1.8
	perseant-exfatfs-base-20250801:1.8
	netbsd-11:1.8.0.4
	netbsd-11-base:1.8
	netbsd-10-1-RELEASE:1.7
	perseant-exfatfs-base-20240630:1.8
	perseant-exfatfs:1.8.0.2
	perseant-exfatfs-base:1.8
	netbsd-8-3-RELEASE:1.7
	netbsd-9-4-RELEASE:1.7
	netbsd-10-0-RELEASE:1.7
	netbsd-10-0-RC6:1.7
	netbsd-10-0-RC5:1.7
	netbsd-10-0-RC4:1.7
	netbsd-10-0-RC3:1.7
	netbsd-10-0-RC2:1.7
	netbsd-10-0-RC1:1.7
	netbsd-10:1.7.0.26
	netbsd-10-base:1.7
	netbsd-9-3-RELEASE:1.7
	cjep_sun2x-base1:1.7
	cjep_sun2x:1.7.0.24
	cjep_sun2x-base:1.7
	cjep_staticlib_x-base1:1.7
	netbsd-9-2-RELEASE:1.7
	cjep_staticlib_x:1.7.0.22
	cjep_staticlib_x-base:1.7
	netbsd-9-1-RELEASE:1.7
	phil-wifi-20200421:1.7
	phil-wifi-20200411:1.7
	is-mlppp:1.7.0.20
	is-mlppp-base:1.7
	phil-wifi-20200406:1.7
	netbsd-8-2-RELEASE:1.7
	netbsd-9-0-RELEASE:1.7
	netbsd-9-0-RC2:1.7
	netbsd-9-0-RC1:1.7
	phil-wifi-20191119:1.7
	netbsd-9:1.7.0.18
	netbsd-9-base:1.7
	phil-wifi-20190609:1.7
	netbsd-8-1-RELEASE:1.7
	netbsd-8-1-RC1:1.7
	pgoyette-compat-merge-20190127:1.7
	pgoyette-compat-20190127:1.7
	pgoyette-compat-20190118:1.7
	pgoyette-compat-1226:1.7
	pgoyette-compat-1126:1.7
	pgoyette-compat-1020:1.7
	pgoyette-compat-0930:1.7
	pgoyette-compat-0906:1.7
	netbsd-7-2-RELEASE:1.6
	pgoyette-compat-0728:1.7
	netbsd-8-0-RELEASE:1.7
	phil-wifi:1.7.0.16
	phil-wifi-base:1.7
	pgoyette-compat-0625:1.7
	netbsd-8-0-RC2:1.7
	pgoyette-compat-0521:1.7
	pgoyette-compat-0502:1.7
	pgoyette-compat-0422:1.7
	netbsd-8-0-RC1:1.7
	pgoyette-compat-0415:1.7
	pgoyette-compat-0407:1.7
	pgoyette-compat-0330:1.7
	pgoyette-compat-0322:1.7
	pgoyette-compat-0315:1.7
	netbsd-7-1-2-RELEASE:1.6
	pgoyette-compat:1.7.0.14
	pgoyette-compat-base:1.7
	netbsd-7-1-1-RELEASE:1.6
	matt-nb8-mediatek:1.7.0.12
	matt-nb8-mediatek-base:1.7
	perseant-stdc-iso10646:1.7.0.10
	perseant-stdc-iso10646-base:1.7
	netbsd-8:1.7.0.8
	netbsd-8-base:1.7
	prg-localcount2-base3:1.7
	prg-localcount2-base2:1.7
	prg-localcount2-base1:1.7
	prg-localcount2:1.7.0.6
	prg-localcount2-base:1.7
	pgoyette-localcount-20170426:1.7
	bouyer-socketcan-base1:1.7
	pgoyette-localcount-20170320:1.7
	netbsd-7-1:1.6.0.10
	netbsd-7-1-RELEASE:1.6
	netbsd-7-1-RC2:1.6
	netbsd-7-nhusb-base-20170116:1.6
	bouyer-socketcan:1.7.0.4
	bouyer-socketcan-base:1.7
	pgoyette-localcount-20170107:1.7
	netbsd-7-1-RC1:1.6
	pgoyette-localcount-20161104:1.7
	netbsd-7-0-2-RELEASE:1.6
	localcount-20160914:1.7
	netbsd-7-nhusb:1.6.0.8
	netbsd-7-nhusb-base:1.6
	pgoyette-localcount-20160806:1.7
	pgoyette-localcount-20160726:1.7
	pgoyette-localcount:1.7.0.2
	pgoyette-localcount-base:1.7
	netbsd-7-0-1-RELEASE:1.6
	netbsd-7-0:1.6.0.6
	netbsd-7-0-RELEASE:1.6
	netbsd-7-0-RC3:1.6
	netbsd-7-0-RC2:1.6
	netbsd-7-0-RC1:1.6
	netbsd-5-2-3-RELEASE:1.1.1.1
	netbsd-5-1-5-RELEASE:1.1.1.1
	netbsd-6-0-6-RELEASE:1.3
	netbsd-6-1-5-RELEASE:1.3
	netbsd-7:1.6.0.4
	netbsd-7-base:1.6
	yamt-pagecache-base9:1.6
	yamt-pagecache-tag8:1.3
	netbsd-6-1-4-RELEASE:1.3
	netbsd-6-0-5-RELEASE:1.3
	tls-earlyentropy:1.6.0.2
	tls-earlyentropy-base:1.6
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6
	riastradh-drm2-base3:1.6
	netbsd-6-1-3-RELEASE:1.3
	netbsd-6-0-4-RELEASE:1.3
	netbsd-5-2-2-RELEASE:1.1.1.1
	netbsd-5-1-4-RELEASE:1.1.1.1
	netbsd-6-1-2-RELEASE:1.3
	netbsd-6-0-3-RELEASE:1.3
	netbsd-5-2-1-RELEASE:1.1.1.1
	netbsd-5-1-3-RELEASE:1.1.1.1
	netbsd-6-1-1-RELEASE:1.3
	riastradh-drm2-base2:1.5
	riastradh-drm2-base1:1.5
	riastradh-drm2:1.5.0.2
	riastradh-drm2-base:1.5
	netbsd-6-1:1.3.0.20
	netbsd-6-0-2-RELEASE:1.3
	netbsd-6-1-RELEASE:1.3
	netbsd-6-1-RC4:1.3
	netbsd-6-1-RC3:1.3
	agc-symver:1.3.0.18
	agc-symver-base:1.3
	netbsd-6-1-RC2:1.3
	netbsd-6-1-RC1:1.3
	yamt-pagecache-base8:1.3
	netbsd-5-2:1.1.1.1.0.4
	netbsd-6-0-1-RELEASE:1.3
	yamt-pagecache-base7:1.3
	netbsd-5-2-RELEASE:1.1.1.1
	netbsd-5-2-RC1:1.1.1.1
	matt-nb6-plus-nbase:1.3
	yamt-pagecache-base6:1.3
	netbsd-6-0:1.3.0.14
	netbsd-6-0-RELEASE:1.3
	netbsd-6-0-RC2:1.3
	tls-maxphys:1.3.0.12
	tls-maxphys-base:1.6
	matt-nb6-plus:1.3.0.10
	matt-nb6-plus-base:1.3
	netbsd-6-0-RC1:1.3
	yamt-pagecache-base5:1.3
	yamt-pagecache-base4:1.3
	netbsd-6:1.3.0.8
	netbsd-6-base:1.3
	netbsd-5-1-2-RELEASE:1.1.1.1
	netbsd-5-1-1-RELEASE:1.1.1.1
	yamt-pagecache-base3:1.3
	yamt-pagecache-base2:1.3
	yamt-pagecache:1.3.0.6
	yamt-pagecache-base:1.3
	cherry-xenmp:1.3.0.4
	cherry-xenmp-base:1.3
	bouyer-quota2-nbase:1.3
	bouyer-quota2:1.3.0.2
	bouyer-quota2-base:1.3
	matt-mips64-premerge-20101231:1.3
	matt-nb5-mips64-premerge-20101231:1.1.1.1
	matt-nb5-pq3:1.1.1.1.0.18
	matt-nb5-pq3-base:1.1.1.1
	netbsd-5-1:1.1.1.1.0.16
	netbsd-5-1-RELEASE:1.1.1.1
	netbsd-5-1-RC4:1.1.1.1
	matt-nb5-mips64-k15:1.1.1.1
	netbsd-5-1-RC3:1.1.1.1
	netbsd-5-1-RC2:1.1.1.1
	netbsd-5-1-RC1:1.1.1.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	matt-nb5-mips64-premerge-20091211:1.1.1.1
	matt-premerge-20091211:1.2
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1.1.1
	matt-nb4-mips64-k7-u2a-k9b:1.1.1.1
	matt-nb5-mips64-u1-k1-k5:1.1.1.1
	matt-nb5-mips64:1.1.1.1.0.14
	netbsd-5-0-1-RELEASE:1.1.1.1
	jym-xensuspend-nbase:1.1.1.1
	netbsd-5-0:1.1.1.1.0.12
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	jym-xensuspend:1.1.1.1.0.10
	jym-xensuspend-base:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	haad-dm-base:1.1.1.1
	haad-dm-base2:1.1.1.1
	haad-nbase2:1.1.1.1
	netbsd-5:1.1.1.1.0.8
	netbsd-5-base:1.1.1.1
	matt-mips64-base2:1.1.1.1
	haad-dm:1.1.1.1.0.6
	haad-dm-base1:1.1.1.1
	wrstuden-revivesa-base-3:1.1.1.1
	wrstuden-revivesa:1.1.1.1.0.2
	wrstuden-revivesa-base-2:1.1.1.1
	oinkoink:1.1.1.1
	mrg-and-rtr:1.1.1;
locks; strict;
comment	@# @;


1.8
date	2024.05.09.06.34.50;	author nia;	state Exp;
branches;
next	1.7;
commitid	Ek23ERpmZqc94i9F;

1.7
date	2015.07.19.19.49.18;	author mrg;	state Exp;
branches
	1.7.24.1;
next	1.6;
commitid	hhfyQS4Yrs42SVty;

1.6
date	2013.09.29.14.34.30;	author christos;	state Exp;
branches;
next	1.5;
commitid	jrpq8gO972xphl7x;

1.5
date	2013.05.31.06.47.31;	author mrg;	state Exp;
branches;
next	1.4;
commitid	VZLDZnlwR8NjAKRw;

1.4
date	2013.05.31.06.24.05;	author mrg;	state Exp;
branches;
next	1.3;
commitid	aK9smXZGMoMisKRw;

1.3
date	2010.05.22.02.40.40;	author mrg;	state Exp;
branches
	1.3.6.1
	1.3.12.1;
next	1.2;

1.2
date	2009.11.09.07.01.03;	author mrg;	state Exp;
branches;
next	1.1;

1.1
date	2008.07.29.05.01.22;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.7.24.1
date	2021.06.06.20.30.46;	author cjep;	state Exp;
branches;
next	;
commitid	XNEGuB48YPLw17WC;

1.3.6.1
date	2014.05.22.14.09.37;	author yamt;	state Exp;
branches;
next	;
commitid	FFQX08bYGKywAxBx;

1.3.12.1
date	2013.06.23.06.28.40;	author tls;	state Exp;
branches;
next	1.3.12.2;
commitid	OnlO1cBgtQRcIHUw;

1.3.12.2
date	2014.08.20.00.00.09;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.1.1.1
date	2008.07.29.05.01.22;	author mrg;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.6.1;
next	;

1.1.1.1.2.1
date	2008.07.29.05.01.22;	author wrstuden;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2008.09.18.05.18.29;	author wrstuden;	state Exp;
branches;
next	;

1.1.1.1.6.1
date	2008.07.29.05.01.22;	author haad;	state dead;
branches;
next	1.1.1.1.6.2;

1.1.1.1.6.2
date	2008.10.19.22.41.00;	author haad;	state Exp;
branches;
next	;


desc
@@


1.8
log
@stop using and linking against libXxf86misc

support for this extension was removed from xorg in 2008,
our xorg-server and our xorg-server.old can't use it.
@
text
@#	$NetBSD: Makefile,v 1.7 2015/07/19 19:49:18 mrg Exp $

.include <bsd.own.mk>

# XXX add composite lib support

PROG=	xdpyinfo

CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H

LDADD+=	-lXtst -lXi -lXrender -lXinerama -lXcomposite \
	-lXxf86vm -lXxf86dga -lXext -lX11 \
	-lxcb -lX11-xcb
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11} \
	${LIBXCB} ${LIBX11XCB}

.PATH:	${X11SRCDIR.${PROG}}
.PATH:	${X11SRCDIR.${PROG}}/man

COPTS.xdpyinfo.c+=	-Wno-error	# xf86vmstr.h

.include "../../xorg-pkg-ver.mk"

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.7
log
@build updates for various x11 apps being updated.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2013/09/29 14:34:30 christos Exp $
d12 1
a12 1
	-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
d15 1
a15 1
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
@


1.7.24.1
log
@sync with head
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2015/07/19 19:49:18 mrg Exp $
a10 1
# XXX all libraries are +1 on X11 or +1 on XEXT
d12 2
a13 1
	-lXxf86vm -lXxf86dga -lXxf86misc ${XLIBLDADD_XEXT} -lX11-xcb
d15 2
a16 1
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${XLIBDPADD_XEXT} ${LIBX11XCB}
@


1.6
log
@need -lxcb
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2013/05/31 06:47:31 mrg Exp $
d23 2
@


1.5
log
@convert to generated config.h.  add libX11-xcb.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2013/05/31 06:24:05 mrg Exp $
d13 1
a13 1
	-lX11-xcb
d16 1
a16 1
	${LIBX11XCB}
@


1.4
log
@find manuals moved into man/ subdirs.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2010/05/22 02:40:40 mrg Exp $
d9 1
a9 2
CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
CPPFLAGS+=-DPANORAMIX -DXF86VIDMODE -DXFreeXDGA -DXF86MISC
d11 6
a16 4
LDADD+=	-lXtst -lXi -lXrender -lXinerama \
	-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} \
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}
@


1.3
log
@apply -Wno-error in several places where new X11 headers warn about
being used (but in many cases, there are no new versions that don't
use them...)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2009/11/09 07:01:03 mrg Exp $
d18 1
@


1.3.6.1
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2010/05/22 02:40:40 mrg Exp $
d9 2
a10 1
CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
d12 4
a15 6
LDADD+=	-lXtst -lXi -lXrender -lXinerama -lXcomposite \
	-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
	-lxcb -lX11-xcb
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
	${LIBXCB} ${LIBX11XCB}
a17 1
.PATH:	${X11SRCDIR.${PROG}}/man
@


1.3.12.1
log
@resync from head
@
text
@d1 1
a1 1
#	$NetBSD$
d9 2
a10 1
CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
d12 4
a15 6
LDADD+=	-lXtst -lXi -lXrender -lXinerama -lXcomposite \
	-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
	-lX11-xcb
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
	${LIBX11XCB}
a17 1
.PATH:	${X11SRCDIR.${PROG}}/man
@


1.3.12.2
log
@Rebase to HEAD as of a few days ago.
@
text
@d13 1
a13 1
	-lxcb -lX11-xcb
d16 1
a16 1
	${LIBXCB} ${LIBX11XCB}
@


1.2
log
@add a note about adding compositing libs support
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
d19 2
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:17 lukem Exp $
d5 2
@


1.1.1.1
log
@initial import of the crossbuild framework for modular Xorg.  this
is heavily based upon the work rtr@@ did on src/x11, but hacked to
work for modern modular Xorg source split.

the sources will live in xsrc/external/mit/<package>/dist.

documentation on using this will come when the above directories
are fully populated.  there are 192 of them so it may take some time
before that is completed.
@
text
@@


1.1.1.1.6.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:00 +0000
@
text
@d1 18
@


1.1.1.1.6.2
log
@Sync with HEAD.
@
text
@a0 18
#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $

.include <bsd.own.mk>

PROG=	xdpyinfo

CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
CPPFLAGS+=-DPANORAMIX -DXF86VIDMODE -DXFreeXDGA -DXF86MISC

LDADD+=	-lXtst -lXi -lXrender -lXinerama \
	-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} \
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}

.PATH:	${X11SRCDIR.${PROG}}

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@


1.1.1.1.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:29 +0000
@
text
@d1 18
@


1.1.1.1.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 18
#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $

.include <bsd.own.mk>

PROG=	xdpyinfo

CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
CPPFLAGS+=-DPANORAMIX -DXF86VIDMODE -DXFreeXDGA -DXF86MISC

LDADD+=	-lXtst -lXi -lXrender -lXinerama \
	-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} \
	${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}

.PATH:	${X11SRCDIR.${PROG}}

.include <bsd.x11.mk>
.include <bsd.prog.mk>
@