head	1.26;
access;
symbols
	pkgsrc-2026Q2:1.26.0.2
	pkgsrc-2026Q2-base:1.26
	pkgsrc-2026Q1:1.25.0.2
	pkgsrc-2026Q1-base:1.25
	pkgsrc-2025Q4:1.24.0.14
	pkgsrc-2025Q4-base:1.24
	pkgsrc-2025Q3:1.24.0.12
	pkgsrc-2025Q3-base:1.24
	pkgsrc-2025Q2:1.24.0.10
	pkgsrc-2025Q2-base:1.24
	pkgsrc-2025Q1:1.24.0.8
	pkgsrc-2025Q1-base:1.24
	pkgsrc-2024Q4:1.24.0.6
	pkgsrc-2024Q4-base:1.24
	pkgsrc-2024Q3:1.24.0.4
	pkgsrc-2024Q3-base:1.24
	pkgsrc-2024Q2:1.24.0.2
	pkgsrc-2024Q2-base:1.24
	pkgsrc-2024Q1:1.23.0.2
	pkgsrc-2024Q1-base:1.23
	pkgsrc-2023Q4:1.22.0.2
	pkgsrc-2023Q4-base:1.22
	pkgsrc-2023Q3:1.21.0.2
	pkgsrc-2023Q3-base:1.21
	pkgsrc-2023Q2:1.20.0.2
	pkgsrc-2023Q2-base:1.20
	pkgsrc-2023Q1:1.19.0.2
	pkgsrc-2023Q1-base:1.19
	pkgsrc-2022Q4:1.18.0.6
	pkgsrc-2022Q4-base:1.18
	pkgsrc-2022Q3:1.18.0.4
	pkgsrc-2022Q3-base:1.18
	pkgsrc-2022Q2:1.18.0.2
	pkgsrc-2022Q2-base:1.18
	pkgsrc-2022Q1:1.15.0.2
	pkgsrc-2022Q1-base:1.15
	pkgsrc-2021Q4:1.14.0.8
	pkgsrc-2021Q4-base:1.14
	pkgsrc-2021Q3:1.14.0.6
	pkgsrc-2021Q3-base:1.14
	pkgsrc-2021Q2:1.14.0.4
	pkgsrc-2021Q2-base:1.14
	pkgsrc-2021Q1:1.14.0.2
	pkgsrc-2021Q1-base:1.14
	pkgsrc-2020Q4:1.13.0.6
	pkgsrc-2020Q4-base:1.13
	pkgsrc-2020Q3:1.13.0.4
	pkgsrc-2020Q3-base:1.13
	pkgsrc-2020Q2:1.13.0.2
	pkgsrc-2020Q2-base:1.13
	pkgsrc-2020Q1:1.12.0.2
	pkgsrc-2020Q1-base:1.12
	pkgsrc-2019Q4:1.11.0.4
	pkgsrc-2019Q4-base:1.11
	pkgsrc-2019Q3:1.8.0.2
	pkgsrc-2019Q3-base:1.8
	pkgsrc-2019Q2:1.7.0.12
	pkgsrc-2019Q2-base:1.7
	pkgsrc-2019Q1:1.7.0.10
	pkgsrc-2019Q1-base:1.7
	pkgsrc-2018Q4:1.7.0.8
	pkgsrc-2018Q4-base:1.7
	pkgsrc-2018Q3:1.7.0.6
	pkgsrc-2018Q3-base:1.7
	pkgsrc-2018Q2:1.7.0.4
	pkgsrc-2018Q2-base:1.7
	pkgsrc-2018Q1:1.7.0.2
	pkgsrc-2018Q1-base:1.7
	pkgsrc-2017Q4:1.6.0.6
	pkgsrc-2017Q4-base:1.6
	pkgsrc-2017Q3:1.6.0.4
	pkgsrc-2017Q3-base:1.6
	pkgsrc-2017Q2:1.5.0.12
	pkgsrc-2017Q2-base:1.5
	pkgsrc-2017Q1:1.5.0.10
	pkgsrc-2017Q1-base:1.5
	pkgsrc-2016Q4:1.5.0.8
	pkgsrc-2016Q4-base:1.5
	pkgsrc-2016Q3:1.5.0.6
	pkgsrc-2016Q3-base:1.5
	pkgsrc-2016Q2:1.5.0.4
	pkgsrc-2016Q2-base:1.5
	pkgsrc-2016Q1:1.5.0.2
	pkgsrc-2016Q1-base:1.5
	pkgsrc-2015Q4:1.3.0.2
	pkgsrc-2015Q4-base:1.3;
