diff options
| author | Denis Shaposhnikov <dsh@bamus.cz> | 2024-02-28 14:28:06 +0000 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2024-02-28 14:30:15 +0000 |
| commit | 06b59a3047f5d79b229135a0c9a64fe359ae13b0 (patch) | |
| tree | 6b3236c7e62ce3fdc82fb753e31aa63428939a11 | |
| parent | 57e1b2d15adc40fefa042676fab4d4d0b98595b0 (diff) | |
| download | ports-06b59a3047f5d79b229135a0c9a64fe359ae13b0.tar.gz ports-06b59a3047f5d79b229135a0c9a64fe359ae13b0.zip | |
net/samba419: fix conflict with talloc
PR: 276988
| -rw-r--r-- | net/samba419/Makefile | 10 | ||||
| -rw-r--r-- | net/samba419/pkg-plist | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net/samba419/Makefile b/net/samba419/Makefile index fad94b93861b..312dba2f48b8 100644 --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}419 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -213,7 +213,6 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " # talloc .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= talloc -CONFLICTS_INSTALL+= talloc-* talloc1-* PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else @@ -658,6 +657,13 @@ post-install-fix-manpages: ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/${f} ${STAGEDIR}${PREFIX}/share/man/man1/samba-${f} . endfor .endif + +.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes +. for f in talloc.3 + ${MV} ${STAGEDIR}${PREFIX}/share/man/man3/${f} ${STAGEDIR}${PREFIX}/share/man/man3/samba-${f} +. endfor +.endif + .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes . for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8 ${MV} ${STAGEDIR}${PREFIX}/share/man/man8/${f} ${STAGEDIR}${PREFIX}/share/man/man8/samba-${f} diff --git a/net/samba419/pkg-plist b/net/samba419/pkg-plist index c9087d686bb1..93e4d4c12334 100644 --- a/net/samba419/pkg-plist +++ b/net/samba419/pkg-plist @@ -454,7 +454,7 @@ share/man/man8/winbindd.8.gz %%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpytalloc-util%%PYTHON_EXT_SUFFIX%%-samba4.so %%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_LIBDIR%%/private/libtalloc-samba4.so -%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/talloc.3.gz +%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/samba-talloc.3.gz %%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_tdb_text.py %%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_TDB%%bin/tdbbackup |