head	1.6;
access;
symbols
	netbsd-11-0-RC4:1.6
	netbsd-11-0-RC3:1.6
	netbsd-11-0-RC2:1.6
	netbsd-11-0-RC1:1.6
	perseant-exfatfs-base-20250801:1.6
	netbsd-11:1.6.0.14
	netbsd-11-base:1.6
	netbsd-10-1-RELEASE:1.6
	perseant-exfatfs-base-20240630:1.6
	perseant-exfatfs:1.6.0.12
	perseant-exfatfs-base:1.6
	netbsd-8-3-RELEASE:1.5
	netbsd-9-4-RELEASE:1.6
	netbsd-10-0-RELEASE:1.6
	netbsd-10-0-RC6:1.6
	netbsd-10-0-RC5:1.6
	netbsd-10-0-RC4:1.6
	netbsd-10-0-RC3:1.6
	netbsd-10-0-RC2:1.6
	netbsd-10-0-RC1:1.6
	netbsd-10:1.6.0.10
	netbsd-10-base:1.6
	netbsd-9-3-RELEASE:1.6
	cjep_sun2x-base1:1.6
	cjep_sun2x:1.6.0.8
	cjep_sun2x-base:1.6
	cjep_staticlib_x-base1:1.6
	netbsd-9-2-RELEASE:1.6
	cjep_staticlib_x:1.6.0.6
	cjep_staticlib_x-base:1.6
	netbsd-9-1-RELEASE:1.6
	phil-wifi-20200421:1.6
	phil-wifi-20200411:1.6
	is-mlppp:1.6.0.4
	is-mlppp-base:1.6
	phil-wifi-20200406:1.6
	netbsd-8-2-RELEASE:1.5
	netbsd-9-0-RELEASE:1.6
	netbsd-9-0-RC2:1.6
	netbsd-9-0-RC1:1.6
	phil-wifi-20191119:1.6
	netbsd-9:1.6.0.2
	netbsd-9-base:1.6
	phil-wifi-20190609:1.6
	netbsd-8-1-RELEASE:1.5
	netbsd-8-1-RC1:1.5
	pgoyette-compat-merge-20190127:1.5.12.1
	pgoyette-compat-20190127:1.6
	pgoyette-compat-20190118:1.6
	pgoyette-compat-1226:1.5
	pgoyette-compat-1126:1.5
	pgoyette-compat-1020:1.5
	pgoyette-compat-0930:1.5
	pgoyette-compat-0906:1.5
	netbsd-7-2-RELEASE:1.4
	pgoyette-compat-0728:1.5
	netbsd-8-0-RELEASE:1.5
	phil-wifi:1.5.0.14
	phil-wifi-base:1.5
	pgoyette-compat-0625:1.5
	netbsd-8-0-RC2:1.5
	pgoyette-compat-0521:1.5
	pgoyette-compat-0502:1.5
	pgoyette-compat-0422:1.5
	netbsd-8-0-RC1:1.5
	pgoyette-compat-0415:1.5
	pgoyette-compat-0407:1.5
	pgoyette-compat-0330:1.5
	pgoyette-compat-0322:1.5
	pgoyette-compat-0315:1.5
	netbsd-7-1-2-RELEASE:1.4
	pgoyette-compat:1.5.0.12
	pgoyette-compat-base:1.5
	netbsd-7-1-1-RELEASE:1.4
	matt-nb8-mediatek:1.5.0.10
	matt-nb8-mediatek-base:1.5
	perseant-stdc-iso10646:1.5.0.8
	perseant-stdc-iso10646-base:1.5
	netbsd-8:1.5.0.6
	netbsd-8-base:1.5
	prg-localcount2-base3:1.5
	prg-localcount2-base2:1.5
	prg-localcount2-base1:1.5
	prg-localcount2:1.5.0.4
	prg-localcount2-base:1.5
	pgoyette-localcount-20170426:1.5
	bouyer-socketcan-base1:1.5
	pgoyette-localcount-20170320:1.5
	netbsd-7-1:1.4.0.32
	netbsd-7-1-RELEASE:1.4
	netbsd-7-1-RC2:1.4
	netbsd-7-nhusb-base-20170116:1.4
	bouyer-socketcan:1.5.0.2
	bouyer-socketcan-base:1.5
	pgoyette-localcount-20170107:1.5
	netbsd-7-1-RC1:1.4
	pgoyette-localcount-20161104:1.5
	netbsd-7-0-2-RELEASE:1.4
	localcount-20160914:1.5
	netbsd-7-nhusb:1.4.0.30
	netbsd-7-nhusb-base:1.4
	pgoyette-localcount-20160806:1.4
	pgoyette-localcount-20160726:1.4
	pgoyette-localcount:1.4.0.28
	pgoyette-localcount-base:1.4
	netbsd-7-0-1-RELEASE:1.4
	netbsd-7-0:1.4.0.26
	netbsd-7-0-RELEASE:1.4
	netbsd-7-0-RC3:1.4
	netbsd-7-0-RC2:1.4
	netbsd-7-0-RC1:1.4
	netbsd-5-2-3-RELEASE:1.3.8.1
	netbsd-5-1-5-RELEASE:1.3.8.1
	netbsd-6-0-6-RELEASE:1.4
	netbsd-6-1-5-RELEASE:1.4
	netbsd-7:1.4.0.24
	netbsd-7-base:1.4
	yamt-pagecache-base9:1.4
	yamt-pagecache-tag8:1.4
	netbsd-6-1-4-RELEASE:1.4
	netbsd-6-0-5-RELEASE:1.4
	tls-earlyentropy:1.4.0.22
	tls-earlyentropy-base:1.4
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.4
	riastradh-drm2-base3:1.4
	netbsd-6-1-3-RELEASE:1.4
	netbsd-6-0-4-RELEASE:1.4
	netbsd-5-2-2-RELEASE:1.3.8.1
	netbsd-5-1-4-RELEASE:1.3.8.1
	netbsd-6-1-2-RELEASE:1.4
	netbsd-6-0-3-RELEASE:1.4
	netbsd-5-2-1-RELEASE:1.3.8.1
	netbsd-5-1-3-RELEASE:1.3.8.1
	netbsd-6-1-1-RELEASE:1.4
	riastradh-drm2-base2:1.4
	riastradh-drm2-base1:1.4
	riastradh-drm2:1.4.0.16
	riastradh-drm2-base:1.4
	netbsd-6-1:1.4.0.20
	netbsd-6-0-2-RELEASE:1.4
	netbsd-6-1-RELEASE:1.4
	netbsd-6-1-RC4:1.4
	netbsd-6-1-RC3:1.4
	agc-symver:1.4.0.18
	agc-symver-base:1.4
	netbsd-6-1-RC2:1.4
	netbsd-6-1-RC1:1.4
	yamt-pagecache-base8:1.4
	netbsd-5-2:1.3.8.1.0.6
	netbsd-6-0-1-RELEASE:1.4
	yamt-pagecache-base7:1.4
	netbsd-5-2-RELEASE:1.3.8.1
	netbsd-5-2-RC1:1.3.8.1
	matt-nb6-plus-nbase:1.4
	yamt-pagecache-base6:1.4
	netbsd-6-0:1.4.0.14
	netbsd-6-0-RELEASE:1.4
	netbsd-6-0-RC2:1.4
	tls-maxphys:1.4.0.12
	tls-maxphys-base:1.4
	matt-nb6-plus:1.4.0.10
	matt-nb6-plus-base:1.4
	netbsd-6-0-RC1:1.4
	yamt-pagecache-base5:1.4
	yamt-pagecache-base4:1.4
	netbsd-6:1.4.0.8
	netbsd-6-base:1.4
	netbsd-5-1-2-RELEASE:1.3.8.1
	netbsd-5-1-1-RELEASE:1.3.8.1
	yamt-pagecache-base3:1.4
	yamt-pagecache-base2:1.4
	yamt-pagecache:1.4.0.6
	yamt-pagecache-base:1.4
	cherry-xenmp:1.4.0.4
	cherry-xenmp-base:1.4
	bouyer-quota2-nbase:1.4
	bouyer-quota2:1.4.0.2
	bouyer-quota2-base:1.4
	matt-mips64-premerge-20101231:1.4
	matt-nb5-mips64-premerge-20101231:1.3.14.1
	matt-nb5-pq3:1.3.8.1.0.4
	matt-nb5-pq3-base:1.3.8.1
	pre-xorg-192:1.4
	netbsd-5-1:1.3.8.1.0.2
	netbsd-5-1-RELEASE:1.3.8.1
	netbsd-5-1-RC4:1.3.8.1
	matt-nb5-mips64-k15:1.3.14.1
	netbsd-5-1-RC3:1.3.8.1
	netbsd-5-1-RC2:1.3.8.1
	netbsd-5-1-RC1:1.3.8.1
	netbsd-5-0-2-RELEASE:1.3
	matt-nb5-mips64-premerge-20091211:1.3
	matt-premerge-20091211:1.4
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3
	matt-nb4-mips64-k7-u2a-k9b:1.3
	matt-nb5-mips64-u1-k1-k5:1.3
	matt-nb5-mips64:1.3.0.14
	netbsd-5-0-1-RELEASE:1.3
	jym-xensuspend-nbase:1.3
	netbsd-5-0:1.3.0.12
	netbsd-5-0-RELEASE:1.3
	netbsd-5-0-RC4:1.3
	netbsd-5-0-RC3:1.3
	netbsd-5-0-RC2:1.3
	jym-xensuspend:1.3.0.10
	jym-xensuspend-base:1.3
	netbsd-5-0-RC1:1.3
	haad-dm-base:1.3
	haad-dm-base2:1.3
	haad-nbase2:1.3
	netbsd-5:1.3.0.8
	netbsd-5-base:1.3
	matt-mips64-base2:1.3
	haad-dm:1.3.0.6
	haad-dm-base1:1.3
	wrstuden-revivesa-base-3:1.3
	wrstuden-revivesa:1.3.0.2
	wrstuden-revivesa-base-2:1.3;