locks; strict;
comment	@# @;


1.26
date	2026.05.14.16.42.29;	author ryoon;	state Exp;
branches;
next	1.25;
commitid	tKipFjQKzke3NNFG;

1.25
date	2026.02.06.10.06.17;	author wiz;	state Exp;
branches;
next	1.24;
commitid	MwQEYCXeWSFvIitG;

1.24
date	2024.05.06.08.40.33;	author jperkin;	state Exp;
branches;
next	1.23;
commitid	Xm6R3peSH7EgRU8F;

1.23
date	2024.03.11.21.49.58;	author schmonz;	state Exp;
branches;
next	1.22;
commitid	iAF9EY5ZLwZM1N1F;

1.22
date	2023.11.12.13.24.19;	author wiz;	state Exp;
branches;
next	1.21;
commitid	SjpNXQIV5XeZ3kME;

1.21
date	2023.06.27.10.28.34;	author riastradh;	state Exp;
branches;
next	1.20;
commitid	7SsmrdO7lx6kyzuE;

1.20
date	2023.06.06.12.42.54;	author riastradh;	state Exp;
branches;
next	1.19;
commitid	xhspr6Z8JLQOWSrE;

1.19
date	2023.01.29.21.18.17;	author ryoon;	state Exp;
branches;
next	1.18;
commitid	QL7aBXsBGmQvUtbE;

1.18
date	2022.05.14.21.32.33;	author schmonz;	state Exp;
branches;
next	1.17;
commitid	tIYgEBTcpgwfm4ED;

1.17
date	2022.05.12.19.55.54;	author tnn;	state Exp;
branches;
next	1.16;
commitid	UkDq4fB1igq0UNDD;

1.16
date	2022.05.12.19.39.00;	author tnn;	state Exp;
branches;
next	1.15;
commitid	D9tG4OCqS365ONDD;

1.15
date	2022.03.10.10.09.42;	author jperkin;	state Exp;
branches;
next	1.14;
commitid	GuwT3tZIFoRTFEvD;

1.14
date	2021.02.25.12.30.58;	author ryoon;	state Exp;
branches;
next	1.13;
commitid	zE3kMy7pa6z0C5JC;

1.13
date	2020.05.22.10.56.48;	author adam;	state Exp;
branches;
next	1.12;
commitid	m1Z0QPvTTTWz3e9C;

1.12
date	2020.03.08.01.28.14;	author tnn;	state Exp;
branches;
next	1.11;
commitid	hh96bsa25v8ikxZB;

1.11
date	2019.11.25.22.32.52;	author wiz;	state Exp;
branches;
next	1.10;
commitid	DvAtR6bX3C5mFhMB;

1.10
date	2019.11.24.21.43.40;	author wiz;	state Exp;
branches;
next	1.9;
commitid	C5gTo1WsyDMyq9MB;

1.9
date	2019.11.15.09.18.17;	author wiz;	state Exp;
branches;
next	1.8;
commitid	1TGsw07lnPTwAVKB;

1.8
date	2019.07.20.22.46.58;	author wiz;	state Exp;
branches;
next	1.7;
commitid	dMrQLvIeoazTQPvB;

1.7
date	2018.03.07.11.57.38;	author wiz;	state Exp;
branches;
next	1.6;
commitid	i1zssNVcYN02lwtA;

1.6
date	2017.09.03.08.53.17;	author wiz;	state Exp;
branches;
next	1.5;
commitid	EfT0kpQ2wSMtgJ5A;

1.5
date	2016.02.22.20.02.36;	author jperkin;	state Exp;
branches;
next	1.4;
commitid	j7AbFaZbujxaWWVy;

