From 223ecbfc0f25f9d1bac44a4dfc30100f6b060cbd Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Thu, 23 Jan 2025 16:46:02 +0100 Subject: [PATCH] Conflicts --- databases/tdb1410/Makefile | 2 +- devel/talloc242/Makefile | 2 ++ devel/tevent016/Makefile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/databases/tdb1410/Makefile b/databases/tdb1410/Makefile index c023c8f..0bcf169 100644 --- a/databases/tdb1410/Makefile +++ b/databases/tdb1410/Makefile @@ -55,7 +55,7 @@ MAKE_ENV+= NOCOLOR=yes # undefined symbols. LDFLAGS+= -Wl,--undefined-version -CONFLICTS_INSTALL= tdb +CONFLICTS_INSTALL= tdb post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ diff --git a/devel/talloc242/Makefile b/devel/talloc242/Makefile index 136c6b6..7ed2d5c 100644 --- a/devel/talloc242/Makefile +++ b/devel/talloc242/Makefile @@ -53,6 +53,8 @@ MAKE_ENV+= NOCOLOR=yes # undefined symbols. LDFLAGS+= -Wl,--undefined-version +CONFLICTS_INSTALL= talloc + post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript diff --git a/devel/tevent016/Makefile b/devel/tevent016/Makefile index 9b08313..cb2ebf2 100644 --- a/devel/tevent016/Makefile +++ b/devel/tevent016/Makefile @@ -58,6 +58,8 @@ MAKE_ENV+= NOCOLOR=yes # undefined symbols. LDFLAGS+= -Wl,--undefined-version +CONFLICTS_INSTALL= tevent + post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript