Factor the Makefiles of modular-xorg-{server,xephyr}

As proposed on tech-pkg@. Both build-tested on NetBSD/amd64.

3 files changed, 189 insertions, 352 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 397ab811f25..c6efafc2eee 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,191 +1,19 @@
-# $NetBSD: Makefile,v 1.96 2015/06/29 11:12:45 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2015/07/07 21:51:22 khorben Exp $
 
-DISTNAME=	xorg-server-1.17.2
+DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular X11 server from modular X.org
-LICENSE=	mit AND modified-bsd AND x11 # with no-advertising clause
 
 SPECIAL_PERMS+=		bin/Xorg ${SETUID_ROOT_PERMS}
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
-USE_LANGUAGES+=	c99
-
-PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
-SHLIBTOOL_OVERRIDE=	# empty
-
-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
-
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--with-xkb-output=${XKB_OUTPUT_DIR:Q}
-
-.if !empty(USE_TOOLS:Mauto*)
-TOOLS_DEPENDS+=	xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
-.endif
-
-DEPENDS+=	xkbcomp-[0-9]*:../../x11/xkbcomp
-DEPENDS+=	xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-builder-addr="tech-x11@NetBSD.org"
-CONFIGURE_ARGS+=	--with-os-vendor="The NetBSD Foundation"
-# TLS is not supported by NetBSD<6
-.  if !empty(OS_VERSION:M[0-5].*)
-CONFIGURE_ENV+=		ac_cv_tls=no
-CONFIGURE_ARGS+=	--disable-glx-tls
-.  endif
-.endif
-CONFIGURE_ARGS+=	--with-os-name=${MACHINE_PLATFORM:Q}
+.include "Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-xorg
-
-CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts/X11
-
-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+=	--with-default-font-path=${FONT_PATHS:ts,:Q}
-
-CONFIGURE_ARGS+=	--disable-config-hal
-CONFIGURE_ARGS+=	--disable-dmx
-CONFIGURE_ARGS+=	--disable-xwin
 CONFIGURE_ARGS+=	--disable-xephyr
 CONFIGURE_ARGS+=	--disable-kdrive