1.4
date	2015.12.29.04.54.40;	author dholland;	state Exp;
branches;
next	1.3;
commitid	u8BGzIq28fJjGNOy;

1.3
date	2015.10.25.20.05.01;	author tnn;	state Exp;
branches;
next	1.2;
commitid	pB9EKJtD161wNwGy;

1.2
date	2015.10.12.17.51.02;	author tnn;	state Exp;
branches;
next	1.1;
commitid	FrjhTwus37HgtQEy;

1.1
date	2015.10.01.12.55.09;	author tnn;	state Exp;
branches;
next	;
commitid	IWqueSpoeJHycpDy;


desc
@@


1.26
log
@*: Recursive revbump from security/nettle-4.0
@
text
@# $NetBSD: Makefile,v 1.25 2026/02/06 10:06:17 wiz Exp $

DISTNAME=	modular-xorg-xquartz-1.20.99.1.20210408
PKGREVISION=	5
CATEGORIES=	x11
MASTER_SITES=	${MASTER_SITE_GITHUB:=XQuartz/}
GITHUB_PROJECT=	xorg-server
GITHUB_TAG=	199f278a1b7570b1cb6e24b8bedb4d721b3c9938

MAINTAINER=	pkgsrc-users@@NetBSD.org
HOMEPAGE=	https://www.xquartz.org/
COMMENT=	X11 server for Mac OS X
LICENSE=	mit

GNU_CONFIGURE=	yes
USE_LIBTOOL=	yes
USE_TOOLS+=	gmake pkg-config autoconf automake autoreconf m4
USE_LANGUAGES=	c c++ objc

ONLY_FOR_PLATFORM=	Darwin-*-*

BUILD_DEFS+=		VARBASE
BUILD_DEFS_EFFECTS+=	XKB_OUTPUT_DIR

OWN_DIRS+=		${VARBASE}/log
OWN_DIRS+=		${XKB_OUTPUT_DIR}
XKB_OUTPUT_DIR?=	${VARBASE}/db/xkb # XXX sync with xkeyboard-config

DEPENDS+=		xkbcomp-[0-9]*:../../x11/xkbcomp
DEPENDS+=		xkeyboard-config-[0-9]*:../../x11/xkeyboard-config

# Needed by X11.app:
DEPENDS+=		quartz-wm-[0-9]*:../../wm/quartz-wm
DEPENDS+=		{xterm,mxterm}-[0-9]*:../../x11/xterm
DEPENDS+=		xinit-[0-9]*:../../x11/xinit

LEGACY_FONT_PATHS=
DEFAULT_FONT_PATHS=
.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic
DEFAULT_FONT_PATHS+=	${PREFIX}/share/fonts/X11/${f}
LEGACY_FONT_PATHS+=	${PREFIX}/lib/X11/fonts/${f}
.endfor
FONT_PATHS=		${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS}

CONFIGURE_ARGS+=	--enable-xquartz
CONFIGURE_ARGS+=	--disable-xorg
CONFIGURE_ARGS+=	--disable-xephyr
CONFIGURE_ARGS+=	--disable-kdrive
CONFIGURE_ARGS+=	--disable-config-hal
CONFIGURE_ARGS+=	--disable-dmx
CONFIGURE_ARGS+=	--disable-xwin

CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+=	--with-xkb-output=${XKB_OUTPUT_DIR:Q}
CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts/X11
CONFIGURE_ARGS+=	--with-default-font-path=${FONT_PATHS:ts,:Q}

CONFIGURE_ARGS+=	--with-builder-addr="tech-x11@@NetBSD.org"

CONFIGURE_ARGS+=	--enable-xtrans-send-fds
CONFIGURE_ARGS+=	--enable-dri
CONFIGURE_ARGS+=	--enable-dri2
CONFIGURE_ARGS+=	--enable-dri3
CONFIGURE_ARGS+=	--enable-glx
CONFIGURE_ARGS+=	--enable-glamor
CONFIGURE_ARGS+=	--enable-ipv6

CONFIGURE_ARGS+=	--with-apple-applications-dir=${PREFIX}/Applications/Utilities

CONFIGURE_ENV+=		APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
CONFIGURE_ENV+=		DRIVER_MAN_SUFFIX=4

