mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

*/*: Fix conflict of PKGNAME

Browse source 
* Fix conflict of PKGNAME by adding PKGNAMESUFFIX to the ports below
  - databases/tdb1410
  - devel/talloc242
  - devel/tevent016
* Set CONFLICTS_INSTALL between different versions of each port.
* Update dependencies of databases/ldb29 and net/samba420 to reflect
  change of PKGNAME.
* Bump PORTREVISION of modified ports.

Reviewed by:	0mp, kiwi
Differential Revision:	https://reviews.freebsd.org/D48826
This commit is contained in:
Yasuhiro Kimura 2025-02-05 14:04:12 +09:00
parent a219d5e31e
commit ed189afb08
8 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
databases/ldb29/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= ldb PORTNAME= ldb
PORTVERSION= 2.9.2 PORTVERSION= 2.9.2
PORTREVISION= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= SAMBA MASTER_SITES= SAMBA
PKGNAMESUFFIX?= ${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/} PKGNAMESUFFIX?= ${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/}
@ -79,8 +80,8 @@ PYTHON3_PLIST_FILES= ${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc \
# No fancy color error messages # No fancy color error messages
_CFLAGS_clang= -fno-color-diagnostics _CFLAGS_clang= -fno-color-diagnostics
_LDB_DEPENDS= talloc>=2.4.2:devel/talloc242 tevent>=0.16.0:devel/tevent016 \ _LDB_DEPENDS= talloc242>=2.4.2:devel/talloc242 tevent016>=0.16.0:devel/tevent016 \
tdb>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \ tdb1410>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \
popt>=0:devel/popt popt>=0:devel/popt
_LDB_BINS= bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \ _LDB_BINS= bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \
bin/ldbrename bin/ldbrename

2
databases/tdb/Makefile
View file

@ -27,6 +27,8 @@ CONFIGURE_ARGS+= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1 CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1
CONFLICTS_INSTALL= tdb[0-9]*
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= MANPAGES DEBUG PYTHON OPTIONS_DEFINE= MANPAGES DEBUG PYTHON

4
databases/tdb1410/Makefile
View file

@ -1,8 +1,10 @@
PORTNAME= tdb PORTNAME= tdb
DISTVERSION= 1.4.10 DISTVERSION= 1.4.10
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= SAMBA MASTER_SITES= SAMBA
PKGNAMESUFFIX= 1410
MAINTAINER= samba@FreeBSD.org MAINTAINER= samba@FreeBSD.org
COMMENT= Trivial Database COMMENT= Trivial Database
@ -27,6 +29,8 @@ CONFIGURE_ARGS+= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1 CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1
CONFLICTS_INSTALL= tdb
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= MANPAGES DEBUG PYTHON OPTIONS_DEFINE= MANPAGES DEBUG PYTHON

2
devel/talloc/Makefile
View file

@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1 CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1
CONFLICTS_INSTALL= talloc[0-9]*
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON OPTIONS_DEFINE= DEBUG MANPAGES PYTHON

4
devel/talloc242/Makefile
View file

@ -1,7 +1,9 @@
PORTNAME= talloc PORTNAME= talloc
DISTVERSION= 2.4.2 DISTVERSION= 2.4.2
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= SAMBA MASTER_SITES= SAMBA
PKGNAMESUFFIX= 242
MAINTAINER= samba@FreeBSD.org MAINTAINER= samba@FreeBSD.org
COMMENT= Hierarchical pool based memory allocator COMMENT= Hierarchical pool based memory allocator
@ -26,6 +28,8 @@ CONFIGURE_ARGS+= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1 CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1
CONFLICTS_INSTALL= talloc
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON OPTIONS_DEFINE= DEBUG MANPAGES PYTHON

2
devel/tevent/Makefile
View file

@ -30,6 +30,8 @@ CONFIGURE_ARGS= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1 CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1
CONFLICTS_INSTALL= tevent[0-9]*
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON OPTIONS_DEFINE= DEBUG MANPAGES PYTHON

8
devel/tevent016/Makefile
View file

@ -1,8 +1,10 @@
PORTNAME= tevent PORTNAME= tevent
DISTVERSION= 0.16.1 DISTVERSION= 0.16.1
PORTREVISION= 1
PORTEPOCH= 0 PORTEPOCH= 0
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= SAMBA MASTER_SITES= SAMBA
PKGNAMESUFFIX= 016
MAINTAINER= samba@FreeBSD.org MAINTAINER= samba@FreeBSD.org
COMMENT= Talloc based event loop library COMMENT= Talloc based event loop library
@ -10,8 +12,8 @@ WWW= https://tevent.samba.org/
LICENSE= LGPL3 LICENSE= LGPL3
BUILD_DEPENDS= talloc>=2.4.2:devel/talloc242 BUILD_DEPENDS= talloc242>=2.4.2:devel/talloc242
RUN_DEPENDS= talloc>=2.4.2:devel/talloc242 RUN_DEPENDS= talloc242>=2.4.2:devel/talloc242
USES= compiler pkgconfig shebangfix waf USES= compiler pkgconfig shebangfix waf
USE_LDCONFIG= yes USE_LDCONFIG= yes
@ -30,6 +32,8 @@ CONFIGURE_ARGS= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1 CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1
CONFLICTS_INSTALL= tevent
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON OPTIONS_DEFINE= DEBUG MANPAGES PYTHON

13
net/samba420/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= ${SAMBA4_BASENAME}420 PORTNAME= ${SAMBA4_BASENAME}420
PORTVERSION= ${SAMBA4_VERSION} PORTVERSION= ${SAMBA4_VERSION}
PORTREVISION= 1
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME} DISTNAME= ${SAMBA4_DISTNAME}
@ -220,8 +221,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
.else .else
SAMBA4_BUNDLED_LIBS+= !talloc SAMBA4_BUNDLED_LIBS+= !talloc
BUILD_DEPENDS+= talloc>=2.4.2:devel/talloc242 BUILD_DEPENDS+= talloc242>=2.4.2:devel/talloc242
RUN_DEPENDS+= talloc>=2.4.2:devel/talloc242 RUN_DEPENDS+= talloc242>=2.4.2:devel/talloc242
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment " PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
.endif .endif
@ -233,8 +234,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
.else .else
SAMBA4_BUNDLED_LIBS+= !tevent SAMBA4_BUNDLED_LIBS+= !tevent
BUILD_DEPENDS+= tevent>=0.16.1:devel/tevent016 BUILD_DEPENDS+= tevent016>=0.16.1:devel/tevent016
RUN_DEPENDS+= tevent>=0.16.1:devel/tevent016 RUN_DEPENDS+= tevent016>=0.16.1:devel/tevent016
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment " PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
.endif .endif
@ -246,8 +247,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
SUB_LIST+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB=""
.else .else
SAMBA4_BUNDLED_LIBS+= !tdb SAMBA4_BUNDLED_LIBS+= !tdb
BUILD_DEPENDS+= tdb>=1.4.10:databases/tdb1410 BUILD_DEPENDS+= tdb1410>=1.4.10:databases/tdb1410
RUN_DEPENDS+= tdb>=1.4.10:databases/tdb1410 RUN_DEPENDS+= tdb1410>=1.4.10:databases/tdb1410
PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.endif .endif