-#CONFIGURE_ARGS+=	--disable-kdrive-vesa
-CONFIGURE_ARGS+=	--disable-xfake
-CONFIGURE_ARGS+=	--disable-xfbdev
-
-CONFIGURE_ARGS+=	--with-int10=x86emu
-
-CONFIGURE_ENV+=		APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
-CONFIGURE_ENV+=		DRIVER_MAN_SUFFIX=4
-
-PLIST_VARS+=		sunos
-PLIST_SUBST+=		SUNOS_ARCH=${SUNOS_ARCH}
-
-.if ${OPSYS} == "SunOS"
-PLIST.sunos=		yes
-.  if ${MACHINE_ARCH} == "i386"
-SUNOS_ARCH=		ia32
-.  elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
-SUNOS_ARCH=		amd64
-.  elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-SUNOS_ARCH=		sparcv8plus
-.  endif
-.endif
-
-PLIST_VARS+=		sparc
-.if !empty(MACHINE_ARCH:Msparc*)
-PLIST.sparc=		yes
-.endif
-
-# Workaround for PR#41556.
-# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		ac_cv_header_sys_event_h=no
-.endif
-
-INSTALLATION_DIRS+=	lib/xorg/modules/drivers lib/xorg/modules/input
-
-BUILDLINK_API_DEPENDS.MesaLib+=		MesaLib>=7.8.0
-BUILDLINK_API_DEPENDS.compositeproto+=	compositeproto>=0.4
-BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=5.0
-BUILDLINK_API_DEPENDS.damageproto+=	damageproto>=1.1
-BUILDLINK_API_DEPENDS.xcmiscproto+=	xcmiscproto>=1.2.0
-BUILDLINK_API_DEPENDS.xtrans+=		xtrans>=1.2.2
-BUILDLINK_API_DEPENDS.bigreqsproto+=	bigreqsproto>=1.1.0
-BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.22
-BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.1.99
-BUILDLINK_API_DEPENDS.recordproto+=	recordproto>=1.13.99.1
-BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.1
-BUILDLINK_API_DEPENDS.resourceproto+=	resourceproto>=1.2.0
-BUILDLINK_API_DEPENDS.dri+=		dri>=7.8
-BUILDLINK_API_DEPENDS.xfont+=		xfont>=1.4.2
-BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.16
-BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=2.1.99.6
-BUILDLINK_API_DEPENDS.kbproto+=		kbproto>=1.0.3
-BUILDLINK_API_DEPENDS.pixman+=		pixman>=0.21.8
-BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.4.0
-BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.11
-BUILDLINK_API_DEPENDS.xf86dgaproto+=	xf86dgaproto>=2.0.3
-BUILDLINK_API_DEPENDS.xf86driproto+=	xf86driproto>=2.1.0
-
-BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "options.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--with-sha1=libc
-.else
-.include "../../security/nettle/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sha1=libnettle
-.endif
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/libfontenc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libpciaccess+=	libpciaccess>=0.11.0
-BUILDLINK_DEPMETHOD.libpciaccess=	full
-.include "../../sysutils/libpciaccess/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/evieext/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXau/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXfont/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXxf86misc/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/libxkbui/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.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"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xcb-util-keysyms/buildlink3.mk"
-.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"
-.include "../../x11/xtrans/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
new file mode 100644
index 00000000000..8e95b895783
--- /dev/null
+++ b/x11/modular-xorg-server/Makefile.common
@@ -0,0 +1,182 @@
+# $NetBSD: Makefile.common,v 1.1 2015/07/07 21:51:22 khorben Exp $
+# used by x11/modular-xorg-server/Makefile
+# used by x11/modular-xorg-xephyr/Makefile
+
+XORG_VERSION=	1.17.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
+EXTRACT_SUFX=	.tar.bz2
+
+HOMEPAGE=	http://xorg.freedesktop.org/
+LICENSE=	mit AND modified-bsd AND x11 # with no-advertising clause
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
+USE_LANGUAGES+=	c99
+
+PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
+SHLIBTOOL_OVERRIDE=	# empty
+
+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
+
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-xkb-output=${XKB_OUTPUT_DIR:Q}
+
+.if !empty(USE_TOOLS:Mauto*)
+TOOLS_DEPENDS+=	xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
+.endif
+
+DEPENDS+=	xkbcomp-[0-9]*:../../x11/xkbcomp
+DEPENDS+=	xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=	--with-builder-addr="tech-x11@NetBSD.org"
+CONFIGURE_ARGS+=	--with-os-vendor="The NetBSD Foundation"
+# TLS is not supported by NetBSD<6
+.  if !empty(OS_VERSION:M[0-5].*)
+CONFIGURE_ENV+=		ac_cv_tls=no
+CONFIGURE_ARGS+=	--disable-glx-tls
+.  endif
+.endif
+CONFIGURE_ARGS+=	--with-os-name=${MACHINE_PLATFORM:Q}
+
+CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts/X11
+
+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+=	--with-default-font-path=${FONT_PATHS:ts,:Q}
+
+CONFIGURE_ARGS+=	--disable-config-hal
+CONFIGURE_ARGS+=	--disable-dmx
+CONFIGURE_ARGS+=	--disable-xwin
+CONFIGURE_ARGS+=	--disable-xephyr
+CONFIGURE_ARGS+=	--disable-kdrive
+#CONFIGURE_ARGS+=	--disable-kdrive-vesa
+CONFIGURE_ARGS+=	--disable-xfake
+CONFIGURE_ARGS+=	--disable-xfbdev
+
+CONFIGURE_ARGS+=	--with-int10=x86emu
+
+CONFIGURE_ENV+=		APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
+CONFIGURE_ENV+=		DRIVER_MAN_SUFFIX=4
+
+PLIST_VARS+=		sunos
+PLIST_SUBST+=		SUNOS_ARCH=${SUNOS_ARCH}
+
+.if ${OPSYS} == "SunOS"
+PLIST.sunos=		yes
+.  if ${MACHINE_ARCH} == "i386"
+SUNOS_ARCH=		ia32
+.  elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
+SUNOS_ARCH=		amd64
+.  elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+SUNOS_ARCH=		sparcv8plus
+.  endif
+.endif
+
+PLIST_VARS+=		sparc
+.if !empty(MACHINE_ARCH:Msparc*)
+PLIST.sparc=		yes
+.endif
+
+# Workaround for PR#41556.
+# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ENV+=		ac_cv_header_sys_event_h=no
+.endif
+
+INSTALLATION_DIRS+=	lib/xorg/modules/drivers lib/xorg/modules/input
+
+BUILDLINK_API_DEPENDS.MesaLib+=		MesaLib>=7.8.0
+BUILDLINK_API_DEPENDS.compositeproto+=	compositeproto>=0.4
+BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=5.0
+BUILDLINK_API_DEPENDS.damageproto+=	damageproto>=1.1
+BUILDLINK_API_DEPENDS.xcmiscproto+=	xcmiscproto>=1.2.0
+BUILDLINK_API_DEPENDS.xtrans+=		xtrans>=1.2.2
+BUILDLINK_API_DEPENDS.bigreqsproto+=	bigreqsproto>=1.1.0
+BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.22
+BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.1.99
+BUILDLINK_API_DEPENDS.recordproto+=	recordproto>=1.13.99.1
+BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.1
+BUILDLINK_API_DEPENDS.resourceproto+=	resourceproto>=1.2.0
+BUILDLINK_API_DEPENDS.dri+=		dri>=7.8
+BUILDLINK_API_DEPENDS.xfont+=		xfont>=1.4.2
+BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.16
+BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=2.1.99.6
+BUILDLINK_API_DEPENDS.kbproto+=		kbproto>=1.0.3
+BUILDLINK_API_DEPENDS.pixman+=		pixman>=0.21.8
+BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.4.0
+BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.11
+BUILDLINK_API_DEPENDS.xf86dgaproto+=	xf86dgaproto>=2.0.3
+BUILDLINK_API_DEPENDS.xf86driproto+=	xf86driproto>=2.1.0
+
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
+CONFIGURE_ARGS+=	--with-sha1=libc
+.else
+.include "../../security/nettle/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sha1=libnettle
+.endif
+
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/libfontenc/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libpciaccess+=	libpciaccess>=0.11.0
+BUILDLINK_DEPMETHOD.libpciaccess=	full
+.include "../../sysutils/libpciaccess/buildlink3.mk"
+.include "../../x11/bigreqsproto/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/evieext/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXxf86misc/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/libxkbui/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+.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"
+.include "../../x11/kbproto/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.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"
+.include "../../x11/xtrans/buildlink3.mk"
diff --git a/x11/modular-xorg-xephyr/Makefile b/x11/modular-xorg-xephyr/Makefile
index e22bb70cf2c..91a059e1299 100644
--- a/x11/modular-xorg-xephyr/Makefile
+++ b/x11/modular-xorg-xephyr/Makefile
@@ -1,204 +1,31 @@
-# $NetBSD: Makefile,v 1.2 2015/07/05 15:01:07 khorben Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/07 21:51:22 khorben Exp $
 
