Miscellaneous fixes:

- Fix installation and removal of default configuration: the package
  installs syslog-ng.conf.sample, but the port installs syslog-ng.conf.dist
  which is also used in the @unexec test.

- Remove empty sgml directory in DOCSDIR (which was not installed by the
  package and produced warnings on pkg-delete).

- Install patterndb.d directory from pkg-plist, and use @dirrmtry to remove it.

- Building without libnet.

PR:		ports/162414
Submitted by:	olgeni

2 files changed, 21 insertions, 19 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 4ad92058dce2..dc185495402b 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	syslog-ng
-# Date created:		10 november 1006
+# Date created:		10 November 2006
 # Whom:			Ivan Lago <ivan.lago@ifom-ieo-campus.it>
 #
 # $FreeBSD$
@@ -7,6 +7,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.3.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
 DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
@@ -36,6 +37,7 @@ MAN1=		loggen.1 pdbtool.1 syslog-ng-ctl.1
 MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -43,26 +45,24 @@ USE_GNOME=	glib20 gnomehack
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
-		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CFLAGS+=	`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
-LDFLAGS+=	`${LIBNET_CONFIG} --libs`
+		--enable-dynamic-linking
 
 .if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
 BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
 .endif
 
 .if defined(WITH_SYS_SSL) || defined(WITH_PORTS_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.la lib/syslog-ng/libafsocket-tls.so
+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.la lib/syslog-ng/libafsocket-tls.so
 .else
-CONFIGURE_ARGS+=        --disable-ssl
+CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 .if defined(WITH_PORTS_SSL)
-WITH_OPENSSL_PORT=      yes
+WITH_OPENSSL_PORT=	yes
 .endif
 
 .include <bsd.port.pre.mk>
@@ -76,7 +76,9 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .if defined(WITH_SPOOF)
 BUILD_DEPENDS=		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet-devel
 LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet116-config
-CONFIGURE_ARGS+=	--enable-spoof-source
+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
@@ -109,14 +111,14 @@ BROKEN=		JSON_C and JSON_GLIB are mutually exclusive
 
 .if defined(WITH_JSON_GLIB)
 LIB_DEPENDS+=		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
-CONFIGURE_ARGS+=        --enable-json --with-json=json-glib
+CONFIGURE_ARGS+=	--enable-json --with-json=json-glib
 PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
 .elif defined(WITH_JSON_C)
 LIB_DEPENDS+=		json.0:${PORTSDIR}/devel/json-c
-CONFIGURE_ARGS+=        --enable-json --with-json=json-c
+CONFIGURE_ARGS+=	--enable-json --with-json=json-c
 PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
 .else
-CONFIGURE_ARGS+=        --disable-json
+CONFIGURE_ARGS+=	--disable-json
 .endif
 
 .if ${OSVERSION} >= 900034
@@ -139,7 +141,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
 			${PREFIX}/share/doc/syslog-ng \
-			${PREFIX}/share/doc/syslog-ng/sgml
+			${PREFIX}/share/doc/syslog-ng
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/syslog-ng
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/syslog-ng
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/syslog-ng
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 4e6700da5b6d..4c9551858b92 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -1,9 +1,9 @@
 @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 etc/modules.conf
 etc/scl.conf
-@exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.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
 etc/syslog-ng.conf.dist
+@exec test -f %B/syslog-ng.conf || cp -p %B/%f %B/syslog-ng.conf
 etc/syslog-ng.conf.sample
 bin/loggen
 bin/pdbtool
@@ -120,9 +120,7 @@ share/xsd/patterndb-3.xsd
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/patterndb.d
 @dirrm include/syslog-ng
 @dirrm lib/syslog-ng
 @dirrm share/include/scl/system
@@ -132,3 +130,5 @@ share/xsd/patterndb-3.xsd
 @dirrm share/include
 @dirrmtry share/tools
 @dirrm share/xsd
+@exec mkdir %D/etc/patterndb.d
+@dirrmtry etc/patterndb.d