diff --git a/dev-vcs/subversion/patches/subversion-1.14.3.patchset b/dev-vcs/subversion/patches/subversion-1.14.3.patchset index 0da49e657..ad38d9bea 100644 --- a/dev-vcs/subversion/patches/subversion-1.14.3.patchset +++ b/dev-vcs/subversion/patches/subversion-1.14.3.patchset @@ -1,4 +1,4 @@ -From 4cf803e3b6522b483a2f72e7a6a8d7f5032a8aff Mon Sep 17 00:00:00 2001 +From c0d4302882f21441a524733d6914ddd70265f399 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 17 Sep 2014 16:54:23 +0200 Subject: fix COMMON directory reference. @@ -18,5 +18,29 @@ index a437c89..a1f2a18 100644 if (error) return SVN_NO_ERROR; -- -2.37.3 +2.45.2 + + +From d7d42f33da5077051b39da7f88ed25423b643501 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= +Date: Fri, 5 Jul 2024 21:05:20 +0200 +Subject: use make pure_install for the perl bindings + +This avoids installing perllocal.pod + +diff --git a/Makefile.in b/Makefile.in +index 7f0a37d..ecdfde1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -906,7 +906,7 @@ check-swig-pl: swig-pl swig-pl-lib + cd $(SWIG_PL_DIR)/native; $(MAKE) test + + install-swig-pl: swig-pl install-swig-pl-lib +- cd $(SWIG_PL_DIR)/native; $(MAKE) install ++ cd $(SWIG_PL_DIR)/native; $(MAKE) pure_install + + EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \ + $(SWIG_PL_SRC_DIR)/native/core.c +-- +2.45.2 diff --git a/dev-vcs/subversion/subversion-1.14.3.recipe b/dev-vcs/subversion/subversion-1.14.3.recipe index 1cc353dcf..07407086b 100644 --- a/dev-vcs/subversion/subversion-1.14.3.recipe +++ b/dev-vcs/subversion/subversion-1.14.3.recipe @@ -7,19 +7,20 @@ and projects, from individuals to large-scale enterprise operations." HOMEPAGE="https://subversion.apache.org/" COPYRIGHT="2010-2020 The Apache Software Foundation" LICENSE="Apache-Subversion" -REVISION="1" +REVISION="2" SOURCE_URI="http://archive.apache.org/dist/subversion/subversion-$portVersion.tar.bz2" CHECKSUM_SHA256="949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440" PATCHES="subversion-$portVersion.patchset" -ARCHITECTURES="all" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" USER_SETTINGS_FILES=" settings/subversion directory " PROVIDES=" - subversion = $portVersion compat >= 1.8 + subversion$secondaryArchSuffix = $portVersion compat >= 1.8 cmd:svn = $portVersion compat >= 1.8 cmd:svnadmin = $portVersion compat >= 1.8 cmd:svnbench = $portVersion compat >= 1.9 @@ -31,82 +32,111 @@ PROVIDES=" cmd:svnserve = $portVersion compat >= 1.8 cmd:svnsync = $portVersion compat >= 1.8 cmd:svnversion = $portVersion compat >= 1.8 - lib:libsvn_client_1 = 0.0.0 compat >= 0 - lib:libsvn_delta_1 = 0.0.0 compat >= 0 - lib:libsvn_diff_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 - lib:libsvn_fs_x_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_serf_1 = 0.0.0 compat >= 0 - lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 - lib:libsvn_repos_1 = 0.0.0 compat >= 0 - lib:libsvn_subr_1 = 0.0.0 compat >= 0 - lib:libsvn_swig_perl_1 = 0.0.0 compat >= 0 - lib:libsvn_wc_1 = 0.0.0 compat >= 0 + lib:libsvn_client_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_delta_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_diff_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_fs_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_fs_fs_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_fs_util_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_fs_x_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_ra_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_ra_local_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_ra_serf_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_ra_svn_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_repos_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_subr_1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libsvn_wc_1$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" - haiku - lib:libapr_1 - lib:libaprutil_1 - lib:libcrypto - lib:libexpat - lib:libiconv - lib:liblz4 - lib:libserf_1 - lib:libsqlite3 - lib:libssl - lib:libxml2 - lib:libz + haiku$secondaryArchSuffix + lib:libapr_1$secondaryArchSuffix + lib:libaprutil_1$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:liblz4$secondaryArchSuffix + lib:libserf_1$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix " +if [ "$targetArchitecture" = x86_gcc2 ]; then + REPLACES=" + subversion + " +fi PROVIDES_devel=" - subversion_devel = $portVersion compat >= 1.8 - devel:libsvn_client_1 = 0.0.0 compat >= 0 - devel:libsvn_delta_1 = 0.0.0 compat >= 0 - devel:libsvn_diff_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_util_1 = 0.0.0 compat >= 0 - devel:libsvn_fs_x_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_local_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_serf_1 = 0.0.0 compat >= 0 - devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0 - devel:libsvn_repos_1 = 0.0.0 compat >= 0 - devel:libsvn_subr_1 = 0.0.0 compat >= 0 - devel:libsvn_swig_perl_1 = 0.0.0 compat >= 0 - devel:libsvn_wc_1 = 0.0.0 compat >= 0 + subversion${secondaryArchSuffix}_devel = $portVersion compat >= 1.8 + devel:libsvn_client_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_delta_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_diff_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_fs_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_fs_fs_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_fs_util_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_fs_x_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_ra_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_ra_local_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_ra_serf_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_ra_svn_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_repos_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_subr_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_swig_perl_1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libsvn_wc_1$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" - subversion == $portVersion base + subversion$secondaryArchSuffix == $portVersion base + subversion${secondaryArchSuffix}_perl == $portVersion + " + +PROVIDES_perl=" + subversion${secondaryArchSuffix}_perl = $portVersion compat >= 1.8 + lib:libsvn_swig_perl_1$secondaryArchSuffix = 0.0.0 compat >= 0 + " +if [ -n "$secondaryArchSuffix" ]; then + PROVIDES_perl+=" + subversion_perl = $portVersion compat >= 1.8 + " +fi +REQUIRES_perl=" + haiku$secondaryArchSuffix + subversion$secondaryArchSuffix == $portVersion base + vendor_perl + lib:libapr_1$secondaryArchSuffix + lib:libaprutil_1$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:liblz4$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel - expat_devel >= 2.1 - libiconv_devel >= 1.13 - sqlite_devel >= 3.4 - devel:libapr_1 >= 0.3 - devel:libaprutil_1 >= 0.3 - devel:libcrypto - devel:liblz4 - devel:libserf_1 - devel:libssl - devel:libxml2 >= 2.7 - devel:libz + haiku${secondaryArchSuffix}_devel + expat${secondaryArchSuffix}_devel >= 2.1 + libiconv${secondaryArchSuffix}_devel >= 1.13 + sqlite${secondaryArchSuffix}_devel >= 3.4 + devel:libapr_1$secondaryArchSuffix >= 0.3 + devel:libaprutil_1$secondaryArchSuffix >= 0.3 + devel:libcrypto$secondaryArchSuffix + devel:liblz4$secondaryArchSuffix + devel:libserf_1$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix >= 2.7 + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal + cmd:apr_1_config$secondaryArchSuffix cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:perl - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix cmd:python3 cmd:sed cmd:swig @@ -115,8 +145,7 @@ BUILD_PREREQUIRES=" BUILD() { CFLAGS=-std=c9x CPPFLAGS=-P LIBS="-lcrypto -lssl" runConfigure ./configure \ - --with-apr=$portPackageLinksDir/devel~libapr_1 \ - --with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \ + --bindir=$prefix/bin \ --with-serf \ --with-zlib \ --with-editor=nano \ @@ -163,6 +192,11 @@ INSTALL() # devel package packageEntries devel \ $developDir + + # perl bindings + packageEntries perl \ + $libDir/libsvn_swig_perl-1.so* \ + $prefix/lib/perl5 }