diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 22:11:40 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 22:11:40 +0000 |
| commit | 5933ac0b099d61d98eb531d373cf57a8927bc7af (patch) | |
| tree | fc0ebf2ac7225dec2aa7f2a7b0efbb91919c1030 /ports-mgmt | |
| parent | e2521329169c2867009b66984bc2988c9631f00f (diff) | |
| download | ports-5933ac0b099d61d98eb531d373cf57a8927bc7af.tar.gz ports-5933ac0b099d61d98eb531d373cf57a8927bc7af.zip | |
*/*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").
Approved by: portmgr (blanket)
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index d6c6f6cfdcbc..5dfcbf401585 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -15,7 +15,7 @@ COMMENT= FreeBSD ports/packages management tool (devel version) LICENSE= BSD3CLAUSE -CONFLICTS_INSTALL= portupgrade-[0-9]* +CONFLICTS_INSTALL= portupgrade USES= uidfix diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index bb04a983810d..eaac39c045d4 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -12,7 +12,7 @@ COMMENT= Port build and test system LICENSE= BSD2CLAUSE -CONFLICTS_INSTALL= poudriere-[0-9]* +CONFLICTS_INSTALL= poudriere USE_GITHUB= yes GH_ACCOUNT= freebsd diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 215a512ad71c..a4e9f79a0eca 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -11,7 +11,7 @@ COMMENT= Port build and test system LICENSE= BSD2CLAUSE -CONFLICTS_INSTALL= poudriere-devel-[0-9]* +CONFLICTS_INSTALL= poudriere-devel USE_GITHUB= yes GH_ACCOUNT= freebsd |