From f78b1814a7329d401938c6fde97433786f4602d3 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Wed, 19 Mar 2025 08:37:50 -0700 Subject: [PATCH] x11-toolkits/Xaw3d: Rename to libXaw3d This is in line with what freedesktop.org calls Xaw3d. And this is in preparation to update libXaw3d to the freedesktop.org maintained version. The reason we are doing this is the Slackware version is unmaintained. PR: 285528 Exp-run by: antoine --- MOVED | 1 + audio/timidity++/Makefile.interface | 2 +- comms/acfax/Makefile | 2 +- devel/pdcurses/Makefile | 2 +- editors/emacs-devel/Makefile | 2 +- editors/emacs/Makefile | 2 +- editors/the/Makefile | 2 +- editors/xvile/Makefile | 2 +- games/3dc/Makefile | 2 +- games/xboard/Makefile | 2 +- games/xfrisk/Makefile | 2 +- games/xmine/Makefile | 2 +- graphics/xfig/Makefile | 2 +- japanese/kterm/Makefile | 2 +- math/snns/Makefile | 2 +- print/gv/Makefile | 2 +- x11-toolkits/Makefile | 2 +- x11-toolkits/{Xaw3d => libXaw3d}/Makefile | 4 +++- x11-toolkits/{Xaw3d => libXaw3d}/distinfo | 0 x11-toolkits/{Xaw3d => libXaw3d}/files/patch-Box.c | 0 .../{Xaw3d => libXaw3d}/files/patch-runtime_scrollbars | 0 x11-toolkits/{Xaw3d => libXaw3d}/files/pkg-message.in | 0 x11-toolkits/{Xaw3d => libXaw3d}/pkg-descr | 0 x11-toolkits/{Xaw3d => libXaw3d}/pkg-plist | 0 x11-toolkits/mowitz/Makefile | 2 +- x11/libsx/Makefile | 2 +- x11/xterm/Makefile | 2 +- x11/xvkbd/Makefile | 2 +- 28 files changed, 24 insertions(+), 21 deletions(-) rename x11-toolkits/{Xaw3d => libXaw3d}/Makefile (85%) rename x11-toolkits/{Xaw3d => libXaw3d}/distinfo (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/files/patch-Box.c (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/files/patch-runtime_scrollbars (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/files/pkg-message.in (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/pkg-descr (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/pkg-plist (100%) diff --git a/MOVED b/MOVED index 5c749693f874..e3cf86c26f91 100644 --- a/MOVED +++ b/MOVED @@ -4216,3 +4216,4 @@ devel/py-eggtestinfo||2025-03-21|Has expired: Was a requirement for now removed www/rubygem-gitlab-gollum-lib|www/rubygem-gollum-lib|2025-03-22|Use www/rubygem-gollum-lib instead www/sogo-activesync|www/sogo|2025-03-22|Use sogo-mysqlactivesync or sogo-pgsqlactivesync flavors instead net/clash|net/mihomo|2025-03-23|Project is renamed +x11-toolkits/Xaw3d|x11-toolkits/libXaw3d|2025-03-23|Rename in preparation to rebase the port forom Slackware to freedesktop.org diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface index e42fa8386f74..4098fc8f1978 100644 --- a/audio/timidity++/Makefile.interface +++ b/audio/timidity++/Makefile.interface @@ -103,7 +103,7 @@ DESKTOP_ENTRIES="TkMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" "" .if ${INTERFACE} == "xaw" LINK= xawmidi -LIB_DEPENDS+= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS+= libXaw3d.so:x11-toolkits/libXaw3d USES+= xorg USE_XORG= x11 xext xmu xt sm ice xpm diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile index de6bdc5a6ae4..b248ad867ec9 100644 --- a/comms/acfax/Makefile +++ b/comms/acfax/Makefile @@ -10,7 +10,7 @@ COMMENT= Receive faxes using sound card and radio LICENSE= GPLv2 -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d \ +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d \ libgnuregex.so.6:devel/libgnuregex USES= imake xorg diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile index f01df43a1928..2dc710c1e3cb 100644 --- a/devel/pdcurses/Makefile +++ b/devel/pdcurses/Makefile @@ -35,7 +35,7 @@ DEBUG_CONFIGURE_ENABLE= debug LATIN1_CONFIGURE_ENABLE= latin1 NEXTAW_LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw NEXTAW_CONFIGURE_WITH= nextaw -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_WITH= xaw3d #post-install: diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index cfec9b96c380..9fc399d70b0e 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -202,7 +202,7 @@ TREESITTER_LIB_DEPENDS= libtree-sitter.so:devel/tree-sitter TREESITTER_CONFIGURE_WITH= tree-sitter WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_CONFIGURE_WITH= webp -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena \ diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index ed55e4f14421..81d82aafc99d 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -228,7 +228,7 @@ TREESITTER_LIB_DEPENDS= libtree-sitter.so:devel/tree-sitter TREESITTER_CONFIGURE_WITH= tree-sitter WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_CONFIGURE_WITH= webp -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena \ diff --git a/editors/the/Makefile b/editors/the/Makefile index b50fcdf8b9a3..532059122455 100644 --- a/editors/the/Makefile +++ b/editors/the/Makefile @@ -32,7 +32,7 @@ REXX_IMC_DESC= Use Rexx/imc interpreter REGINA_DESC= Use Regina Rexx interpreter XAW3D_CONFIGURE_WITH= xaw3d -XAW3D_BUILD_DEPENDS= ${LOCALBASE}/lib/libXaw3d.a:x11-toolkits/Xaw3d +XAW3D_BUILD_DEPENDS= ${LOCALBASE}/lib/libXaw3d.a:x11-toolkits/libXaw3d NCURSES_USES= ncurses NCURSES_CONFIGURE_ON= --with-ncurses \ diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index d5ffcb45c734..465bcc3d2256 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -58,7 +58,7 @@ XAW_DESC= X Athena Widgets XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-screen=athena XAW3D_DESC= X Athena Widgets with 3D effect -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_ON= --enable-colored-menus \ --with-Xaw3d \ --with-screen=xaw3d diff --git a/games/3dc/Makefile b/games/3dc/Makefile index 17c24ba18a79..1db68a970d4f 100644 --- a/games/3dc/Makefile +++ b/games/3dc/Makefile @@ -11,7 +11,7 @@ COMMENT= 3-Dimensional Chess for X Window System LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/../GPL -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= perl5 xorg USE_PERL5= build diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 06842c84246c..6702b726001f 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -44,7 +44,7 @@ FAIRYMAX_RUN_DEPENDS= fairymax:games/fairymax GNUCHESS_RUN_DEPENDS= gnuchess:games/gnuchess KNIGHTCAP_RUN_DEPENDS= KnightCap:games/KnightCap PHALANX_RUN_DEPENDS= phalanx:games/phalanx -XAW3D_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d SOX_RUN_DEPENDS= play:audio/sox ALSA_RUN_DEPENDS= aplay:audio/alsa-utils NLS_USES= gettext diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 522b9d36c8e1..387ffd0b5161 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -17,7 +17,7 @@ LICENSE_TEXT_CR= Possible trademark infringement LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_PERMS_CR= dist-mirror pkg-mirror auto-accept -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d WRKSRC= ${WRKDIR}/XFrisk diff --git a/games/xmine/Makefile b/games/xmine/Makefile index c7821d6dce7e..1fe730d3ccdb 100644 --- a/games/xmine/Makefile +++ b/games/xmine/Makefile @@ -9,7 +9,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-Xaw MAINTAINER= joerg@FreeBSD.org COMMENT= The `Athena' port of the xminesweeper game -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= imake xorg USE_XORG= x11 xaw xext xmu xt xpm sm ice diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index c5493581cfa6..145ed1d7d42e 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -15,7 +15,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libXaw3d.so:x11-toolkits/Xaw3d + libXaw3d.so:x11-toolkits/libXaw3d RUN_DEPENDS= fig2dev:print/fig2dev USES= cpe desktop-file-utils gmake ghostscript:lib jpeg localbase:ldflags \ diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index ad02e96975a6..4dc204e0c5d6 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -40,7 +40,7 @@ VGAFONT_EXTRACT_DEPENDS= \ VGAFONT_BUILD_DEPENDS= \ ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale VGAFONT_USES= fonts -XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d .include diff --git a/math/snns/Makefile b/math/snns/Makefile index 6d60b3207afa..00545aaa6dc7 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -9,7 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Fully featured neural network simulator WWW= https://www.ra.cs.uni-tuebingen.de/SNNS/ -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= xorg USE_XORG= x11 xext xt diff --git a/print/gv/Makefile b/print/gv/Makefile index 2d38dad252ea..d6d0ddbc6272 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -8,7 +8,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= PostScript and PDF previewer WWW= https://www.gnu.org/software/gv/ -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= cpe ghostscript:x11 iconv gmake perl5 shebangfix xorg USE_PERL5= build diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index f82cb32a6c56..063dabebd864 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -1,7 +1,6 @@ COMMENT = X11 toolkits SUBDIR += SoXt - SUBDIR += Xaw3d SUBDIR += Xmt SUBDIR += amtk SUBDIR += aquamarine @@ -81,6 +80,7 @@ SUBDIR += kproperty SUBDIR += lesstif SUBDIR += libXaw + SUBDIR += libXaw3d SUBDIR += libXmu SUBDIR += libXt SUBDIR += libadwaita diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/libXaw3d/Makefile similarity index 85% rename from x11-toolkits/Xaw3d/Makefile rename to x11-toolkits/libXaw3d/Makefile index 757bb5af0f7f..73bf890a75bc 100644 --- a/x11-toolkits/Xaw3d/Makefile +++ b/x11-toolkits/libXaw3d/Makefile @@ -1,8 +1,10 @@ -PORTNAME= Xaw3d +PORTNAME= libXaw3d PORTVERSION= 1.5E PORTREVISION= 8 CATEGORIES= x11-toolkits MASTER_SITES= http://slackware.cs.utah.edu/pub/slackware/slackware64-13.1/source/x/xaw3d/ +DISTNAME= Xaw3d-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} +DOCSDIR= ${PREFIX}/share/doc/Xaw3d MAINTAINER= cy@FreeBSD.org COMMENT= 3-D Athena Widget set that looks like Motif diff --git a/x11-toolkits/Xaw3d/distinfo b/x11-toolkits/libXaw3d/distinfo similarity index 100% rename from x11-toolkits/Xaw3d/distinfo rename to x11-toolkits/libXaw3d/distinfo diff --git a/x11-toolkits/Xaw3d/files/patch-Box.c b/x11-toolkits/libXaw3d/files/patch-Box.c similarity index 100% rename from x11-toolkits/Xaw3d/files/patch-Box.c rename to x11-toolkits/libXaw3d/files/patch-Box.c diff --git a/x11-toolkits/Xaw3d/files/patch-runtime_scrollbars b/x11-toolkits/libXaw3d/files/patch-runtime_scrollbars similarity index 100% rename from x11-toolkits/Xaw3d/files/patch-runtime_scrollbars rename to x11-toolkits/libXaw3d/files/patch-runtime_scrollbars diff --git a/x11-toolkits/Xaw3d/files/pkg-message.in b/x11-toolkits/libXaw3d/files/pkg-message.in similarity index 100% rename from x11-toolkits/Xaw3d/files/pkg-message.in rename to x11-toolkits/libXaw3d/files/pkg-message.in diff --git a/x11-toolkits/Xaw3d/pkg-descr b/x11-toolkits/libXaw3d/pkg-descr similarity index 100% rename from x11-toolkits/Xaw3d/pkg-descr rename to x11-toolkits/libXaw3d/pkg-descr diff --git a/x11-toolkits/Xaw3d/pkg-plist b/x11-toolkits/libXaw3d/pkg-plist similarity index 100% rename from x11-toolkits/Xaw3d/pkg-plist rename to x11-toolkits/libXaw3d/pkg-plist diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile index 0b57acd02abe..69300cb7c433 100644 --- a/x11-toolkits/mowitz/Makefile +++ b/x11-toolkits/mowitz/Makefile @@ -8,7 +8,7 @@ MAINTAINER= ports@virtual-estates.net COMMENT= Mowitz ("More widgets") library WWW= https://siag.nu/mowitz/ -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= libtool xorg USE_XORG= ice sm x11 xaw xext xmu xpm xt diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile index e7e29c60f817..d7313598544d 100644 --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -8,7 +8,7 @@ DISTNAME= ${PORTNAME} MAINTAINER= bofh@FreeBSD.org COMMENT= Simple X11 library -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= tar:Z xorg USE_XORG= x11 xaw xext xmu xt diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 7fb25a2d97d6..43ac247bc29a 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -73,7 +73,7 @@ WCHAR_CONFIGURE_ENABLE= wide-chars WCHAR_VARS= PKGMESSAGE="${PKGDIR}/pkg-message.wchar" XAW3DXFT_LIB_DEPENDS= libXaw3dxft.so:x11-toolkits/libxaw3dxft XAW3DXFT_CONFIGURE_WITH= Xaw3dxft -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_WITH= Xaw3d XAW_USE= XORG=xaw XINERAMA_USE= XORG=xinerama,xorgproto diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index 4b986ac81b57..d6d80ba015fb 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= DOCS GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share XAW3D_DESC= Xaw3d widget library support -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XTEST_DESC= XTEST extensions support XTEST_USES= xorg XTEST_USE= xorg=xtst