From fb1d4f6a1465ffc344924729ebb908db95073082 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 28 Jan 2024 06:20:02 +0000 Subject: [PATCH] Also put back libfb.a in xorg_server_ver=110 case. It looks required only on building Xorg server binary and unnecessary for release (actually marked as obsolete only on vax), but no simple settings to "build static libraries without installation" and most ports will be switched to Xorg 1.20 soon. --- distrib/sets/lists/xserver/md.alpha | 5 +++-- distrib/sets/lists/xserver/md.netwinder | 5 +++-- distrib/sets/lists/xserver/md.sgimips | 5 +++-- distrib/sets/lists/xserver/md.vax | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/distrib/sets/lists/xserver/md.alpha b/distrib/sets/lists/xserver/md.alpha index d4f59f993e16..3a3854ed933a 100644 --- a/distrib/sets/lists/xserver/md.alpha +++ b/distrib/sets/lists/xserver/md.alpha @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.62 2024/01/26 12:58:51 tsutsui Exp $ +# $NetBSD: md.alpha,v 1.63 2024/01/28 06:20:02 tsutsui Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg @@ -174,7 +174,8 @@ ./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa_pic.a xserver-obsolete xorg,picinstall,obsolete -./usr/X11R7/lib/modules/libfb.a xserver-obsolete obsolete +./usr/X11R7/lib/modules/libfb.a -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/libfb.a xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/libfb.so xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg,xorg_server_ver=110 diff --git a/distrib/sets/lists/xserver/md.netwinder b/distrib/sets/lists/xserver/md.netwinder index ae36b0c69a92..801b62ad6d70 100644 --- a/distrib/sets/lists/xserver/md.netwinder +++ b/distrib/sets/lists/xserver/md.netwinder @@ -1,4 +1,4 @@ -# $NetBSD: md.netwinder,v 1.48 2024/01/26 12:58:51 tsutsui Exp $ +# $NetBSD: md.netwinder,v 1.49 2024/01/28 06:20:02 tsutsui Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg @@ -86,7 +86,8 @@ ./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa_pic.a xserver-obsolete xorg,picinstall,obsolete -./usr/X11R7/lib/modules/libfb.a xserver-obsolete obsolete +./usr/X11R7/lib/modules/libfb.a -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/libfb.a xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/libfb.so xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg,xorg_server_ver=110 diff --git a/distrib/sets/lists/xserver/md.sgimips b/distrib/sets/lists/xserver/md.sgimips index 6e09b4d2bd65..4751d67b528c 100644 --- a/distrib/sets/lists/xserver/md.sgimips +++ b/distrib/sets/lists/xserver/md.sgimips @@ -1,4 +1,4 @@ -# $NetBSD: md.sgimips,v 1.70 2024/01/26 12:58:51 tsutsui Exp $ x11 +# $NetBSD: md.sgimips,v 1.71 2024/01/28 06:20:02 tsutsui Exp $ x11 ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg @@ -102,7 +102,8 @@ ./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa_pic.a xserver-obsolete xorg,picinstall,obsolete -./usr/X11R7/lib/modules/libfb.a xserver-obsolete obsolete +./usr/X11R7/lib/modules/libfb.a -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/libfb.a xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/libfb.so xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg,xorg_server_ver=110 diff --git a/distrib/sets/lists/xserver/md.vax b/distrib/sets/lists/xserver/md.vax index 9197ff3d4732..15917488dfa5 100644 --- a/distrib/sets/lists/xserver/md.vax +++ b/distrib/sets/lists/xserver/md.vax @@ -1,4 +1,4 @@ -# $NetBSD: md.vax,v 1.28 2024/01/26 12:58:51 tsutsui Exp $ +# $NetBSD: md.vax,v 1.29 2024/01/28 06:20:02 tsutsui Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg @@ -49,7 +49,8 @@ ./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg ./usr/X11R7/lib/modules/libexa_pic.a xserver-obsolete xorg,picinstall,obsolete -./usr/X11R7/lib/modules/libfb.a xserver-obsolete obsolete +./usr/X11R7/lib/modules/libfb.a -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/libfb.a xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/libfb.so xserver-obsolete xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg,xorg_server_ver=110