Index: head/sysutils/syslog-ng/Makefile
===================================================================
--- head/sysutils/syslog-ng/Makefile	(revision 363071)
+++ head/sysutils/syslog-ng/Makefile	(revision 363072)
@@ -1,165 +1,169 @@
 # Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it>
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.5.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 DISTFILES=	syslog-ng_${DISTVERSION}.tar.gz
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
 LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
 OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS REDIS
 OPTIONS_DEFAULT=	PORTS_SSL PCRE
 SYS_SSL_DESC=		Build with OpenSSL support (from system)
 PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
 IPV6_DESC=		Build with IPV6 support
 PCRE_DESC=		Build with PCRE support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
 REDIS_DESC=		Build with Redis support
 
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking \
 		--enable-debug \
 		--datadir=${PREFIX}/share/syslog-ng/
 
 BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
 			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
 PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 .if ${PORT_OPTIONS:MPORTS_SSL}
 WITH_OPENSSL_PORT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
 CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
 .if ${PORT_OPTIONS:MSPOOF}
 LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
 LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
 CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
 CFLAGS+=		`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
 LDFLAGS+=		`${LIBNET_CONFIG} --libs`
 .else
 CONFIGURE_ARGS+=	--disable-spoof-source
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
 LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
 LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libtfgeoip.so
 .else
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
 
 .if ${PORT_OPTIONS:MREDIS}
 CONFIGURE_ARGS+=        --enable-redis
 LIB_DEPENDS+=           libhiredis.so:${PORTSDIR}/databases/hiredis
 PLIST_FILES+=           lib/syslog-ng/libredis.so
 .else
 CONFIGURE_ARGS+=        --disable-redis
 .endif
 
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
 LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
 LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
 PLIST_FILES+=		lib/syslog-ng/libafsql.so
 .else
 CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
 LIB_DEPENDS+=		libjson.so:${PORTSDIR}/devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 .else
 CONFIGURE_ARGS+=        --disable-json
 .endif
 
 .if ${OSVERSION} >= 900034
 CONFIGURE_ARGS+=        --disable-linux-caps
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure
-	@${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
-	@${LN} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.dist
+	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \
+		${WRKSRC}/configure
+	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
+	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/
-	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.dist ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h ${STAGEDIR}${PREFIX}/include/syslog-ng/
+	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \
+		${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \
+		${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
+		${STAGEDIR}${PREFIX}/include/syslog-ng/
 
 .include <bsd.port.mk>
Index: head/sysutils/syslog-ng/pkg-plist
===================================================================
--- head/sysutils/syslog-ng/pkg-plist	(revision 363071)
+++ head/sysutils/syslog-ng/pkg-plist	(revision 363072)
@@ -1,183 +1,179 @@
 @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
-@unexec if cmp -s %D/etc/scl.conf %D/etc/scl.conf.dist; then rm -f %D/etc/scl.conf; fi
-etc/scl.conf.dist
-@exec test -f %B/scl.conf || cp %B/%f %B/scl.conf
-@unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.dist; then rm -f %D/etc/syslog-ng.conf; fi
+@sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
-@exec test -f %B/syslog-ng.conf || cp %B/%f %B/syslog-ng.conf
-etc/syslog-ng.conf.sample
+@sample etc/syslog-ng.conf.sample
 bin/loggen
 bin/pdbtool
 bin/update-patterndb
 include/syslog-ng/afinter.h
 include/syslog-ng/alarms.h
 include/syslog-ng/apphook.h
 include/syslog-ng/atomic.h
 include/syslog-ng/block-ref-parser.h
 include/syslog-ng/cfg-grammar.h
 include/syslog-ng/cfg-lexer.h
 include/syslog-ng/cfg-parser.h
 include/syslog-ng/cfg.h
 include/syslog-ng/children.h
 include/syslog-ng/cfg-args.h
 include/syslog-ng/cfg-lexer-subst.h
 include/syslog-ng/compat.h
 include/syslog-ng/control.h
 include/syslog-ng/crypto.h
 include/syslog-ng/dnscache.h
 include/syslog-ng/driver.h
 include/syslog-ng/gprocess.h
 include/syslog-ng/gsockaddr.h
 include/syslog-ng/gsocket.h
 include/syslog-ng/iv.h
 include/syslog-ng/iv_avl.h
 include/syslog-ng/iv_event.h
 include/syslog-ng/iv_event_raw.h
 include/syslog-ng/iv_fd_pump.h
 include/syslog-ng/iv_inotify.h
 include/syslog-ng/iv_list.h
 include/syslog-ng/iv_popen.h
 include/syslog-ng/iv_signal.h
 include/syslog-ng/iv_thread.h
 include/syslog-ng/iv_tls.h
 include/syslog-ng/iv_wait.h
 include/syslog-ng/iv_work.h
 include/syslog-ng/logmatcher.h
 include/syslog-ng/logmpx.h
 include/syslog-ng/logmsg.h
 include/syslog-ng/logpipe.h
 include/syslog-ng/logqueue-fifo.h
 include/syslog-ng/logqueue.h
 include/syslog-ng/logreader.h
 include/syslog-ng/logsource.h
 include/syslog-ng/logstamp.h
 include/syslog-ng/logtransport.h
 include/syslog-ng/logwriter.h
 include/syslog-ng/mainloop.h
 include/syslog-ng/memtrace.h
 include/syslog-ng/messages.h
 include/syslog-ng/misc.h
 include/syslog-ng/ml-batched-timer.h
 include/syslog-ng/msg-format.h
 include/syslog-ng/nvtable.h
 include/syslog-ng/persist-state.h
 include/syslog-ng/plugin.h
 include/syslog-ng/pragma-parser.h
 include/syslog-ng/scratch-buffers.h
 include/syslog-ng/serialize.h
 include/syslog-ng/stats.h
 include/syslog-ng/str-format.h
 include/syslog-ng/syslog-names.h
 include/syslog-ng/syslog-ng.h
 include/syslog-ng/tags.h
 include/syslog-ng/timeutils.h
 include/syslog-ng/tls-support.h
 include/syslog-ng/tlscontext.h
 include/syslog-ng/tlstransport.h
 include/syslog-ng/utils.h
 include/syslog-ng/value-pairs.h
 include/syslog-ng/versioning.h
 include/syslog-ng/cfg-tree.h
 include/syslog-ng/file-perms.h
 include/syslog-ng/uuid.h
 include/syslog-ng/vptransform.h
 include/syslog-ng/filter/filter-expr.h
 include/syslog-ng/filter/filter-op.h
 include/syslog-ng/filter/filter-cmp.h
 include/syslog-ng/filter/filter-in-list.h
 include/syslog-ng/filter/filter-tags.h
 include/syslog-ng/filter/filter-netmask.h
 include/syslog-ng/filter/filter-call.h
 include/syslog-ng/filter/filter-re.h
 include/syslog-ng/filter/filter-pri.h
 include/syslog-ng/filter/filter-pipe.h
 include/syslog-ng/filter/filter-expr-parser.h
 include/syslog-ng/logproto/logproto-client.h
 include/syslog-ng/logproto/logproto-server.h
 include/syslog-ng/logproto/logproto-buffered-server.h
 include/syslog-ng/logproto/logproto-dgram-server.h
 include/syslog-ng/logproto/logproto-framed-client.h
 include/syslog-ng/logproto/logproto-framed-server.h
 include/syslog-ng/logproto/logproto-text-client.h
 include/syslog-ng/logproto/logproto-text-server.h
 include/syslog-ng/logproto/logproto-indented-multiline-server.h
 include/syslog-ng/logproto/logproto-regexp-multiline-server.h
 include/syslog-ng/logproto/logproto-record-server.h
 include/syslog-ng/logproto/logproto-builtins.h
 include/syslog-ng/logproto/logproto.h
 include/syslog-ng/parser/parser-expr.h
 include/syslog-ng/parser/parser-expr-parser.h
 include/syslog-ng/logthrdestdrv.h
 include/syslog-ng/parse-number.h
 include/syslog-ng/plugin-types.h
 include/syslog-ng/poll-events.h
 include/syslog-ng/poll-fd-events.h
 include/syslog-ng/type-hinting.h
 include/syslog-ng/rewrite/rewrite-expr.h
 include/syslog-ng/rewrite/rewrite-set-tag.h
 include/syslog-ng/rewrite/rewrite-set.h
 include/syslog-ng/rewrite/rewrite-subst.h
 include/syslog-ng/rewrite/rewrite-expr-parser.h
 include/syslog-ng/template/templates.h
 lib/libsyslog-ng-3.5.4.1.so
 lib/libsyslog-ng.so
 lib/syslog-ng/libafamqp.so
 lib/syslog-ng/libaffile.so
 lib/syslog-ng/libafmongodb.so
 lib/syslog-ng/libafprog.so
 lib/syslog-ng/libafsocket-notls.so
 lib/syslog-ng/libafsocket.so
 lib/syslog-ng/libafstomp.so
 lib/syslog-ng/libafuser.so
 lib/syslog-ng/libbasicfuncs.so
 lib/syslog-ng/libconfgen.so
 lib/syslog-ng/libcryptofuncs.so
 lib/syslog-ng/libcsvparser.so
 lib/syslog-ng/libdbparser.so
 lib/syslog-ng/liblinux-kmsg-format.so
 lib/syslog-ng/libsyslog-ng-crypto.so
 lib/syslog-ng/libsyslogformat.so
 lib/syslog-ng/libsystem-source.so
 libdata/pkgconfig/syslog-ng.pc
 man/man1/loggen.1.gz
 man/man1/pdbtool.1.gz
 man/man1/syslog-ng-ctl.1.gz
 man/man5/syslog-ng.conf.5.gz
 man/man8/syslog-ng.8.gz
 sbin/syslog-ng
 sbin/syslog-ng-ctl
 share/syslog-ng/include/scl/pacct/plugin.conf
 share/syslog-ng/include/scl/syslogconf/README
 share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
 share/syslog-ng/include/scl/syslogconf/plugin.conf
 share/syslog-ng/include/scl/system/plugin.conf
 share/syslog-ng/include/scl/rewrite/cc-mask.conf
 share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/merge-grammar.pl
 share/syslog-ng/xsd/patterndb-1.xsd
 share/syslog-ng/xsd/patterndb-2.xsd
 share/syslog-ng/xsd/patterndb-3.xsd
 share/syslog-ng/xsd/patterndb-4.xsd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/syslog-ng/xsd
 @dirrmtry share/syslog-ng/tools
 @dirrm share/syslog-ng/include/scl/system
 @dirrm share/syslog-ng/include/scl/syslogconf
 @dirrm share/syslog-ng/include/scl/pacct
 @dirrm share/syslog-ng/include/scl/rewrite
 @dirrm share/syslog-ng/include/scl
 @dirrm share/syslog-ng/include
 @dirrm share/syslog-ng
 @dirrm lib/syslog-ng
 @dirrm include/syslog-ng/filter
 @dirrm include/syslog-ng/logproto
 @dirrm include/syslog-ng/parser
 @dirrm include/syslog-ng/rewrite
 @dirrm include/syslog-ng/template
 @dirrm include/syslog-ng
 @exec mkdir -p %D/etc/patterndb.d
 @dirrmtry etc/patterndb.d