From owner-svn-ports-head@FreeBSD.ORG Sat Feb 22 09:09:32 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5C6333D; Sat, 22 Feb 2014 09:09:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C31AB1239; Sat, 22 Feb 2014 09:09:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1M99WvG053003; Sat, 22 Feb 2014 09:09:32 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1M99WgE053001; Sat, 22 Feb 2014 09:09:32 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201402220909.s1M99WgE053001@svn.freebsd.org> From: Antoine Brodin Date: Sat, 22 Feb 2014 09:09:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345571 - head/sysutils/syslog-ng33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Feb 2014 09:09:33 -0000 Author: antoine Date: Sat Feb 22 09:09:32 2014 New Revision: 345571 URL: http://svnweb.freebsd.org/changeset/ports/345571 QAT: https://qat.redports.org/buildarchive/r345571/ Log: - Unbreak (pkg-conf missing) - Stage support Reported by: pkg-fallout since october 2013 Modified: head/sysutils/syslog-ng33/Makefile head/sysutils/syslog-ng33/pkg-plist Modified: head/sysutils/syslog-ng33/Makefile ============================================================================== --- head/sysutils/syslog-ng33/Makefile Sat Feb 22 06:28:32 2014 (r345570) +++ head/sysutils/syslog-ng33/Makefile Sat Feb 22 09:09:32 2014 (r345571) @@ -9,7 +9,7 @@ PKGNAMESUFFIX= 33 DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz MAINTAINER= cy@FreeBSD.org -COMMENT= A powerful syslogd replacement +COMMENT= Powerful syslogd replacement CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng-devel-[0-9]* @@ -31,25 +31,20 @@ JSON_C_DESC= Build with JSON-C support JSON_GLIB_DESC= Build with JSON-GLIB support SYSLOG2NG_DESC= Install syslog2ng script -NO_STAGE= yes -.include - -LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog - -MAN1= loggen.1 pdbtool.1 syslog-ng-ctl.1 -MAN5= syslog-ng.conf.5 -MAN8= syslog-ng.8 +LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_GNOME= glib20 gnomehack +USES= gmake pathfix pkgconfig +USE_GNOME= glib20 SUB_FILES= pkg-message CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking +.include + .if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL} USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-ssl @@ -64,8 +59,6 @@ CONFIGURE_ARGS+= --disable-ssl WITH_OPENSSL_PORT= yes .endif -.include - .if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --enable-tcp-wrapper .else @@ -73,7 +66,7 @@ CONFIGURE_ARGS+= --disable-tcp-wrapper .endif .if ${PORT_OPTIONS:MSPOOF} -LIB_DEPENDS+= net:${PORTSDIR}/net/libnet +LIB_DEPENDS+= libnet.so:${PORTSDIR}/net/libnet LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CONFIGURE_ARGS+= --enable-spoof-source --with-libnet=${LOCALBASE}/bin CFLAGS+= -g `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include @@ -90,13 +83,13 @@ CONFIGURE_ARGS+= --disable-ipv6 .if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+= --enable-pcre -LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre .else CONFIGURE_ARGS+= --disable-pcre .endif .if ${PORT_OPTIONS:MSQL} -LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi +LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi" CONFIGURE_ARGS+= --enable-sql PLIST_FILES+= lib/syslog-ng/libafsql.la lib/syslog-ng/libafsql.so @@ -105,11 +98,11 @@ CONFIGURE_ARGS+= --disable-sql .endif .if ${PORT_OPTIONS:MJSON_GLIB} -LIB_DEPENDS+= json-glib-1.0.0:${PORTSDIR}/devel/json-glib +LIB_DEPENDS+= libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib CONFIGURE_ARGS+= --enable-json --with-json=json-glib PLIST_FILES+= lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so .elif ${PORT_OPTIONS:MJSON_C} -LIB_DEPENDS+= json:${PORTSDIR}/devel/json-c +LIB_DEPENDS+= libjson.so:${PORTSDIR}/devel/json-c CONFIGURE_ARGS+= --enable-json --with-json=json-c PLIST_FILES+= lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so .else @@ -131,22 +124,14 @@ post-patch: post-install: .if ${PORT_OPTIONS:MSYSLOG2NG} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${STAGEDIR}${PREFIX}/sbin .endif -.if ${PORT_OPTIONS:MDOCS} - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \ - ${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 - ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng -.endif - @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \ - fi - @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.dist ]; then \ - ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${PREFIX}/etc; \ - fi - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/syslog-ng + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${PREFIX}/share/doc/syslog-ng + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${PREFIX}/share/doc/syslog-ng + ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${PREFIX}/share/doc/syslog-ng + ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${PREFIX}/share/doc/syslog-ng + ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${STAGEDIR}${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${STAGEDIR}${PREFIX}/etc -.include +.include Modified: head/sysutils/syslog-ng33/pkg-plist ============================================================================== --- head/sysutils/syslog-ng33/pkg-plist Sat Feb 22 06:28:32 2014 (r345570) +++ head/sysutils/syslog-ng33/pkg-plist Sat Feb 22 09:09:32 2014 (r345571) @@ -104,6 +104,11 @@ lib/syslog-ng/libsyslog-ng-crypto.la lib/syslog-ng/libsyslog-ng-crypto.so lib/syslog-ng/libsyslogformat.la lib/syslog-ng/libsyslogformat.so +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 share/include/scl/pacct/plugin.conf share/include/scl/syslogconf/README share/include/scl/syslogconf/convert-syslogconf.awk