diff options
author | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 23:11:40 +0100 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 23:11:40 +0100 |
commit | 5933ac0b099d61d98eb531d373cf57a8927bc7af (patch) | |
tree | fc0ebf2ac7225dec2aa7f2a7b0efbb91919c1030 /deskutils/xpad | |
parent | lang/guile2: define _WITH_CPU_SET_T to fix build on -CURRENT (diff) |
*/*: 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 'deskutils/xpad')
-rw-r--r-- | deskutils/xpad/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile index 8610f7431992..bb51a25dc856 100644 --- a/deskutils/xpad/Makefile +++ b/deskutils/xpad/Makefile @@ -17,7 +17,7 @@ USES= autoreconf compiler:c++11-lang gmake pkgconfig tar:bzip2 gnome xorg OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes -CONFLICTS_INSTALL= xpad3-[0-9]* +CONFLICTS_INSTALL= xpad3 USE_XORG= x11 sm ice USE_GNOME= gtk30 intltool gtksourceview3 cairo CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include |