head	1.12;
access;
symbols
	netbsd-11-0-RC4:1.12
	netbsd-11-0-RC3:1.12
	netbsd-11-0-RC2:1.12
	netbsd-11-0-RC1:1.12
	perseant-exfatfs-base-20250801:1.12
	netbsd-11:1.12.0.2
	netbsd-11-base:1.12
	netbsd-10-1-RELEASE:1.11
	perseant-exfatfs-base-20240630:1.11
	perseant-exfatfs:1.11.0.8
	perseant-exfatfs-base:1.11
	netbsd-8-3-RELEASE:1.6.34.1
	netbsd-9-4-RELEASE:1.7.2.1
	netbsd-10-0-RELEASE:1.11
	netbsd-10-0-RC6:1.11
	netbsd-10-0-RC5:1.11
	netbsd-10-0-RC4:1.11
	netbsd-10-0-RC3:1.11
	netbsd-10-0-RC2:1.11
	netbsd-10-0-RC1:1.11
	netbsd-10:1.11.0.6
	netbsd-10-base:1.11
	netbsd-9-3-RELEASE:1.7.2.1
	cjep_sun2x-base1:1.11
	cjep_sun2x:1.11.0.4
	cjep_sun2x-base:1.11
	cjep_staticlib_x-base1:1.11
	netbsd-9-2-RELEASE:1.7.2.1
	cjep_staticlib_x:1.11.0.2
	cjep_staticlib_x-base:1.11
	netbsd-9-1-RELEASE:1.7.2.1
	phil-wifi-20200421:1.7
	phil-wifi-20200411:1.7
	is-mlppp:1.7.0.4
	is-mlppp-base:1.7
	phil-wifi-20200406:1.7
	netbsd-8-2-RELEASE:1.6.34.1
	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.2
	netbsd-9-base:1.7
	phil-wifi-20190609:1.7
	netbsd-8-1-RELEASE:1.6.34.1
	netbsd-8-1-RC1:1.6.34.1
	pgoyette-compat-merge-20190127:1.6
	pgoyette-compat-20190127:1.6
	pgoyette-compat-20190118:1.6
	pgoyette-compat-1226:1.6
	pgoyette-compat-1126:1.6
	pgoyette-compat-1020:1.6
	pgoyette-compat-0930:1.6
	pgoyette-compat-0906:1.6
	netbsd-7-2-RELEASE:1.6
	pgoyette-compat-0728:1.6
	netbsd-8-0-RELEASE:1.6
	phil-wifi:1.6.0.42
	phil-wifi-base:1.6
	pgoyette-compat-0625:1.6
	netbsd-8-0-RC2:1.6
	pgoyette-compat-0521:1.6
	pgoyette-compat-0502:1.6
	pgoyette-compat-0422:1.6
	netbsd-8-0-RC1:1.6
	pgoyette-compat-0415:1.6
	pgoyette-compat-0407:1.6
	pgoyette-compat-0330:1.6
	pgoyette-compat-0322:1.6
	pgoyette-compat-0315:1.6
	netbsd-7-1-2-RELEASE:1.6
	pgoyette-compat:1.6.0.40
	pgoyette-compat-base:1.6
	netbsd-7-1-1-RELEASE:1.6
	matt-nb8-mediatek:1.6.0.38
	matt-nb8-mediatek-base:1.6
	perseant-stdc-iso10646:1.6.0.36
	perseant-stdc-iso10646-base:1.6
	netbsd-8:1.6.0.34
	netbsd-8-base:1.6
	prg-localcount2-base3:1.6
	prg-localcount2-base2:1.6
	prg-localcount2-base1:1.6
	prg-localcount2:1.6.0.32
	prg-localcount2-base:1.6
	pgoyette-localcount-20170426:1.6
	bouyer-socketcan-base1:1.6
	pgoyette-localcount-20170320:1.6
	netbsd-7-1:1.6.0.30
	netbsd-7-1-RELEASE:1.6
	netbsd-7-1-RC2:1.6
	netbsd-7-nhusb-base-20170116:1.6
	bouyer-socketcan:1.6.0.28
	bouyer-socketcan-base:1.6
	pgoyette-localcount-20170107:1.6
	netbsd-7-1-RC1:1.6
	pgoyette-localcount-20161104:1.6
	netbsd-7-0-2-RELEASE:1.6
	localcount-20160914:1.6
	netbsd-7-nhusb:1.6.0.26
	netbsd-7-nhusb-base:1.6
	pgoyette-localcount-20160806:1.6
	pgoyette-localcount-20160726:1.6
	pgoyette-localcount:1.6.0.24
	pgoyette-localcount-base:1.6
	netbsd-7-0-1-RELEASE:1.6
	netbsd-7-0:1.6.0.22
	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.4
	netbsd-5-1-5-RELEASE:1.4
	netbsd-6-0-6-RELEASE:1.6
	netbsd-6-1-5-RELEASE:1.6
	netbsd-7:1.6.0.20
	netbsd-7-base:1.6
	yamt-pagecache-base9:1.6
	yamt-pagecache-tag8:1.6
	netbsd-6-1-4-RELEASE:1.6
	netbsd-6-0-5-RELEASE:1.6
	tls-earlyentropy:1.6.0.18
	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.6
	netbsd-6-0-4-RELEASE:1.6
	netbsd-5-2-2-RELEASE:1.4
	netbsd-5-1-4-RELEASE:1.4
	netbsd-6-1-2-RELEASE:1.6
	netbsd-6-0-3-RELEASE:1.6
	netbsd-5-2-1-RELEASE:1.4
	netbsd-5-1-3-RELEASE:1.4
	netbsd-6-1-1-RELEASE:1.6
	riastradh-drm2-base2:1.6
	riastradh-drm2-base1:1.6
	riastradh-drm2:1.6.0.12
	riastradh-drm2-base:1.6
	netbsd-6-1:1.6.0.16
	netbsd-6-0-2-RELEASE:1.6
	netbsd-6-1-RELEASE:1.6
	netbsd-6-1-RC4:1.6
	netbsd-6-1-RC3:1.6
	agc-symver:1.6.0.14
	agc-symver-base:1.6
	netbsd-6-1-RC2:1.6
	netbsd-6-1-RC1:1.6
	yamt-pagecache-base8:1.6
	netbsd-5-2:1.4.0.16
	netbsd-6-0-1-RELEASE:1.6
	yamt-pagecache-base7:1.6
	netbsd-5-2-RELEASE:1.4
	netbsd-5-2-RC1:1.4
	matt-nb6-plus-nbase:1.6
	yamt-pagecache-base6:1.6
	netbsd-6-0:1.6.0.10
	netbsd-6-0-RELEASE:1.6
	netbsd-6-0-RC2:1.6
	tls-maxphys:1.6.0.8
	tls-maxphys-base:1.6
	matt-nb6-plus:1.6.0.6
	matt-nb6-plus-base:1.6
	netbsd-6-0-RC1:1.6
	yamt-pagecache-base5:1.6
	yamt-pagecache-base4:1.6
	netbsd-6:1.6.0.4
	netbsd-6-base:1.6
	netbsd-5-1-2-RELEASE:1.4
	netbsd-5-1-1-RELEASE:1.4
	yamt-pagecache-base3:1.6
	yamt-pagecache-base2:1.6
	yamt-pagecache:1.6.0.2
	yamt-pagecache-base:1.6
	cherry-xenmp:1.5.0.4
	cherry-xenmp-base:1.5
	bouyer-quota2-nbase:1.5
	bouyer-quota2:1.5.0.2
	bouyer-quota2-base:1.5
	matt-mips64-premerge-20101231:1.5
	matt-nb5-mips64-premerge-20101231:1.4
	matt-nb5-pq3:1.4.0.14
	matt-nb5-pq3-base:1.4
	netbsd-5-1:1.4.0.12
	netbsd-5-1-RELEASE:1.4
	netbsd-5-1-RC4:1.4
	matt-nb5-mips64-k15:1.4
	netbsd-5-1-RC3:1.4
	netbsd-5-1-RC2:1.4
	netbsd-5-1-RC1:1.4
	netbsd-5-0-2-RELEASE:1.4
	matt-nb5-mips64-premerge-20091211:1.4
	matt-premerge-20091211:1.4
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.4
	matt-nb4-mips64-k7-u2a-k9b:1.4
	matt-nb5-mips64-u1-k1-k5:1.4
	matt-nb5-mips64:1.4.0.10
	netbsd-5-0-1-RELEASE:1.4
	jym-xensuspend-nbase:1.4
	netbsd-5-0:1.4.0.8
	netbsd-5-0-RELEASE:1.4
	netbsd-5-0-RC4:1.4
	netbsd-5-0-RC3:1.4
	netbsd-5-0-RC2:1.4
	jym-xensuspend:1.4.0.6
	jym-xensuspend-base:1.4
	netbsd-5-0-RC1:1.4
	haad-dm-base:1.4
	haad-dm-base2:1.4
	haad-nbase2:1.4
	netbsd-5:1.4.0.4
	netbsd-5-base:1.4
	matt-mips64-base2:1.4
	haad-dm:1.4.0.2
	haad-dm-base1:1.4
	wrstuden-revivesa-base-3:1.2
	wrstuden-revivesa:1.2.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.12
