Wednesday, January 14, 2026

Re: subversion weirdness

yep

-- 
  Sent from a phone, apologies for poor formatting.


On 14 January 2026 15:12:39 Stuart Cassoff <exokoide@yahoo.ca> wrote:

Like this?


Remove incorrect and unneeded
UPDATE_PLIST_ARGS= -I MODPY_WANTLIB
that was breaking update-plist.


diff -Nurp /usr/ports/devel/subversion/Makefile ./Makefile
--- /usr/ports/devel/subversion/Makefile Tue Jul 22 08:45:05 2025
+++ ./Makefile Wed Jan 14 10:06:24 2026
@@ -184,7 +184,6 @@ CONFIGURE_ARGS+=--without-gnome-keyring
 TEST_DEPENDS=${MODPY_RUN_DEPENDS}
 TEST_DEPENDS+= ${FULLPKGNAME-gnome-keyring}:${BUILD_PKGPATH},-gnome-keyring
 SUBST_VARS+= LOCALBASE SO_VERSION MODRUBY_BINREV
-UPDATE_PLIST_ARGS= -I MODPY_WANTLIB
 
 pre-patch:
  @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python




Return Ruby subpackage to the unflavored build.
Removed in r1.198 due to build failure with clang 15.
Ok now with clang 19.


diff -Nurp /usr/ports/devel/subversion/Makefile ./Makefile
--- /usr/ports/devel/subversion/Makefile Wed Jan 14 10:06:24 2026
+++ ./Makefile Wed Jan 14 10:08:17 2026
@@ -43,7 +43,7 @@ EXTRACT_SUFX= .tar.bz2
 
 PSEUDO_FLAVORS= no_bindings no_ap2 no_perl no_python no_ruby no_gnome-keyring
 FLAVORS= maintainer_mode
-FLAVOR?= no_ruby
+FLAVOR?=
 .if ${FLAVOR:Mno_bindings}
 FLAVOR += no_perl no_python no_ruby
 .endif
@@ -55,7 +55,7 @@ WANTLIB= expat iconv intl lz4 m pthread z
 BUILD_DEPENDS= devel/gettext,-tools \
  devel/py3c
 
-MULTI_PACKAGES = -main -ap2 -perl -python -gnome-keyring
+MULTI_PACKAGES = -main -ap2 -perl -python -ruby -gnome-keyring
 
 MAINSPEC = ${PKGNAME}:devel/subversion,-main
 LIB_DEPENDS-main = ${LIB_DEPENDS} \



On Wed, 14 Jan 2026, Stuart Henderson wrote:

On 2026/01/14 09:15, Stuart Cassoff wrote:
Ruby bindings are a bit stale (lots of deprecation warnings)
but otherwise build and test ok on i386 and amd64.

If the port were left as-is, would -ruby need to
be conditionally added to MULTI_PACKAGES?


Stu



Return Ruby subpackage to the unflavored build.
Removed in r1.198 due to build failure with clang 15.
Ok now with clang 19.

Remove incorrect and unneeded
UPDATE_PLIST_ARGS= -I MODPY_WANTLIB
that was breaking update-plist.


if readding them:


diff -Nurp /usr/ports/devel/subversion/Makefile ./Makefile
--- /usr/ports/devel/subversion/Makefile Tue Jul 22 08:45:05 2025
+++ ./Makefile Tue Jan 13 08:35:45 2026
@@ -43,7 +43,7 @@ EXTRACT_SUFX= .tar.bz2

PSEUDO_FLAVORS= no_bindings no_ap2 no_perl no_python no_ruby no_gnome-keyring
FLAVORS= maintainer_mode
-FLAVOR?= no_ruby
+FLAVOR?=
.if ${FLAVOR:Mno_bindings}
FLAVOR += no_perl no_python no_ruby
.endif
@@ -55,7 +55,7 @@ WANTLIB= expat iconv intl lz4 m pthread z
BUILD_DEPENDS= devel/gettext,-tools \
devel/py3c

-MULTI_PACKAGES = -main -ap2 -perl -python -gnome-keyring
+MULTI_PACKAGES = -main -ap2 -perl -python -ruby -gnome-keyring

that would be one commit

MAINSPEC = ${PKGNAME}:devel/subversion,-main
LIB_DEPENDS-main = ${LIB_DEPENDS} \
@@ -184,7 +184,6 @@ CONFIGURE_ARGS+=--without-gnome-keyring
TEST_DEPENDS=${MODPY_RUN_DEPENDS}
TEST_DEPENDS+= ${FULLPKGNAME-gnome-keyring}:${BUILD_PKGPATH},-gnome-keyring
SUBST_VARS+= LOCALBASE SO_VERSION MODRUBY_BINREV
-UPDATE_PLIST_ARGS= -I MODPY_WANTLIB

and that is unrelated to ruby so would be a separate commit

pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python


On Sat, 10 Jan 2026, Stuart Henderson wrote:

that should have been -i not -I, but it's not doing anything useful anyway, so just drop it.

update-plist(1)

--ᅵ
ᅵ Sent from a phone, apologies for poor formatting.


On 10 January 2026 06:15:01 Stuart Cassoff <exokoide@yahoo.ca> wrote:

  Removing UPDATE_PLIST_ARGS unbreaks update-plist.

"UPDATE_PLIST_ARGS= -I MODPY_WANTLIB"

I can't see why this is causing breakage.

Ultimately unrelated to ruby.


On Wed, 7 Jan 2026, Stuart Henderson wrote:

  On 2026/01/07 09:30, Stuart Cassoff wrote:
  $ make update-plist
===> ᅵUpdating plist for subversion-1.14.5
Installing /usr/ports/mystuff/devel/subversion/pkg/svnserve.rc as /usr/perts/pobj/subversion-1.14.5/fake-amd64/etc/rc.d/svnserve
Usage: update-plist [-FfmnOrvx] [-C dir] [-c comment] [-E ext] [-e ext] [-H hints]
ᅵ[-i var] [-I ignored] [-j jobs] [-L logfile] [-P pkgdir]
ᅵ[-S var] [-s var] [-V var] [-w suffix] [-X path]
ᅵ-- pkg_create_args ...


I think it's due to how the ruby bindings were knocked out (after
failing to build with newer clang).








No comments:

Post a Comment