locks; strict;
comment	@# @;


1.6
date	2018.12.31.11.14.05;	author mrg;	state Exp;
branches;
next	1.5;
commitid	TUVjjF1MdjrmtW5B;

1.5
date	2016.08.12.01.15.51;	author mrg;	state Exp;
branches
	1.5.12.1
	1.5.14.1;
next	1.4;
commitid	5GiziC5fk8bIaXhz;

1.4
date	2009.06.12.01.59.06;	author mrg;	state Exp;
branches;
next	1.3;

1.3
date	2008.08.24.13.47.05;	author rtr;	state Exp;
branches
	1.3.2.1
	1.3.6.1
	1.3.8.1
	1.3.14.1;
next	1.2;

1.2
date	2008.08.15.15.55.06;	author rtr;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.06.05.10.40;	author mrg;	state Exp;
branches;
next	;

1.5.12.1
date	2019.01.18.08.49.08;	author pgoyette;	state Exp;
branches;
next	;
commitid	Lmlzg3OVT2cd6f8B;

1.5.14.1
date	2019.06.10.22.02.49;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.3.2.1
date	2008.08.24.13.47.05;	author wrstuden;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2008.09.18.05.18.47;	author wrstuden;	state Exp;
branches;
next	;

1.3.6.1
date	2008.08.24.13.47.05;	author haad;	state dead;
branches;
next	1.3.6.2;

