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.
This commit is contained in:
schmonz 2022-05-14 21:32:33 +00:00
parent 0f2cdac5d1
commit c61ea8dde7
2 changed files with 2 additions and 8 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2022/05/12 19:55:54 tnn Exp $
# $NetBSD: Makefile,v 1.18 2022/05/14 21:32:33 schmonz Exp $
DISTNAME= modular-xorg-xquartz-1.20.99.1.20210408
CATEGORIES= x11
@ -48,8 +48,6 @@ 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}
@ -57,15 +55,12 @@ 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

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2022/05/12 19:39:00 tnn Exp $
@comment $NetBSD: PLIST,v 1.4 2022/05/14 21:32:33 schmonz Exp $
Applications/Utilities/X11.app/Contents/Info.plist
Applications/Utilities/X11.app/Contents/MacOS/X11
Applications/Utilities/X11.app/Contents/MacOS/X11.bin
@ -102,4 +102,3 @@ lib/xorg/protocol.txt
man/man1/Xquartz.1
man/man1/Xserver.1
share/doc/xorg-server/Xserver-DTrace.xml
var/db/xkb/README.compiled