date	2025.03.09.08.26.29;	author mrg;	state Exp;
branches;
next	1.11;
commitid	8iOtktYfGLqgUmMF;

1.11
date	2020.10.12.11.43.11;	author nia;	state Exp;
branches
	1.11.4.1
	1.11.8.1;
next	1.10;
commitid	suriLDHQ5uvVIBrC;

1.10
date	2020.10.11.10.08.26;	author nia;	state Exp;
branches;
next	1.9;
commitid	DhrNjGFol5FpetrC;

1.9
date	2020.09.21.13.51.55;	author nia;	state Exp;
branches;
next	1.8;
commitid	WZ6cdGxOfR8W6VoC;

1.8
date	2020.09.21.08.20.04;	author nia;	state Exp;
branches;
next	1.7;
commitid	9TcSMmjzri6SgToC;

1.7
date	2019.03.11.06.25.55;	author mrg;	state Exp;
branches
	1.7.2.1;
next	1.6;
commitid	4aqhBnM1oO2MDUeB;

1.6
date	2011.08.03.02.56.29;	author mrg;	state Exp;
branches
	1.6.34.1
	1.6.42.1;
next	1.5;

1.5
date	2010.11.21.02.33.41;	author mrg;	state Exp;
branches;
next	1.4;

1.4
date	2008.10.14.23.37.19;	author cube;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2008.09.25.20.14.09;	author cube;	state Exp;
branches;
next	1.2;