-DISTNAME=	xorg-server-1.17.2
-PKGNAME=	modular-xorg-xephyr-1.17.2
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=	xorg-server-${XORG_VERSION}
+PKGNAME=	modular-xorg-xephyr-${XORG_VERSION}
 
 DISTINFO_FILE=		${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/modular-xorg-server/patches
 
 MAINTAINER=	khorben@defora.org
-HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Xephyr server based on kdrive from modular X.org
-LICENSE=	mit AND modified-bsd AND x11 # with no-advertising clause
 
-SPECIAL_PERMS+=		bin/Xorg ${SETUID_ROOT_PERMS}
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
-USE_LANGUAGES+=	c99
-
-PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
-SHLIBTOOL_OVERRIDE=	# empty
-
-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
-
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--with-xkb-output=${XKB_OUTPUT_DIR:Q}
-
-.if !empty(USE_TOOLS:Mauto*)
-TOOLS_DEPENDS+=	xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
-.endif
-
-DEPENDS+=	xkbcomp-[0-9]*:../../x11/xkbcomp
-DEPENDS+=	xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-builder-addr="tech-x11@NetBSD.org"
-CONFIGURE_ARGS+=	--with-os-vendor="The NetBSD Foundation"
-# TLS is not supported by NetBSD<6
-.  if !empty(OS_VERSION:M[0-5].*)
-CONFIGURE_ENV+=		ac_cv_tls=no
-CONFIGURE_ARGS+=	--disable-glx-tls
-.  endif
-.endif
-CONFIGURE_ARGS+=	--with-os-name=${MACHINE_PLATFORM:Q}
+.include "../../x11/modular-xorg-server/Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-xorg
-
-CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts/X11
-
-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+=	--with-default-font-path=${FONT_PATHS:ts,:Q}
-
-CONFIGURE_ARGS+=	--disable-config-hal
-CONFIGURE_ARGS+=	--disable-dmx
 CONFIGURE_ARGS+=	--disable-xnest
-CONFIGURE_ARGS+=	--disable-xwin
 CONFIGURE_ARGS+=	--enable-xephyr
 CONFIGURE_ARGS+=	--enable-kdrive
-#CONFIGURE_ARGS+=	--disable-kdrive-vesa
-CONFIGURE_ARGS+=	--disable-xfake
-CONFIGURE_ARGS+=	--disable-xfbdev
 CONFIGURE_ARGS+=	--disable-xvfb
 
-CONFIGURE_ARGS+=	--with-int10=x86emu
-
-CONFIGURE_ENV+=		APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
-CONFIGURE_ENV+=		DRIVER_MAN_SUFFIX=4
-
-PLIST_VARS+=		sunos
-PLIST_SUBST+=		SUNOS_ARCH=${SUNOS_ARCH}
-
-.if ${OPSYS} == "SunOS"
-PLIST.sunos=		yes
-.  if ${MACHINE_ARCH} == "i386"
-SUNOS_ARCH=		ia32
-.  elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
-SUNOS_ARCH=		amd64
-.  elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-SUNOS_ARCH=		sparcv8plus
-.  endif
-.endif
-
-PLIST_VARS+=		sparc
-.if !empty(MACHINE_ARCH:Msparc*)
-PLIST.sparc=		yes
-.endif
-
-# Workaround for PR#41556.
-# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		ac_cv_header_sys_event_h=no
-.endif
-
-INSTALLATION_DIRS+=	lib/xorg/modules/drivers lib/xorg/modules/input
-
 post-install:
 	${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt
 	${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1
 
-BUILDLINK_API_DEPENDS.MesaLib+=		MesaLib>=7.8.0
-BUILDLINK_API_DEPENDS.compositeproto+=	compositeproto>=0.4
-BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=5.0
-BUILDLINK_API_DEPENDS.damageproto+=	damageproto>=1.1
-BUILDLINK_API_DEPENDS.xcmiscproto+=	xcmiscproto>=1.2.0
-BUILDLINK_API_DEPENDS.xtrans+=		xtrans>=1.2.2
-BUILDLINK_API_DEPENDS.bigreqsproto+=	bigreqsproto>=1.1.0
-BUILDLINK_API_DEPENDS.xproto+=		xproto>=7.0.22
-BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.1.99
-BUILDLINK_API_DEPENDS.recordproto+=	recordproto>=1.13.99.1
-BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.1
-BUILDLINK_API_DEPENDS.resourceproto+=	resourceproto>=1.2.0
-BUILDLINK_API_DEPENDS.dri+=		dri>=7.8
-BUILDLINK_API_DEPENDS.xfont+=		xfont>=1.4.2
-BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.16
-BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=2.1.99.6
-BUILDLINK_API_DEPENDS.kbproto+=		kbproto>=1.0.3
-BUILDLINK_API_DEPENDS.pixman+=		pixman>=0.21.8
-BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.4.0
-BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.11
-BUILDLINK_API_DEPENDS.xf86dgaproto+=	xf86dgaproto>=2.0.3
-BUILDLINK_API_DEPENDS.xf86driproto+=	xf86driproto>=2.1.0
-
-BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
-
 .include "../../x11/modular-xorg-server/options.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--with-sha1=libc
-.else
-.include "../../security/nettle/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sha1=libnettle
-.endif
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/libfontenc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libpciaccess+=	libpciaccess>=0.11.0
-BUILDLINK_DEPMETHOD.libpciaccess=	full
-.include "../../sysutils/libpciaccess/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/evieext/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXau/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXfont/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXxf86misc/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/libxkbui/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.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"
-.include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/xcb-util/buildlink3.mk"
-.include "../../x11/xcb-util-keysyms/buildlink3.mk"
 .include "../../x11/xcb-util-image/buildlink3.mk"
 .include "../../x11/xcb-util-renderutil/buildlink3.mk"
 .include "../../x11/xcb-util-wm/buildlink3.mk"
-.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"
-.include "../../x11/xtrans/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"