From: Jeremie Courreges-Anglas <jca@wxcvbn.org>
Subject: Re: switch tacacs+ to python3
To: Daniel Dickman <didickman@gmail.com>
Cc: Jan Vlach <janus@volny.cz>,  ports@openbsd.org
Date: Mon, 19 Feb 2024 13:55:08 +0100

On Sat, Feb 17 2024, Daniel Dickman <didickman@gmail.com> wrote:
> Hello Jan, ports@,
>
> Please see below for a small update so tacacs+ doesn't need python2.
>
> It also looks like python2 is not needed at build time, but only at run 
> time.
>
> ok to commit the diff below?

do_auth.py isn't ready for python3, if you really want to move this to
python3 I would suggest using 2to3 -w in eg post-extract (and thus keep
current MODPY_BUILDDEP).

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/tacacs+/Makefile,v
> diff -u -p -u -r1.25 Makefile
> --- Makefile	27 Sep 2023 14:18:34 -0000	1.25
> +++ Makefile	17 Feb 2024 21:16:00 -0000
> @@ -4,7 +4,7 @@ V =		4.0.4.28
>  DISTNAME =	tacacs-F${V}
>  PKGNAME =	tacacs+-${V}
>  EPOCH =		0
> -REVISION =	1
> +REVISION =	2
>  
>  SHARED_LIBS +=  tacacs                    1.0
>  
> @@ -20,7 +20,9 @@ WANTLIB += c pthread
>  SITES =		ftp://ftp.shrubbery.net/pub/tac_plus/
>  
>  MODULES =	lang/python
> -MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
> +
> +MODPY_BUILDDEP =	No
> +
>  MODPY_ADJ_FILES = do_auth.py
>  
>  BUILD_DEPENDS =	devel/bison
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/tacacs+/pkg/PLIST,v
> diff -u -p -u -r1.12 PLIST
> --- pkg/PLIST	8 Nov 2022 11:17:02 -0000	1.12
> +++ pkg/PLIST	17 Feb 2024 21:16:00 -0000
> @@ -3,7 +3,7 @@
>  @extraunexec rm -f /var/log/tac_plus/*
>  @rcscript ${RCDIR}/tac_plus
>  include/tacacs.h
> -lib/libtacacs.a
> +@static-lib lib/libtacacs.a
>  lib/libtacacs.la
>  @lib lib/libtacacs.so.${LIBtacacs_VERSION}
>  @man man/man5/tac_plus.conf.5
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE