Actions
Submit #3201
open
Fixes make search display
Added by htse over 5 years ago. Updated 4 months ago.
Description
when doing /usr/dports/Makefile's 'make search'
the result is incorrectly displayed:
B-deps is empty R-deps is empty WWW is empty
current:
--------
Port: py27-wxPython30-3.0.2.0_7 Path: /usr/dports/x11-toolkits/py-wxPython30 Info: GUI toolkit for the Python programming language Maint: python@FreeBSD.org B-deps: R-deps: WWW:
corrections are done in Mk/bsd.port.subdir.mk, function changed starts at line 380:
fixed a typo and corrected the offsets
result:
-------
Port: py27-wxPython30-3.0.2.0_7 Path: /usr/dports/x11-toolkits/py-wxPython30 Info: GUI toolkit for the Python programming language Maint: python@FreeBSD.org B-deps: /usr/dports/devel/gettext-runtime /usr/dports/devel/gettext-tools /usr/dports/devel/pkgconf /usr/dports/devel/py-setuptools /usr/dports/lang/python27 /usr/dports/x11-toolkits/wxgtk30 R-deps: /usr/dports/devel/gettext-runtime /usr/dports/devel/py-setuptools /usr/dports/lang/python27 /usr/dports/x11-toolkits/py-wxPython-common /usr/dports/x11-toolkits/wxgtk30 WWW: http://www.wxpython.org
which is the desired info-display
Files
| fix_make_search_info_display.patch (3.61 KB) fix_make_search_info_display.patch | htse, 08/17/2019 05:26 PM |
Updated by
Updated by daftaupe almost 2 years ago
- Category set to DPorts
- Status changed from New to In Progress
- Assignee set to daftaupe
Hi,
it seems the search functionnality is still broken as of today (I didn't know about that one actually).
First thing is that it seems there's an error in /usr/dports/Mk/bsd.port.subdir.mk as reported when trying
% make fetchindex
make: "/usr/dports/Mk/bsd.port.subdir.mk" line 151: if-less endif
make: Fatal errors encountered -- cannot continue
make: stopped in /usr/dports
I was able to fix that with the following diff
git diff Mk/bsd.port.subdir.mk
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index ac241d9e07d..57482f5831b 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -148,8 +148,6 @@ UID!= ${ID} -u
. endif
_EXPORTED_VARS+= UID
-.endif
-
INDEXDIR?= ${PORTSDIR}
INDEXFILE?= INDEX
Then an INDEX file is required and the URL defined by MASTER_SITE_INDEX?= is not available anymore
I was able to workaround by using https://sting.dragonflybsd.org/dports/ instead of http://muscles.dragonflybsd.org/ in the Makefile, but not sure that's the right location as sting is used for the stage branch, not for master branch of dports so INDEX should contain a different set of data.
It was possible to run the following
% make search name=wxPython
Port: py39-wxPython41-4.1.1
Path: /usr/dports/x11-toolkits/py-wxPython4
Info: GUI toolkit for the Python programming language
Maint: desktop@FreeBSD.org
B-deps:
R-deps:
WWW:
Port: x11-toolkits/py-wxPython26
Moved: x11-toolkits/py-wxPython28
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython26-common
Moved: x11-toolkits/py-wxPython28-common
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython26-unicode
Moved: x11-toolkits/py-wxPython28-unicode
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython28-unicode
Moved: x11-toolkits/py-wxPython28
Date: 2015-09-16
Reason: Make wxGTK now only unicode
Port: x11-toolkits/py-wxPython-common
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython28-common
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython30
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython28
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython40
Moved: x11-toolkits/py-wxPython4
Date: 2022-02-25
Reason: Renamed to py-wxPython4
After applying your patch, it was slightly better, but the WWW still appaered blank, I had no time to investigate further.
% patch < fix_make_search_info_display.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
|index 8fef2e048b7..e316b87703e 100644
|--- a/Mk/bsd.port.subdir.mk
|+++ b/Mk/bsd.port.subdir.mk
--------------------------
Patching file Mk/bsd.port.subdir.mk using Plan A...
Hunk #1 succeeded at 428 (offset -2 lines).
Hunk #2 succeeded at 474 (offset -2 lines).
Hunk #3 succeeded at 483 (offset -2 lines).
Hunk #4 succeeded at 499 (offset -2 lines).
done
% make search name=wxPython
Port: py39-wxPython41-4.1.1
Path: /usr/dports/x11-toolkits/py-wxPython4
Info: GUI toolkit for the Python programming language
Maint: desktop@FreeBSD.org
B-deps: /usr/dports/devel/gettext-runtime /usr/dports/devel/gettext-tools /usr/dports/devel/pkgconf /usr/dports/devel/py-pathlib2 /usr/dports/devel/py-setuptools /usr/dports/graphics/libGLU /usr/dports/lang/python39 /usr/dports/x11-toolkits/wxgtk31 /usr/dports/x11/xorgproto
R-deps: /usr/dports/devel/gettext-runtime /usr/dports/devel/py-setuptools /usr/dports/graphics/libGLU /usr/dports/lang/python39 /usr/dports/x11-toolkits/wxgtk31
WWW: https://www.wxpython.org
Port: x11-toolkits/py-wxPython26
Moved: x11-toolkits/py-wxPython28
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython26-common
Moved: x11-toolkits/py-wxPython28-common
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython26-unicode
Moved: x11-toolkits/py-wxPython28-unicode
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython28-unicode
Moved: x11-toolkits/py-wxPython28
Date: 2015-09-16
Reason: Make wxGTK now only unicode
Port: x11-toolkits/py-wxPython-common
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython28-common
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython30
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython28
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython40
Moved: x11-toolkits/py-wxPython4
Date: 2022-02-25
Reason: Renamed to py-wxPython4
So the patch is still working as intended. The thing is, why are our INDEX files not showing anything for field 8, 9 and 10, that is bdeps, rdeps and www.
Do we have a custom script generating them or something ?
Updated by daftaupe almost 2 years ago
Output on FreeBSD
root@fbsdvm:/usr/ports # make fetchindex
/usr/bin/env fetch -am -o /usr/local/poudriere/ports/default/INDEX-12.xz https://download.FreeBSD.org/ports/index/INDEX-12.xz
/usr/local/poudriere/ports/default/INDEX-12.xz 1707 kB 1393 kBps 01s
root@fbsdvm:/usr/ports # make search name=wxPython
Port: py39-wxPython42-4.2.0
Path: /usr/local/poudriere/ports/default/x11-toolkits/py-wxPython4
Info: GUI toolkit for the Python programming language
Maint: desktop@FreeBSD.org
B-deps: adwaita-icon-theme-40.1.1 at-spi2-atk-2.38.0 at-spi2-core-2.44.1 atk-2.38.0 avahi-app-0.8_1 brotli-1.0.9,1 ca_root_nss-3.87 cairo-1.17.4_2,3 colord-1.4.6 cups-2.4.2 curl-7.87.0_1 dbus-1.14.4,1 dbus-glib-0.112 dejavu-2.37_1 duktape-lib-2.7.0 enchant2-2.2.15_2 encodings-1.0.5,1 expat-2.5.0 font-bh-ttf-1.0.3_4 font-misc-ethiopic-1.0.4 font-misc-meltho-1.0.3_4 fontconfig-2.14.0,1 freetype2-2.12.1_2 fribidi-1.0.12 gdbm-1.23 gdk-pixbuf2-2.42.10 geoclue-2.5.7 gettext-runtime-0.21.1 gettext-tools-0.21.1 giflib-5.2.1 glib-2.74.5,2 glib-networking-2.74.0 gmp-6.2.1 gnome_subr-1.0 gnutls-3.7.8_1 gobject-introspection-1.74.0,1 graphene-1.10.8 graphite2-1.3.14 gsettings-desktop-schemas-42.0 gstreamer1-1.20.5 gstreamer1-plugins-1.20.5 gstreamer1-plugins-bad-1.20.5 gstreamer1-plugins-gl-1.20.5 gtk-update-icon-cache-3.24.31 gtk3-3.24.34 harfbuzz-6.0.0 harfbuzz-icu-6.0.0 hicolor-icon-theme-0.17 hunspell-1.7.1 hwdata-0.366,1 hyphen-2.8.8 icu-72.1,1 indexinfo-0.3.1 iso-codes-4.7 jbigkit-2.1_1 jpeg-turbo-2.1.4 json-glib-1.6.6 lcms2-2.13.1 libGLU-9.0.2_1 libICE-1.1.0_1,1 libSM-1.2.3,1 libX11-1.7.2,1 libXau-1.0.9 libXcomposite-0.4.6,1 libXcursor-1.2.0 libXdamage-1.1.6 libXdmcp-1.1.3 libXext-1.3.4,1 libXfixes-6.0.0 libXft-2.3.7 libXi-1.8,1 libXinerama-1.1.4_2,1 libXrandr-1.5.2 libXrender-0.9.10_2 libXt-1.2.1,1 libXtst-1.2.3_2 libXxf86vm-1.1.4_3 libdaemon-0.14_1 libdeflate-1.17 libedit-3.1.20221030,1 libepoll-shim-0.0.20220703 libepoxy-1.5.9 libevent-2.1.12 libffi-3.4.4 libfontenc-1.1.4 libgcrypt-1.9.4_1 libglvnd-1.6.0 libgpg-error-1.46 libgudev-234 libgusb-0.3.10_1 libiconv-1.17 libidn2-2.3.4 liblz4-1.9.4,1 libmspack-0.10.1 libnghttp2-1.51.0 libnice-0.1.19_1 libnotify-0.8.1 libpaper-1.1.28 libproxy-0.4.17_1 libpsl-0.21.2 libpthread-stubs-0.4 librsvg2-rust-2.54.5_4 libsecret-0.20.5_1 libsoup-2.74.3 libssh2-1.10.0_1,3 libtasn1-4.19.0 libtextstyle-0.21.1 libudev-devd-0.5.0 libunistring-1.1 libwpe-1.12.0 libxcb-1.15 libxkbcommon-1.5.0 libxml2-2.10.3_1 libxslt-1.1.37 mkfontscale-1.2.1 mpdecimal-2.5.1 nettle-3.8.1 openjpeg-2.5.0 orc-0.4.32 p11-kit-0.24.1_1 pango-1.50.9 pcre2-10.42 perl5-5.32.1_3 pixman-0.42.2 pkgconf-1.8.1,1 png-1.6.39 polkit-122 py38-setuptools-63.1.0 py39-cairo-1.21.0,1 py39-gobject3-3.42.2 py39-pathlib2-2.3.7 py39-six-1.16.0 pygobject3-common-3.42.2 python38-3.8.16 python39-3.9.16 readline-8.2.0 shared-mime-info-2.2_1 sqlite3-icu-3.40.1,1 tiff-4.4.0_1 wayland-1.21.0 webkit2-gtk3-2.34.6_4 webp-1.2.4_1 woff2-1.0.2_4 wpebackend-fdo-1.12.0 wx32-gtk3-3.2.1 xkeyboard-config-2.34_2 xorg-fonts-truetype-7.7_1 xorgproto-2022.1 zstd-1.5.2_1
R-deps: adwaita-icon-theme-40.1.1 at-spi2-atk-2.38.0 at-spi2-core-2.44.1 atk-2.38.0 avahi-app-0.8_1 brotli-1.0.9,1 ca_root_nss-3.87 cairo-1.17.4_2,3 colord-1.4.6 cups-2.4.2 curl-7.87.0_1 dbus-1.14.4,1 dbus-glib-0.112 dejavu-2.37_1 duktape-lib-2.7.0 enchant2-2.2.15_2 encodings-1.0.5,1 expat-2.5.0 font-bh-ttf-1.0.3_4 font-misc-ethiopic-1.0.4 font-misc-meltho-1.0.3_4 fontconfig-2.14.0,1 freetype2-2.12.1_2 fribidi-1.0.12 gdbm-1.23 gdk-pixbuf2-2.42.10 geoclue-2.5.7 gettext-runtime-0.21.1 giflib-5.2.1 glib-2.74.5,2 glib-networking-2.74.0 gmp-6.2.1 gnome_subr-1.0 gnutls-3.7.8_1 gobject-introspection-1.74.0,1 graphene-1.10.8 graphite2-1.3.14 gsettings-desktop-schemas-42.0 gstreamer1-1.20.5 gstreamer1-plugins-1.20.5 gstreamer1-plugins-bad-1.20.5 gstreamer1-plugins-gl-1.20.5 gtk-update-icon-cache-3.24.31 gtk3-3.24.34 harfbuzz-6.0.0 harfbuzz-icu-6.0.0 hicolor-icon-theme-0.17 hunspell-1.7.1 hwdata-0.366,1 hyphen-2.8.8 icu-72.1,1 indexinfo-0.3.1 iso-codes-4.7 jbigkit-2.1_1 jpeg-turbo-2.1.4 json-glib-1.6.6 lcms2-2.13.1 libGLU-9.0.2_1 libICE-1.1.0_1,1 libSM-1.2.3,1 libX11-1.7.2,1 libXau-1.0.9 libXcomposite-0.4.6,1 libXcursor-1.2.0 libXdamage-1.1.6 libXdmcp-1.1.3 libXext-1.3.4,1 libXfixes-6.0.0 libXft-2.3.7 libXi-1.8,1 libXinerama-1.1.4_2,1 libXrandr-1.5.2 libXrender-0.9.10_2 libXt-1.2.1,1 libXtst-1.2.3_2 libXxf86vm-1.1.4_3 libdaemon-0.14_1 libdeflate-1.17 libedit-3.1.20221030,1 libepoll-shim-0.0.20220703 libepoxy-1.5.9 libevent-2.1.12 libffi-3.4.4 libfontenc-1.1.4 libgcrypt-1.9.4_1 libglvnd-1.6.0 libgpg-error-1.46 libgudev-234 libgusb-0.3.10_1 libiconv-1.17 libidn2-2.3.4 liblz4-1.9.4,1 libmspack-0.10.1 libnghttp2-1.51.0 libnice-0.1.19_1 libnotify-0.8.1 libpaper-1.1.28 libproxy-0.4.17_1 libpsl-0.21.2 libpthread-stubs-0.4 librsvg2-rust-2.54.5_4 libsecret-0.20.5_1 libsoup-2.74.3 libssh2-1.10.0_1,3 libtasn1-4.19.0 libudev-devd-0.5.0 libunistring-1.1 libwpe-1.12.0 libxcb-1.15 libxkbcommon-1.5.0 libxml2-2.10.3_1 libxslt-1.1.37 mkfontscale-1.2.1 mpdecimal-2.5.1 nettle-3.8.1 openjpeg-2.5.0 orc-0.4.32 p11-kit-0.24.1_1 pango-1.50.9 pcre2-10.42 perl5-5.32.1_3 pixman-0.42.2 png-1.6.39 polkit-122 py38-setuptools-63.1.0 py39-cairo-1.21.0,1 py39-gobject3-3.42.2 pygobject3-common-3.42.2 python38-3.8.16 python39-3.9.16 readline-8.2.0 shared-mime-info-2.2_1 sqlite3-icu-3.40.1,1 tiff-4.4.0_1 wayland-1.21.0 webkit2-gtk3-2.34.6_4 webp-1.2.4_1 woff2-1.0.2_4 wpebackend-fdo-1.12.0 wx32-gtk3-3.2.1 xkeyboard-config-2.34_2 xorg-fonts-truetype-7.7_1 xorgproto-2022.1 zstd-1.5.2_1
WWW: https://www.wxpython.org
Port: x11-toolkits/py-wxPython24
Moved:
Date: 2012-10-26
Reason: Not supported upstream anymore, consider using more recent version
Port: x11-toolkits/py-wxPython26
Moved: x11-toolkits/py-wxPython28
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython26-common
Moved: x11-toolkits/py-wxPython28-common
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython26-unicode
Moved: x11-toolkits/py-wxPython28-unicode
Date: 2014-03-24
Reason: wxPython26 is EOLed
Port: x11-toolkits/py-wxPython28-unicode
Moved: x11-toolkits/py-wxPython28
Date: 2015-09-16
Reason: Make wxGTK now only unicode
Port: x11-toolkits/py-wxPython-common
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython28-common
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython30
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython28
Moved:
Date: 2020-08-15
Reason: Has expired: Uses deprecated version of python
Port: x11-toolkits/py-wxPython40
Moved: x11-toolkits/py-wxPython4
Date: 2022-02-25
Reason: Renamed to py-wxPython4
Updated by daftaupe 4 months ago
After investigating a bit more, it seems that the problem comes from our output from make describe of a port.
For example for www/nginx, that gives :
nginx-1.24.0_14,3|/usr/dports/www/nginx|/usr/local|Robust and small WWW server|/usr/dports/www/nginx/pkg-descr|joneum@FreeBSD.org|www||||/usr/dports/devel/gmake /usr/dports/devel/pcre2 /usr/dports/security/openssl|/usr/dports/devel/pcre2 /usr/dports/security/openssl|https://nginx.com/
When we should have, I believe :
nginx-1.24.0_14,3|/usr/dports/www/nginx|/usr/local|Robust and small WWW server|/usr/dports/www/nginx/pkg-descr|joneum@FreeBSD.org|www|/usr/dports/devel/gmake /usr/dports/devel/pcre2 /usr/dports/security/openssl|/usr/dports/devel/pcre2 /usr/dports/security/openssl|https://nginx.com/
I'm trying to run make -d v describe to get more output, but it's way too verbose, so for now, I don't really know what to do. Maybe one of our components is not up-to-date and gives that buggy output.
Also, I guess that's related to repology.net reporting to us that our INDEX is broken.
Actions