1.2
date	2008.09.11.02.26.08;	author cube;	state Exp;
branches
	1.2.2.1;
next	1.1;

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

1.11.4.1
date	2021.06.02.14.46.21;	author cjep;	state Exp;
branches;
next	;
commitid	OKPZ5MjUR1zdfzVC;

1.11.8.1
date	2025.08.02.05.50.39;	author perseant;	state Exp;
branches;
next	;
commitid	23j6GFaDws3O875G;

1.7.2.1
date	2020.10.18.18.08.46;	author martin;	state Exp;
branches;
next	;
commitid	BckqYwpzUuYeFpsC;

1.6.34.1
date	2019.04.23.10.24.54;	author martin;	state Exp;
branches;
next	;
commitid	MbDYRxexUuefAskB;

1.6.42.1
date	2019.06.10.22.02.36;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.4.2.1
date	2008.10.14.23.37.19;	author haad;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2008.10.19.22.41.01;	author haad;	state Exp;
branches;
next	;

1.2.2.1
date	2008.09.11.02.26.08;	author wrstuden;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2008.09.18.05.18.30;	author wrstuden;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2008.09.24.16.35.00;	author wrstuden;	state Exp;
branches;
next	;

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


desc
@@


1.12
log
@actually, since Xtrans needs them, add the new -DHAVE_GETADDRINFO,
-DHAVE_INET_NTOP, and -DHAVE_STRUCT_SOCKADDR_STORAGE to X11FLAGS.CONNECTION.

xdm/xinit gains -DHAVE_ASPRINTF.

libX11 gets xim_trans.c compiled properly.
@
text
@#	$NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $

.include <bsd.own.mk>

PROG=	xinit
MAN=	xinit.1 startx.1

XINITDIR=	${X11ETCDIR}/xinit

CPPFLAGS+=	${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
		-DRETSIGTYPE=void
CPPFLAGS+=	-DHAVE_ASPRINTF

CPPSCRIPTS=	startx xinitrc
CPPSCRIPTFLAGS_xinitrc=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
		-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
		-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
		-DXSETROOT=${X11BINDIR}/xsetroot \
		-DUXTERM=${X11BINDIR}/uxterm \
		-DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
		-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
		-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
		-DUXTERM=${X11BINDIR}/uxterm \
		-DCTWM=${X11BINDIR}/ctwm \
		-DXSETROOT=${X11BINDIR}/xsetroot \
		-DHAS_COOKIE_MAKER \
		-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'

SCRIPTS=	startx
CONFIGFILES=	xinitrc
FILESDIR=	${XINITDIR}

LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}

X11EXTRAMANTRANSFORMS+= \
	__xinitdir__		${XINITDIR} \
	__configdir__		${X11LIBDIR}/xinit

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

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


1.11
log
@define xsetroot in the right place
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
d12 1
@


1.11.8.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2025/03/09 08:26:29 mrg Exp $
a11 1
CPPFLAGS+=	-DHAVE_ASPRINTF
@


1.11.4.1
log
@
Use x11 variables for LDADD and DPADD. Now builds on sun2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $
d33 2
a34 2
LDADD+=	${XLIBLDADD_XMUU}
DPADD+=	${XLIBDPADD_XMUU}
@