1.3.6.2
date	2008.10.19.22.41.20;	author haad;	state Exp;
branches;
next	;

1.3.8.1
date	2009.09.17.04.24.41;	author snj;	state Exp;
branches;
next	;

1.3.14.1
date	2010.04.21.05.24.46;	author matt;	state Exp;
branches;
next	;


desc
@@


1.6
log
@build updates for xorg-server 1.20.3:
- moved/removed/new files
- don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using
  ${X11FLAGS.DIX} -- already included.

put glxvnd into glx itself for now.
@
text
@# $NetBSD: Makefile,v 1.5 2016/08/12 01:15:51 mrg Exp $

XMODULEDIR=	${X11USRLIBDIR}/modules

.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"

LIB=	vbe

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS=	vbe.c vbeModes.c vbe_module.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/Xext \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/include \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${X11SRCDIR.xorg-server}/../include

# XXX
COPTS.vbe.c=	-Wno-error

.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
.include <bsd.lib.mk>
@


1.5
log
@round do of reach over updates for xorg-server 1.18.  again, untested,
but this should be much closer to complete for the necessary changes.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
d24 2
a25 1
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10
@


1.5.14.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 2018/12/31 11:14:05 mrg Exp $
d24 1
a24 2
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${X11SRCDIR.xorg-server}/../include
@


1.5.12.1
log
@Synch with HEAD
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 2016/08/12 01:15:51 mrg Exp $
d24 1
a24 2
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${X11SRCDIR.xorg-server}/../include
@


1.4
log
@build updates for xorg-server 1.6.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
d23 1
@


1.3
log
@use XORG_VERSION_CURRENT defined in Makefile.serverlib instead of
defining it all over the shop
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
d15 1
@


1.3.14.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:41 snj Exp $
a14 1
		-I${X11SRCDIR.xorg-server}/Xext \
@


1.3.8.1
log
@Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
a14 1
		-I${X11SRCDIR.xorg-server}/Xext \
@


1.3.6.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:20 +0000
@
text
@d1 29
@


1.3.6.2
log
@Sync with HEAD.
@
text
@a0 29
# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $

XMODULEDIR=	${X11USRLIBDIR}/modules

.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"

LIB=	vbe

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS=	vbe.c vbeModes.c vbe_module.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/include \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10

# XXX
COPTS.vbe.c=	-Wno-error

.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
.include <bsd.lib.mk>
@


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


1.3.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 29
# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $

XMODULEDIR=	${X11USRLIBDIR}/modules

.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"

LIB=	vbe

.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS=	vbe.c vbeModes.c vbe_module.c

CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
		-I${X11SRCDIR.xorg-server}/mi \
		-I${X11SRCDIR.xorg-server}/include \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/pixman-1 \
		-I${DESTDIR}${X11INCDIR}/xorg \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10

# XXX
COPTS.vbe.c=	-Wno-error

.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
.include <bsd.lib.mk>
@


1.2
log
@stop using XSERVERINCDIR since it was referencing src/x11 reachover
this is not correct for xorg reachover
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1 2008/08/06 05:10:40 mrg Exp $
a23 2
CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}

@


1.1
log
@build the modes, shadowfb, vbe, vgahw and xaa subdirs from hw/xfree86.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3.4.2 2004/11/21 10:01:27 rtr Exp $
d22 1
a22 2
		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
		-I${XSERVERINCDIR}
@