diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-10-06 08:26:23 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-10-06 08:26:23 +0800 |
| commit | 19dc235e26d67356ade6ffd363a385908ca2e9ae (patch) | |
| tree | 4f103a773b999a498c98f44d2f22ccc0d3f88920 /sysutils | |
| parent | be968dfe30407f589db06860474c2d82b2ed8d8d (diff) | |
| download | freebsd-ports-gnome-19dc235e26d67356ade6ffd363a385908ca2e9ae.tar.gz freebsd-ports-gnome-19dc235e26d67356ade6ffd363a385908ca2e9ae.tar.zst freebsd-ports-gnome-19dc235e26d67356ade6ffd363a385908ca2e9ae.zip | |
RSYSLOG OVERHAUL: Part 18 (last)
- Update the CONFLICTS
PR: ports/151021
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/rsyslog3/bsd.rsyslog.mk | 2 | ||||
| -rw-r--r-- | sysutils/rsyslog4-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rsyslog4/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rsyslog5-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rsyslog5/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rsyslog6-devel/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/rsyslog3/bsd.rsyslog.mk b/sysutils/rsyslog3/bsd.rsyslog.mk index 4fffbecef385..ee4362e29fdf 100644 --- a/sysutils/rsyslog3/bsd.rsyslog.mk +++ b/sysutils/rsyslog3/bsd.rsyslog.mk @@ -4,7 +4,7 @@ CATEGORIES?= sysutils MASTER_SITES?= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER?= miwi@FreeBSD.org -CONFLICTS= rsyslog-2.[0-9]* +CONFLICTS= rsyslog-[!3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes diff --git a/sysutils/rsyslog4-devel/Makefile b/sysutils/rsyslog4-devel/Makefile index f7de91fd02be..b8fba6a76ff4 100644 --- a/sysutils/rsyslog4-devel/Makefile +++ b/sysutils/rsyslog4-devel/Makefile @@ -24,7 +24,7 @@ LATEST_LINK= rsyslog4-devel-${MNAME} LATEST_LINK= rsyslog4-devel .endif -CONFLICTS= rsyslog-[!4].[0-9]* +CONFLICTS= rsyslog-devel-[!4].[!7].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes diff --git a/sysutils/rsyslog4/Makefile b/sysutils/rsyslog4/Makefile index 6a7912f5ddca..ce5d79916d3e 100644 --- a/sysutils/rsyslog4/Makefile +++ b/sysutils/rsyslog4/Makefile @@ -24,7 +24,7 @@ LATEST_LINK= rsyslog4-${MNAME} LATEST_LINK= rsyslog4 .endif -CONFLICTS= rsyslog-[!4].[0-9]* +CONFLICTS= rsyslog-[!4].[!6].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes diff --git a/sysutils/rsyslog5-devel/Makefile b/sysutils/rsyslog5-devel/Makefile index 031a6ee38a83..57467ce98af9 100644 --- a/sysutils/rsyslog5-devel/Makefile +++ b/sysutils/rsyslog5-devel/Makefile @@ -24,7 +24,7 @@ LATEST_LINK= rsyslog5-devel-${MNAME} LATEST_LINK= rsyslog5-devel .endif -CONFLICTS= rsyslog-[!5].[0-9]* +CONFLICTS= rsyslog-devel-[!5].[!7].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile index bfe537c84827..7c66309666c1 100644 --- a/sysutils/rsyslog5/Makefile +++ b/sysutils/rsyslog5/Makefile @@ -32,7 +32,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif -CONFLICTS= rsyslog-[!5].[0-9]* +CONFLICTS= rsyslog-[!5].[!5].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index 1e4bf2cd080f..57a506b7631d 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -32,7 +32,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif -CONFLICTS= rsyslog-[!6].[0-9]* +CONFLICTS= rsyslog-devel-[!6].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes |