Date: Tue, 17 Sep 2013 16:58:28 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327490 - in head/sysutils: rsyslog6 rsyslog6-dbi rsyslog6-gssapi rsyslog6-mysql rsyslog6-pgsql rsyslog6-rfc3195 rsyslog6-snmp rsyslog7 rsyslog7-devel Message-ID: <201309171658.r8HGwSiv059956@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Sep 17 16:58:27 2013 New Revision: 327490 URL: http://svnweb.freebsd.org/changeset/ports/327490 Log: only ryslog7 now has rsyslog-<version> package name. Change all others to avoid confusion for binary package users Approved by: brd Modified: head/sysutils/rsyslog6-dbi/Makefile head/sysutils/rsyslog6-gssapi/Makefile head/sysutils/rsyslog6-mysql/Makefile head/sysutils/rsyslog6-pgsql/Makefile head/sysutils/rsyslog6-rfc3195/Makefile head/sysutils/rsyslog6-snmp/Makefile head/sysutils/rsyslog6/Makefile head/sysutils/rsyslog7-devel/Makefile head/sysutils/rsyslog7/Makefile Modified: head/sysutils/rsyslog6-dbi/Makefile ============================================================================== --- head/sysutils/rsyslog6-dbi/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6-dbi/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -1,7 +1,4 @@ -# New ports collection makefile for: rsyslog4-dbi -# Date created: 29 December 2008 -# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com> -# +# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> # $FreeBSD$ COMMENT= LibDBI output module for rsyslog Modified: head/sysutils/rsyslog6-gssapi/Makefile ============================================================================== --- head/sysutils/rsyslog6-gssapi/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6-gssapi/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rsyslog4-gssapi -# Date created: 29 December 2008 -# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com> -# +# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> # $FreeBSD$ -# COMMENT= GSS API input/output module for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6 Modified: head/sysutils/rsyslog6-mysql/Makefile ============================================================================== --- head/sysutils/rsyslog6-mysql/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6-mysql/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rsyslog4-mysql -# Date created: 29 December 2008 -# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com> -# +# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> # $FreeBSD$ -# COMMENT= MySQL output module for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6 Modified: head/sysutils/rsyslog6-pgsql/Makefile ============================================================================== --- head/sysutils/rsyslog6-pgsql/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6-pgsql/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rsyslog4-pgsql -# Date created: 29 December 2008 -# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com> -# +# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> # $FreeBSD$ -# COMMENT= PostgreSQL output module for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6 Modified: head/sysutils/rsyslog6-rfc3195/Makefile ============================================================================== --- head/sysutils/rsyslog6-rfc3195/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6-rfc3195/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -1,7 +1,5 @@ # Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> -# # $FreeBSD$ -# COMMENT= RFC3195 input support for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6 Modified: head/sysutils/rsyslog6-snmp/Makefile ============================================================================== --- head/sysutils/rsyslog6-snmp/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6-snmp/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rsyslog4-snmp -# Date created: 29 December 2008 -# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com> -# +# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> # $FreeBSD$ -# COMMENT= SNMP trap sender for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6 Modified: head/sysutils/rsyslog6/Makefile ============================================================================== --- head/sysutils/rsyslog6/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog6/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -5,9 +5,7 @@ PORTVERSION= 6.6.0 PORTREVISION?= 0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -.endif +PKGNAMESUFFIX= 6${EXTRASUFFIX} MAINTAINER= brd@FreeBSD.org COMMENT?= Syslogd supporting SQL, TCP, and TLS @@ -26,11 +24,9 @@ LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee USES= pkgconfig .ifdef MNAME +EXTRASUFFIX= -${MNAME} RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6 PLIST= ${.CURDIR}/pkg-plist -LATEST_LINK= rsyslog6-${MNAME} -.else -LATEST_LINK= rsyslog6 .endif PORTSCOUT= limit:^6 @@ -43,7 +39,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif -CONFLICTS= rsyslog-[57].[0-9]* +CONFLICTS= rsyslog-[0-9].* ryslog-devel-[0-9]* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/sysutils/rsyslog7-devel/Makefile ============================================================================== --- head/sysutils/rsyslog7-devel/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog7-devel/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -124,7 +124,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif -CONFLICTS= rsyslog-[56].[0-9]* +CONFLICTS= rsyslog6-* rsyslog-[0-9].* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/sysutils/rsyslog7/Makefile ============================================================================== --- head/sysutils/rsyslog7/Makefile Tue Sep 17 16:52:53 2013 (r327489) +++ head/sysutils/rsyslog7/Makefile Tue Sep 17 16:58:27 2013 (r327490) @@ -127,7 +127,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif -CONFLICTS= rsyslog-[56].[0-9]* +CONFLICTS= rsyslog6-[1-9]* rsyslog-devel-[0-9]* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309171658.r8HGwSiv059956>