1.10
log
@allow xsetroot to be used in default xinitrc
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $
d17 1
@


1.9
log
@also allow uxterm to be used in the default xinitrc
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $
d24 1
@


1.8
log
@Define CTWM when building xinit

This will allow ctwm to eventually be used in the default xinitrc.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
d17 1
d22 1
@


1.7
log
@fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
d16 2
a17 1
		-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm
d21 1
@


1.7.2.1
log
@Pull up following revision(s) (requested by nia in ticket #1115):

	external/mit/xorg/bin/xinit/Makefile: revision 1.8
	external/mit/xorg/bin/xinit/Makefile: revision 1.9

Define CTWM when building xinit
This will allow ctwm to eventually be used in the default xinitrc.

also allow uxterm to be used in the default xinitrc
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
d16 1
a16 3
		-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
		-DUXTERM=${X11BINDIR}/uxterm \
		-DCTWM=${X11BINDIR}/ctwm
a19 2
		-DUXTERM=${X11BINDIR}/uxterm \
		-DCTWM=${X11BINDIR}/ctwm \
@


1.6
log
@look in .../man as well.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2010/11/21 02:33:41 mrg Exp $
d30 3
a32 2
X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
X11MANCPP=	yes
@


1.6.42.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
d30 2
a31 3
X11EXTRAMANTRANSFORMS+= \
	__xinitdir__		${XINITDIR} \
	__configdir__		${X11LIBDIR}/xinit
@


1.6.34.1
log
@Pull up following revision(s) via patch (requested by mrg in ticket #1243):

	external/mit/xorg/bin/xinit/Makefile: revision 1.7
	external/mit/xorg/lib/libXaw/Makefile: revision 1.12
	external/mit/xorg/lib/xkeyboard-config/Makefile: revision 1.13
	external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile: revision 1.2
	share/mk/bsd.x11.mk: revision 1.130
	external/mit/xorg/bin/sessreg/Makefile: revision 1.7
	external/mit/xorg/bin/proxymngr/Makefile: revision 1.4

fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
d30 2
a31 4
X11EXTRAMANTRANSFORMS+= \
	__xinitdir__		${XINITDIR} \
	__configdir__		${X11LIBDIR}/xinit \
	__SCOMAN__		1
@


1.5
log
@various updates for moved man pages or app-defaults.
remove some dated CPPFLAGS defines.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2008/10/14 23:37:19 cube Exp $
d34 1
@


1.4
log
@- Adapt to changes on bsd.x11.mk
- Remove unnecessary targets that handled .man.pre files
- Add transformations for package-specific patterns in man page templates.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2008/09/25 20:14:09 cube Exp $
d10 1
a10 1
CPPFLAGS+=	-DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
@


1.4.2.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:01 +0000
@
text
@d1 36
@


1.4.2.2
log
@Sync with HEAD.
@
text
@a0 36
#	$NetBSD: Makefile,v 1.4 2008/10/14 23:37:19 cube Exp $

.include <bsd.own.mk>

PROG=	xinit
MAN=	xinit.1 startx.1

XINITDIR=	${X11ETCDIR}/xinit

CPPFLAGS+=	-DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
		-DRETSIGTYPE=void

CPPSCRIPTS=	startx xinitrc
CPPSCRIPTFLAGS_xinitrc=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
		-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
		-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm
CPPSCRIPTFLAGS_startx=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
		-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
		-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
		-DHAS_COOKIE_MAKER \
		-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'

SCRIPTS=	startx
CONFIGFILES=	xinitrc
FILESDIR=	${XINITDIR}

LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}

X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
X11MANCPP=	yes

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

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


1.3
log
@Properly install xinitrc too.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2008/09/11 02:26:08 cube Exp $
d31 1
@


1.2
log
@Fix generation of the startx script.  PR#39515 and PR#39516 by George
Michaelson.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
d14 3
a16 1
CPPSCRIPTFLAGS_xinitrc=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR}
@


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


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

.include <bsd.own.mk>

PROG=	xinit
MAN=	xinit.1 startx.1

XINITDIR=	${X11ETCDIR}/xinit

CPPFLAGS+=	-DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
		-DRETSIGTYPE=void

CPPSCRIPTS=	startx xinitrc
CPPSCRIPTFLAGS_xinitrc=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR}
CPPSCRIPTFLAGS_startx=	-DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
		-DHAS_COOKIE_MAKER \
		-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'

SCRIPTS=	startx
CONFIGFILES=	xinitrc
FILESDIR=	${XINITDIR}

LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}

X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}

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

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


1.2.2.3
log
@Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2.2.2 2008/09/18 05:18:30 wrstuden Exp $
a15 2
		-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
		-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $
d16 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
@@
