summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2017-09-07 20:27:07 +0000
committerCy Schubert <cy@FreeBSD.org>2017-09-07 20:27:07 +0000
commit283058aa838ee523cdf9984719ae0e67f0ec8bcd (patch)
treeb352f81b97295bc4874beccfb045734b90b00647
parentFix indent (diff)
Remove a redundant conflict.
Reported by: Craig Leres <leres@ee.lbl.gov>
Notes
Notes: svn path=/head/; revision=449427
-rw-r--r--sysutils/syslog-ng311/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index 8357d803426a..e8e76cfb83f5 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -23,7 +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-devel-[0-9]* eventlog*
+ syslog-ng-devel-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
MAKE_JOBS_UNSAFE= yes