- Update to 2.0.3

PR:		ports/115724
Submitted by:	Ivan Lago <ivan.lago at ifom-ieo-campus.it> (maintainer)

4 files changed, 21 insertions, 13 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 322baf52f822..251b1b3d7095 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.3
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/2.0/src/
+MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/
 
 MAINTAINER=	ivan.lago@ifom-ieo-campus.it
 COMMENT=	A powerful syslogd replacement
 
+BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet 
 LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
 
 MAN5=		syslog-ng.conf.5
@@ -27,7 +27,13 @@ NO_LATEST_LINK=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
-CONFIGURE_ARGS=	--enable-dynamic-linking
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
+		--enable-dynamic-linking --mandir=${PREFIX}/man \
+		--with-libnet=${LOCALBASE}/bin
+CONFIGURE_ENV=  CFLAGS="`${LIBNET_CONFIG} --cflags`" \
+		LDFLAGS="`${LIBNET_CONFIG} --libs`"
 
 .if defined(WITH_TCP_WRAPPERS)
 CONFIGURE_ARGS+=--enable-tcp-wrapper
@@ -35,6 +41,7 @@ CONFIGURE_ARGS+=--enable-tcp-wrapper
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
+	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 6323b465de05..40b61cc89035 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (syslog-ng-2.0.2.tar.gz) = 7ef12e1e43a99c5b6b8d1984dde72151
-SHA256 (syslog-ng-2.0.2.tar.gz) = 6b77a6b2b159afb2a089d70a8b5e6ef0c4e20f1401ba8e392fb99b1293a09d82
-SIZE (syslog-ng-2.0.2.tar.gz) = 352502
+MD5 (syslog-ng-2.0.3.tar.gz) = 01cafcfebf1c05f9253c3f3c9a987434
+SHA256 (syslog-ng-2.0.3.tar.gz) = 1369177362151d09f486924ae6b395c53059b7e65d71de4fdd46ab6b8b9bd0a8
+SIZE (syslog-ng-2.0.3.tar.gz) = 361194
diff --git a/sysutils/syslog-ng-devel/files/patch-syslog-names.c b/sysutils/syslog-ng-devel/files/patch-syslog-names.c
index 8ae34d897e72..1e9d02e3ea58 100644
--- a/sysutils/syslog-ng-devel/files/patch-syslog-names.c
+++ b/sysutils/syslog-ng-devel/files/patch-syslog-names.c
@@ -1,5 +1,5 @@
---- src/syslog-names.c.orig	Wed Nov  8 14:43:03 2006
-+++ src/syslog-names.c	Wed Nov  8 14:50:06 2006
+--- src/syslog-names.c.orig	Wed Feb 28 10:19:12 2007
++++ src/syslog-names.c	Wed Aug 22 15:48:07 2007
 @@ -45,6 +45,7 @@
  #ifdef LOG_AUTHPRIV
    {"authpriv", LOG_AUTHPRIV},
diff --git a/sysutils/syslog-ng-devel/files/patch-syslog-ng.h b/sysutils/syslog-ng-devel/files/patch-syslog-ng.h
index bc4091efacfd..348e1f819c77 100644
--- a/sysutils/syslog-ng-devel/files/patch-syslog-ng.h
+++ b/sysutils/syslog-ng-devel/files/patch-syslog-ng.h
@@ -1,15 +1,16 @@
---- src/syslog-ng.h.orig	Wed Nov  8 14:45:18 2006
-+++ src/syslog-ng.h	Wed Nov  8 14:45:44 2006
-@@ -38,10 +38,10 @@
+--- src/syslog-ng.h.orig	Wed Aug 22 15:50:25 2007
++++ src/syslog-ng.h	Wed Aug 22 15:55:18 2007
+@@ -38,11 +38,11 @@
  
  #if ENABLE_DEBUG
  #define PATH_SYSLOG_NG_CONF     "syslog-ng.conf"
 -#define PATH_PIDFILE            "syslog-ng.pid"
 +#define PATH_PIDFILE            "syslog.pid"
+ #define PATH_PERSIST_CONFIG     "syslog-ng.persist"
  #else
  #define PATH_SYSLOG_NG_CONF     PATH_SYSCONFDIR "/syslog-ng.conf"
 -#define PATH_PIDFILE            "/var/run/syslog-ng.pid"
 +#define PATH_PIDFILE            "/var/run/syslog.pid"
+ #define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
  #endif
  
- #define LOG_PRIORITY_LISTEN 100