diff --git a/www/links/Portfile b/www/links/Portfile index 3b44bfb5710..94ca6f999bf 100644 --- a/www/links/Portfile +++ b/www/links/Portfile @@ -24,7 +24,8 @@ checksums rmd160 e90763c244fc0e79f0e9ad4ce3d138be3cdc57bb \ maintainers nomaintainer use_bzip2 yes -depends_build port:pkgconfig +depends_build path:bin/pkg-config:pkgconfig + depends_lib port:bzip2 \ port:libevent \ port:xz \ @@ -32,7 +33,7 @@ depends_lib port:bzip2 \ openssl.branch 3 -patchfiles implicit.patch +patchfiles X.patch configure.args --disable-graphics \ --disable-javascript \ diff --git a/www/links/files/X.patch b/www/links/files/X.patch new file mode 100644 index 00000000000..343d1ae23e2 --- /dev/null +++ b/www/links/files/X.patch @@ -0,0 +1,33 @@ +Fix X detection to work properly. +--- configure.orig 2024-07-27 08:25:08.000000000 -0500 ++++ configure 2024-11-14 18:14:04.000000000 -0600 +@@ -8941,7 +8941,7 @@ + # Check for the libraries. + + test -z "$x_direct_test_library" && x_direct_test_library=Xt +- test -z "$x_direct_test_function" && x_direct_test_function='int XtMalloc' ++ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc + + # See if we find them without any special options. + # Don't add to $LIBS permanently. +@@ -8951,8 +8951,9 @@ + #line 8943 "configure" + #include "confdefs.h" + ++#include <${x_direct_test_include}> + int main() { +-${x_direct_test_function}() ++${x_direct_test_function}(0) + ; return 0; } + EOF + if { (eval echo configure:8950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +--- rebuild.orig 2024-07-22 15:47:06.000000000 -0500 ++++ rebuild 2024-11-14 18:47:14.000000000 -0600 +@@ -124,7 +124,6 @@ + /DELETE1/-1,/DELETE1/d + /DELETE2/-1,/DELETE2/d + ,s/^main/int main/ +-,s/XtMalloc/'int XtMalloc'/ + ,s/foo()/int foo()/ + w + q diff --git a/www/links/files/implicit.patch b/www/links/files/implicit.patch deleted file mode 100644 index b9293eddb86..00000000000 --- a/www/links/files/implicit.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix implicit declaration of functions. ---- configure -+++ configure -@@ -8951,8 +8951,9 @@ - #line 8943 "configure" - #include "confdefs.h" - -+#include - int main() { --${x_direct_test_function}() -+${x_direct_test_function}(0) - ; return 0; } - EOF - if { (eval echo configure:8950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then