ports/162414: [PATCH] sysutils/syslog-ng: [SUMMARIZE CHANGES]

Wed Nov 9 21:40:11 UTC 2011

>Number:         162414
>Category:       ports
>Synopsis:       [PATCH] sysutils/syslog-ng: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 09 21:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jimmy Olgeni
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD backoffice 8.2-STABLE FreeBSD 8.2-STABLE #1: Wed Oct 12 21:16:42 CEST 2011
>Description:

- 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 produced this log while configuring:

===>  Configuring for syslog-ng-3.3.1_1
--cflags: not found
--cflags: not found
--libs: not found
checking for a BSD-compatible install... /usr/bin/install -c -o root -g wheel

...so I moved the libnet stuff under the WITH_SPOOF section.

- Pet portlint where applicable (mainly whitespace issues).
- Fix "date created" in comment :)

PR probably applies to syslog-ng-devel too.

portlint complains about:

FATAL: Package conflicts with itself. You should remove "syslog-ng-[0-9]*" from CONFLICTS.

but I didn't dare to touch it since there are a few syslog-ng ports around.

Port maintainer (cy at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- syslog-ng-3.3.1_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.45
diff -u -u -r1.45 Makefile
--- Makefile	18 Oct 2011 04:29:48 -0000	1.45
+++ Makefile	9 Nov 2011 21:36:34 -0000
@@ -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 at ifom-ieo-campus.it>
 #
 # $FreeBSD: ports/sysutils/syslog-ng/Makefile,v 1.45 2011/10/18 04:29:48 cy Exp $
@@ -7,17 +7,17 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
-DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
+MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/${PORTVERSION}/source/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	A powerful syslogd replacement
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		PORTS_SSL "Build with OpenSSL support (from ports)" off \
@@ -37,6 +37,7 @@
 MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -44,26 +45,24 @@
 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>
@@ -77,7 +76,9 @@
 .if defined(WITH_SPOOF)
 BUILD_DEPENDS=		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet-devel
 LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet115-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
@@ -110,18 +111,18 @@
 
 .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
-CONFIGURE_ARGS+=        --disable-linux-caps
+CONFIGURE_ARGS+=	--disable-linux-caps
 .endif
 
 post-patch:
@@ -135,12 +136,10 @@
 		${WRKSRC}/lib/utils.c ${WRKSRC}/lib/utils.h
 .endif
 
-
 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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/syslog-ng/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist	18 Oct 2011 04:29:48 -0000	1.9
+++ pkg-plist	9 Nov 2011 21:36:34 -0000
@@ -1,9 +1,9 @@
 @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 etc/modules.conf
 etc/scl.conf
- at 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
+ at exec [ -f %B/syslog-ng.conf ] || cp %B/%f %B/syslog-ng.conf
 etc/syslog-ng.conf.sample
 bin/loggen
 bin/pdbtool
@@ -119,9 +119,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm etc/patterndb.d
 @dirrm include/syslog-ng
 @dirrm lib/syslog-ng
 @dirrm share/include/scl/system
@@ -131,3 +129,5 @@
 @dirrm share/include
 @dirrmtry share/tools
 @dirrm share/xsd
+ at exec mkdir %D/etc/patterndb.d
+ at dirrmtry etc/patterndb.d
--- syslog-ng-3.3.1_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

