- Update to 2.0.2

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

- Fix rc script: require ldconfig

PR:		ports/110647
Submitted by:	Marcus Reid <marcus@blazingdot.com>

- Modernize pkg-message handling

5 files changed, 14 insertions, 47 deletions

diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile
index 16c1a1c845a0..934df4b430f6 100644
--- a/sysutils/syslog-ng3/Makefile
+++ b/sysutils/syslog-ng3/Makefile
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/2.0/src/
 
 MAINTAINER=	ivan.lago@ifom-ieo-campus.it
 COMMENT=	A powerful syslogd replacement
 
+LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
+
 MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
 USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
+USE_GNOME=	glib20
 USE_GCC=	3.3+
 NO_LATEST_LINK=	yes
-PKGMESSAGE=	${WRKDIR}/MESSAGE
+SUB_FILES=	pkg-message
+SUB_LIST=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
-LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
-		evtlog.0:${PORTSDIR}/sysutils/eventlog
+CONFIGURE_ARGS=	--enable-dynamic-linking --mandir=${PREFIX}/man
 
 .if defined(WITH_TCP_WRAPPERS)
 CONFIGURE_ARGS+=--enable-tcp-wrapper
@@ -33,9 +35,6 @@ CONFIGURE_ARGS+=--enable-tcp-wrapper
 post-patch:
 	@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
 
-post-build:
-	@${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
diff --git a/sysutils/syslog-ng3/distinfo b/sysutils/syslog-ng3/distinfo
index 567cd841aa04..6323b465de05 100644
--- a/sysutils/syslog-ng3/distinfo
+++ b/sysutils/syslog-ng3/distinfo
@@ -1,3 +1,3 @@
-MD5 (syslog-ng-2.0.0.tar.gz) = 134db2e3d7b16bb70fd86d749cc2e4fd
-SHA256 (syslog-ng-2.0.0.tar.gz) = 6f1e22554eb7292d9322de0623fd13dbd11bdda8d52d66280c1d4e193a69fac7
-SIZE (syslog-ng-2.0.0.tar.gz) = 337553
+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
diff --git a/sysutils/syslog-ng3/files/patch-configure b/sysutils/syslog-ng3/files/patch-configure
deleted file mode 100644
index 20143c0f60e7..000000000000
--- a/sysutils/syslog-ng3/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Sat Oct 28 17:40:18 2006
-+++ configure	Thu Nov 16 10:45:49 2006
-@@ -341,7 +341,7 @@
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
- datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sysconfdir='${prefix}/etc/syslog-ng'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
- libdir='${exec_prefix}/lib'
-@@ -3426,7 +3426,7 @@
- echo $ECHO_N "checking how to enable static linking for certain libraries... $ECHO_C" >&6
- ldversion=`ld -V 2>&1 | head -1`
- ostype=`uname -s`
--if echo $ldversion | egrep "GNU|Solaris" > /dev/null; then
-+if echo $ldversion | egrep "Solaris" > /dev/null; then
-         LD_START_STATIC="-Wl,-Bstatic"
-         LD_END_STATIC="-Wl,-Bdynamic"
-         echo "$as_me:$LINENO: result: GNU or Solaris" >&5
-@@ -3441,6 +3441,11 @@
-         LD_END_STATIC="-Wl,-bdynamic"
-         echo "$as_me:$LINENO: result: AIX" >&5
- echo "${ECHO_T}AIX" >&6
-+elif test "$ostype" = "FreeBSD"; then
-+        LD_START_STATIC=""
-+        LD_END_STATIC=""
-+        echo "$as_me:$LINENO: result: FreeBSD" >&5
-+echo "${ECHO_T}FreeBSD" >&6
- else
-         LD_START_STATIC=""
-         LD_END_STATIC=""
diff --git a/sysutils/syslog-ng3/pkg-message b/sysutils/syslog-ng3/files/pkg-message.in
index 223446c811e0..10ee06b2da0a 100644
--- a/sysutils/syslog-ng3/pkg-message
+++ b/sysutils/syslog-ng3/files/pkg-message.in
@@ -2,7 +2,7 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named __PREFIX__/etc/syslog-ng/syslog-ng.conf
+1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
    (a sample named syslog-ng.conf.sample has been included)
 
 2. Configure syslog-ng to start automatically by adding the following
@@ -21,5 +21,5 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 
 5. Start syslog-ng:
 
-     __PREFIX__/etc/rc.d/syslog-ng.sh start
+     %%PREFIX%%/etc/rc.d/syslog-ng%%RC_SUBR_SUFFIX%% start
 
diff --git a/sysutils/syslog-ng3/files/syslog-ng.sh.in b/sysutils/syslog-ng3/files/syslog-ng.sh.in
index a6bedfbbfda3..157ea30bde81 100644
--- a/sysutils/syslog-ng3/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng3/files/syslog-ng.sh.in
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/syslog-ng3/files/Attic/syslog-ng.sh.in,v 1.2 2007-03-19 06:28:09 rafan Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/syslog-ng3/files/Attic/syslog-ng.sh.in,v 1.3 2007-03-22 16:30:16 pav Exp $
 #
 
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote cleanvar ldconfig
 # BEFORE:  SERVERS
 
 #