diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2017-10-05 06:22:34 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2017-10-05 06:22:34 +0000 |
| commit | 5755ca4294f448c241f7851597a194da7bc8ebf0 (patch) | |
| tree | eb250a1396e0219de9a2863900dee760326a6220 | |
| parent | 59be264499736eca02a530d3be28db48dfceffd4 (diff) | |
syslog-ng310 and syslog-ng311 register conflict with each other.
Reported by: rodrigo
Notes
Notes:
svn path=/head/; revision=451271
| -rw-r--r-- | sysutils/syslog-ng310/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/syslog-ng311/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sysutils/syslog-ng310/Makefile b/sysutils/syslog-ng310/Makefile index dfa8675af848..4b61fbea7512 100644 --- a/sysutils/syslog-ng310/Makefile +++ b/sysutils/syslog-ng310/Makefile @@ -24,6 +24,7 @@ BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld) CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ + syslog-ng[0-9][0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* \ syslog-ng-incubator-* diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile index c78e425e257f..60acfa533443 100644 --- a/sysutils/syslog-ng311/Makefile +++ b/sysutils/syslog-ng311/Makefile @@ -23,6 +23,7 @@ BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld) CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ + syslog-ng[0-9][0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* eventlog* \ syslog-ng-incubator-* |