TOOL_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${TOOLBASE}/bin/tradcpp -Uunix"

.include "../../security/nettle/buildlink3.mk"
CONFIGURE_ARGS+=	--with-sha1=libnettle

MAKE_ENV+=		OSX_SDK_PATH=${XCODE_SDK_PATH}

MESSAGE_SUBST+=		PREFIX=${PREFIX}

CHECK_PORTABILITY_SKIP+=	test/scripts/*
CHECK_PORTABILITY_SKIP+=	hw/xquartz/bundle/*

pre-configure:
	cd ${WRKSRC} && autoreconf -vif

.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/font-util/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
.include "../../graphics/libepoxy/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../wm/libAppleWM/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXfont2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../x11/libxshmfence/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@


1.25
log
@*: recursive bump for nettle 4.0 shlib major bump
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.24 2024/05/06 08:40:33 jperkin Exp $
d4 1
a4 1
PKGREVISION=	4
@


1.24
log
@*: Revision bumps for ncurses 6.5 overhaul.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.23 2024/03/11 21:49:58 schmonz Exp $
d4 1
a4 1
PKGREVISION=	3
@


1.23
log
@modular-xorg-xquartz: USE_TOOLS+=m4.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.22 2023/11/12 13:24:19 wiz Exp $
d4 1
a4 1
PKGREVISION=	2
@


1.22
log
@*: revebump for new brotli option for freetype2

Addresses PR 57693
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.21 2023/06/27 10:28:34 riastradh Exp $
d17 1
a17 1
USE_TOOLS+=	gmake pkg-config autoconf automake autoreconf
@


1.21
log
@Use TOOLBASE, not PREFIX, to get at tradcpp executable.

(Maybe this should be factored into a devel/tradcpp/tool.mk?)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.20 2023/06/06 12:42:54 riastradh Exp $
d4 1
a4 1
PKGREVISION=	1
@


1.20
log
@Mass-change BUILD_DEPENDS to TOOL_DEPENDS outside mk/.

Almost all uses, if not all of them, are wrong, according to the
semantics of BUILD_DEPENDS (packages built for target available for
use _by_ tools at build-time) and TOOL_DEPEPNDS (packages built for
host available for use _as_ tools at build-time).

No change to BUILD_DEPENDS as used correctly inside buildlink3.

As proposed on tech-pkg:
https://mail-index.netbsd.org/tech-pkg/2023/06/03/msg027632.html
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.19 2023/01/29 21:18:17 ryoon Exp $
d74 1
a74 1
CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
@


1.19
log
@*: Recursive revbup from graphics/freetype2
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.18 2022/05/14 21:32:33 schmonz Exp $
d73 1
a73 1
BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
@


1.18
log
@Remove errant PLIST entry for a file that's installed under
XKB_OUTPUT_DIR, which is usually derived from VARBASE, and in any case
appears intended to be handled by OWN_DIRS. While here, remove
unrecognized configure options. Fixes packaging in typical
configurations, NFCI elsewhere.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.17 2022/05/12 19:55:54 tnn Exp $
d4 1
@


1.17
log
@modular-xorg-xquartz: needs font-util
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.16 2022/05/12 19:39:00 tnn Exp $
a50 2
CONFIGURE_ARGS+=	--disable-xfake
CONFIGURE_ARGS+=	--disable-xfbdev
a57 2
CONFIGURE_ARGS+=	--with-os-vendor="The NetBSD Foundation"
CONFIGURE_ARGS+=	--with-os-name=${MACHINE_PLATFORM:Q}
a63 1
CONFIGURE_ARGS+=	--enable-aiglx
@


1.16
log
@modular-xorg-xquartz: update to 1.20.99.1.20210408

Unknown changes. Tested on macOS 12.3.1 (arm64) w/ Xcode 13.3.1.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.15 2022/03/10 10:09:42 jperkin Exp $
d87 3
d96 1
@


1.15
log
@*: Allow mxterm as an alternate xterm dependency.

The two packages conflict due to bin/resize but binary package users should be
able to use mxterm instead.  Resolves part of joyent/pkgsrc#324.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.14 2021/02/25 12:30:58 ryoon Exp $
d3 1
a3 3
DISTNAME=	xorg-server-1.17.2
PKGNAME=	${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
PKGREVISION=	6
d5 3
a7 2
MASTER_SITES=	https://www.x.org/releases/individual/xserver/
EXTRACT_SUFX=	.tar.bz2
d10 1
a10 1
HOMEPAGE=	https://www.x.org/releases/individual/xserver/
d16 1
a16 1
USE_TOOLS+=	gmake pkg-config
d87 3
d103 1
a103 1
.include "../../x11/libXfont/buildlink3.mk"
@


1.14
log
@modular-xorg-xquartz, libAppleWM: Use predefined OSX_SDK_PATH

The latest macOS Big Sur 11.2.1 and Xcode 12.4 as of 2021-02-24 do not
provide 11.2 SDK. They provide 11.1 SDK instead. mk/platform/Darwin.mk has
workaround for this situation. So use the workaround directly.

OSX_SDK_PATH may be internal, however it is accessible over 5 years.
It may not be a big problem hopefully.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.13 2020/05/22 10:56:48 adam Exp $
d34 1
a34 1
DEPENDS+=		xterm-[0-9]*:../../x11/xterm
@


1.13
log
@revbump after updating security/nettle
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2020/03/08 01:28:14 tnn Exp $
d84 1
a84 4
.if exists(/usr/bin/xcrun)
MY_XCODE_SDK_PATH!=	/usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path
MAKE_ENV+=		OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
.endif
@


1.12
log
@modular-xorg-xquartz: build fix for catalina
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2019/11/25 22:32:52 wiz Exp $
d5 1
a5 1
PKGREVISION=	5
@


1.11
log
@modular-xorg-*: remove libxkbui bl3.mk

Unused for years (was only used by removed xorgcfg).

Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 2019/11/24 21:43:40 wiz Exp $
d5 1
a5 1
PKGREVISION=	4
@


1.10
log
@modular-xorg-server*: Remove libXxf86misc inclusion

It is not actually used. Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2019/11/15 09:18:17 wiz Exp $
d5 1
a5 1
PKGREVISION=	3
a108 1
.include "../../x11/libxkbui/buildlink3.mk"
@


1.9
log
@evieext: remove, it's part of xorgproto now

Noted by taca.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.8 2019/07/20 22:46:58 wiz Exp $
d5 1
a5 1
PKGREVISION=	2
a105 1
.include "../../x11/libXxf86misc/buildlink3.mk"
@


1.8
log
@*: recursive bump for nettle 3.5.1
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:38 wiz Exp $
a98 1
.include "../../x11/evieext/buildlink3.mk"
@


1.7
log
@xorgproto: use xorgproto instead of separate *proto packages

Remove now obsolete packages.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 2017/09/03 08:53:17 wiz Exp $
d5 1
a5 1
PKGREVISION=	1
@


1.6
log
@Follow some redirects.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 2016/02/22 20:02:36 jperkin Exp $
d5 1
d98 1
a98 4
.include "../../wm/applewmproto/buildlink3.mk"
.include "../../x11/bigreqsproto/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/damageproto/buildlink3.mk"
a99 4
.include "../../x11/fixesproto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/kbproto/buildlink3.mk"
a112 10
.include "../../x11/presentproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/recordproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/resourceproto/buildlink3.mk"
.include "../../x11/scrnsaverproto/buildlink3.mk"
.include "../../x11/trapproto/buildlink3.mk"
.include "../../x11/videoproto/buildlink3.mk"
.include "../../x11/xcmiscproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
a113 6
.include "../../x11/xf86bigfontproto/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../x11/xf86miscproto/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
a114 3
.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/dri3proto/buildlink3.mk"
a115 1
.include "../../x11/xf86driproto/buildlink3.mk"
@


1.5
log
@Use the system OSX_VERSION variable rather than rolling our own.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2015/12/29 04:54:40 dholland Exp $
d6 1
a6 1
MASTER_SITES=	http://www.x.org/releases/individual/xserver/
d10 1
a10 1
HOMEPAGE=	http://www.x.org/releases/individual/xserver/
@


1.4
log
@Whitespace.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 2015/10/25 20:05:01 tnn Exp $
d83 3
a85 6
.if exists(/usr/bin/xcrun) && exists(/usr/bin/sw_vers)
MY_OSX_VERS!=		/usr/bin/sw_vers -productVersion
.  if ${MY_OSX_VERS:R:R} != ${MY_OSX_VERS:R}
MY_OSX_VERS:=	${MY_OSX_VERS:R}
.  endif
MY_XCODE_SDK_PATH!=	/usr/bin/xcrun --sdk macosx${MY_OSX_VERS} --show-sdk-path
d87 1
a87 1
MAKE_ENV+=		OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
@


1.3
log
@More copy paste from mk/platform/Darwin.mk since it is not obvious to
me how to make it always provide this information for us.

Should fix build on OS X 10.11.1.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 2015/10/12 17:51:02 tnn Exp $
d21 2
a22 2
BUILD_DEFS+=            VARBASE
BUILD_DEFS_EFFECTS+=    XKB_OUTPUT_DIR
d24 3
a26 3
OWN_DIRS+=              ${VARBASE}/log
OWN_DIRS+=              ${XKB_OUTPUT_DIR}
XKB_OUTPUT_DIR?=        ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
d39 2
a40 2
DEFAULT_FONT_PATHS+=    ${PREFIX}/share/fonts/X11/${f}
LEGACY_FONT_PATHS+=     ${PREFIX}/lib/X11/fonts/${f}
d42 1
a42 1
FONT_PATHS=             ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS}
d45 26
a70 26
CONFIGURE_ARGS+=        --disable-xorg
CONFIGURE_ARGS+=        --disable-xephyr
CONFIGURE_ARGS+=        --disable-kdrive
CONFIGURE_ARGS+=        --disable-config-hal
CONFIGURE_ARGS+=        --disable-dmx
CONFIGURE_ARGS+=        --disable-xwin
CONFIGURE_ARGS+=        --disable-xfake
CONFIGURE_ARGS+=        --disable-xfbdev

CONFIGURE_ARGS+=        --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+=        --with-xkb-output=${XKB_OUTPUT_DIR:Q}
CONFIGURE_ARGS+=        --with-fontrootdir=${PREFIX}/share/fonts/X11
CONFIGURE_ARGS+=        --with-default-font-path=${FONT_PATHS:ts,:Q}

CONFIGURE_ARGS+=        --with-builder-addr="tech-x11@@NetBSD.org"
CONFIGURE_ARGS+=        --with-os-vendor="The NetBSD Foundation"
CONFIGURE_ARGS+=        --with-os-name=${MACHINE_PLATFORM:Q}

CONFIGURE_ARGS+=        --enable-xtrans-send-fds
CONFIGURE_ARGS+=        --enable-dri
CONFIGURE_ARGS+=        --enable-dri2
CONFIGURE_ARGS+=        --enable-dri3
CONFIGURE_ARGS+=        --enable-glx
CONFIGURE_ARGS+=        --enable-aiglx
CONFIGURE_ARGS+=        --enable-glamor
CONFIGURE_ARGS+=        --enable-ipv6
d74 2
a75 2
CONFIGURE_ENV+=         APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
CONFIGURE_ENV+=         DRIVER_MAN_SUFFIX=4
d81 1
a81 1
CONFIGURE_ARGS+=        --with-sha1=libnettle
@


1.2
log
@Don't rely on Darwin.mk setting OSX_SDK_PATH. It's an internal variable
that will not always get defined. Instead query xcrun directly.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1 2015/10/01 12:55:09 tnn Exp $
d85 3
@


1.1
log
@Import modular-xorg-xquartz-1.17.2 as x11/modular-xorg-xquartz.

The XQuartz project is an open-source effort to develop a version of
the X.Org X Window System that runs on OS X. Together with supporting
libraries and applications, it forms the X11.app that Apple has shipped
with OS X since version 10.5.
@
text
@d1 1
a1 1
# $NetBSD$
d83 5
a87 1
MAKE_ENV+=		OSX_SDK_PATH=${OSX_SDK_PATH}
@

