diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-10-28 14:28:24 +0200 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-10-29 11:50:18 +0200 |
| commit | 819f25b36d45b8ac5593ec8e6f470d9ad454b08a (patch) | |
| tree | a9ad0caa2a052fc695c1cdede2866080f5660431 /misc | |
| parent | www/firefox: update to 94.0 (rc3) (diff) | |
*/*: Remove redundant '-[0-9]*' from CONFLICTS
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").
Many CONFLICTS definitions used patterns like "bash-[0-9]*" to filter
for the bash package in any version. But that pattern is functionally
identical with just "bash".
Approved by: portmgr (blanket)
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dahdi-kmod/Makefile | 2 | ||||
| -rw-r--r-- | misc/dahdi-kmod26/Makefile | 2 | ||||
| -rw-r--r-- | misc/dahdi/Makefile | 2 | ||||
| -rw-r--r-- | misc/heyu2/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile index 6edf57a168bf..e5ff5aba7946 100644 --- a/misc/dahdi-kmod/Makefile +++ b/misc/dahdi-kmod/Makefile @@ -42,7 +42,7 @@ USE_RC_SUBR= dahdi MAKE_ARGS= ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes DEPEND_MP= GROUPS= dahdi -CONFLICTS= zaptel-[0-9]* dahdi-kmod26-* +CONFLICTS= zaptel dahdi-kmod26-* USES= kmod uidfix diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile index 5483a7f9493e..4c5b0a61e0ce 100644 --- a/misc/dahdi-kmod26/Makefile +++ b/misc/dahdi-kmod26/Makefile @@ -47,7 +47,7 @@ USE_RC_SUBR= dahdi MAKE_ARGS= NO_FETCH=yes WITHOUT_HEADERS=yes #ADDITIONAL_DRIVERS="wcb1xxp" GROUPS= dahdi -CONFLICTS= zaptel-[0-9]* dahdi-kmod-* +CONFLICTS= zaptel dahdi-kmod-* KMODDIR= ${PREFIX}/lib/dahdi USES= kmod uidfix diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile index f2a7e1caf80f..fc90edf51afa 100644 --- a/misc/dahdi/Makefile +++ b/misc/dahdi/Makefile @@ -24,7 +24,7 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes MAKE_ENV= HOST_CC=${CC} -CONFLICTS= zaptel-[0-9]* +CONFLICTS= zaptel post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g'\ diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile index c7810db8fd60..affb04a41694 100644 --- a/misc/heyu2/Makefile +++ b/misc/heyu2/Makefile @@ -13,7 +13,7 @@ COMMENT= Control a CM11A interface from the command line BROKEN_FreeBSD_13= ld: error: duplicate symbol: newsb BROKEN_FreeBSD_14= ld: error: duplicate symbol: newsb -CONFLICTS= heyu-[0-9]* +CONFLICTS= heyu ALL_TARGET= all |