Move sysutils/syslog-ng-devel to sysutils/syslog-ng310. The syslog-ng

development team at Balabit has adopted a rolling release model for now.

Discussed with:		Peter Czanik (CzP) <peter.czanik@balabit.com>
			Balabit / syslog-ng upstream

14 files changed, 5 insertions, 3 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 75e1b86823aa..9c18f0bd9676 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1117,11 +1117,11 @@
     SUBDIR += sysinfo
     SUBDIR += syslinux
     SUBDIR += syslog-ng
-    SUBDIR += syslog-ng-devel
     SUBDIR += syslog-ng-incubator
     SUBDIR += syslog-ng36
     SUBDIR += syslog-ng37
     SUBDIR += syslog-ng39
+    SUBDIR += syslog-ng310
     SUBDIR += syslogger
     SUBDIR += sysrc
     SUBDIR += system-tools-backends
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index d0afd43b2fa4..27eeed6f47d1 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-VERSIONS=		36 37
+VERSIONS=		36 37 39 310
 SYSLOG_NG_VERSION?=	37
 
 MASTERDIR=		${.CURDIR}/../syslog-ng${SYSLOG_NG_VERSION}
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng310/Makefile
index 500e7b198156..986f5d38733f 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng310/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.10.1
-PKGNAMESUFFIX=	-devel
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng310/distinfo
index 2bc0d5a35124..2bc0d5a35124 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng310/distinfo
diff --git a/sysutils/syslog-ng-devel/files/patch-configure b/sysutils/syslog-ng310/files/patch-configure
index 1d9486b6e05e..1d9486b6e05e 100644
--- a/sysutils/syslog-ng-devel/files/patch-configure
+++ b/sysutils/syslog-ng310/files/patch-configure
diff --git a/sysutils/syslog-ng-devel/files/patch-lfs b/sysutils/syslog-ng310/files/patch-lfs
index cbc27356d5fd..cbc27356d5fd 100644
--- a/sysutils/syslog-ng-devel/files/patch-lfs
+++ b/sysutils/syslog-ng310/files/patch-lfs
diff --git a/sysutils/syslog-ng-devel/files/pkg-message.in b/sysutils/syslog-ng310/files/pkg-message.in
index 36cb7e65a243..36cb7e65a243 100644
--- a/sysutils/syslog-ng-devel/files/pkg-message.in
+++ b/sysutils/syslog-ng310/files/pkg-message.in
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng310/files/syslog-ng.conf.sample
index fbc56b7e9455..fbc56b7e9455 100644
--- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng310/files/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.in b/sysutils/syslog-ng310/files/syslog-ng.in
index ae24e4984375..ae24e4984375 100644
--- a/sysutils/syslog-ng-devel/files/syslog-ng.in
+++ b/sysutils/syslog-ng310/files/syslog-ng.in
diff --git a/sysutils/syslog-ng-devel/pkg-descr b/sysutils/syslog-ng310/pkg-descr
index 65aff196f0ad..65aff196f0ad 100644
--- a/sysutils/syslog-ng-devel/pkg-descr
+++ b/sysutils/syslog-ng310/pkg-descr
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng310/pkg-plist
index 212afd3d14dd..212afd3d14dd 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng310/pkg-plist
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index 8a1b58c6b6aa..cce0ca5e0491 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -22,6 +22,7 @@ BROKEN_sparc64=		fails to compile: gcc core dump
 
 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]*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index c96297d33589..ea107b81b6fc 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -25,6 +25,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]*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
diff --git a/sysutils/syslog-ng39/Makefile b/sysutils/syslog-ng39/Makefile
index f655d1fb6189..cacd8634fb2c 100644
--- a/sysutils/syslog-ng39/Makefile
+++ b/sysutils/syslog-ng39/Makefile
@@ -20,6 +20,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]*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}