diff options
| author | schmonz <schmonz@pkgsrc.org> | 2022-05-14 21:32:33 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2022-05-14 21:32:33 +0000 |
| commit | f49781f787e891dbb17e87adcae80b098f762de4 (patch) | |
| tree | d9643a6cf1291fc2830f37713464691319afec47 /x11 | |
| parent | eaa6cf01652df0e29f6458131d90b55373b74357 (diff) | |
| download | pkgsrc-f49781f787e891dbb17e87adcae80b098f762de4.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-xquartz/Makefile | 7 | ||||
| -rw-r--r-- | x11/modular-xorg-xquartz/PLIST | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index 2c8cbbde5d1..09b745f5958 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -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 diff --git a/x11/modular-xorg-xquartz/PLIST b/x11/modular-xorg-xquartz/PLIST index 3de3f757f54..f4d5eeeef80 100644 --- a/x11/modular-xorg-xquartz/PLIST +++ b/x11/modular-xorg-xquartz/PLIST @@ -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 |