From owner-svn-ports-all@FreeBSD.ORG Sat Dec 14 04:39:28 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C7298F8; Sat, 14 Dec 2013 04:39:28 +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 4D580152D; Sat, 14 Dec 2013 04:39:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE4dSLo097086; Sat, 14 Dec 2013 04:39:28 GMT (envelope-from brd@svn.freebsd.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE4dRGQ097083; Sat, 14 Dec 2013 04:39:27 GMT (envelope-from brd@svn.freebsd.org) Message-Id: <201312140439.rBE4dRGQ097083@svn.freebsd.org> From: Brad Davis Date: Sat, 14 Dec 2013 04:39:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336419 - head/sysutils/rsyslog7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 04:39:28 -0000 Author: brd (doc committer) Date: Sat Dec 14 04:39:27 2013 New Revision: 336419 URL: http://svnweb.freebsd.org/changeset/ports/336419 Log: - Update rsyslog7 to 7.4.7. Finally stagify thanks to help from bapt@ ! Reviewed by: az@ Modified: head/sysutils/rsyslog7/Makefile head/sysutils/rsyslog7/distinfo head/sysutils/rsyslog7/pkg-plist Modified: head/sysutils/rsyslog7/Makefile ============================================================================== --- head/sysutils/rsyslog7/Makefile Sat Dec 14 02:08:19 2013 (r336418) +++ head/sysutils/rsyslog7/Makefile Sat Dec 14 04:39:27 2013 (r336419) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.4.4 -PORTREVISION= 1 +PORTVERSION= 7.4.7 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -11,11 +10,12 @@ COMMENT= Syslogd supporting SQL, TCP, an BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt -LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ - estr:${PORTSDIR}/devel/libestr \ +LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ + libestr.so:${PORTSDIR}/devel/libestr \ libjson.so:${PORTSDIR}/devel/json-c USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf PORTSCOUT= limit:^7\.4 PORTDOCS= * @@ -35,7 +35,6 @@ UUID_DESC= Support for generating a UUID USES= pkgconfig -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDBI} @@ -48,7 +47,7 @@ CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so @@ -87,7 +86,7 @@ CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} -LIB_DEPENDS+= relp.0:${PORTSDIR}/devel/librelp +LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ lib/rsyslog/imrelp.so \ @@ -98,7 +97,7 @@ CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} -LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging +LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.la \ lib/rsyslog/im3195.so @@ -107,7 +106,7 @@ CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} -LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ lib/rsyslog/omsnmp.so @@ -116,7 +115,7 @@ CONFIGURE_ARGS+=--disable-snmp .endif .if ${PORT_OPTIONS:MUUID} -LIB_DEPENDS+= uuid:${PORTSDIR}/misc/e2fsprogs-libuuid +LIB_DEPENDS+= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid .else CONFIGURE_ARGS+=--disable-uuid .endif @@ -148,13 +147,10 @@ CPPFLAGS+=-march=i686 CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 - USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message -CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages +CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ @@ -165,15 +161,10 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/ -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${INSTALL} -d ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} -.endif - @${CAT} ${PKGMESSAGE} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${STAGEDIR}${DOCSDIR}/ + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/sysutils/rsyslog7/distinfo ============================================================================== --- head/sysutils/rsyslog7/distinfo Sat Dec 14 02:08:19 2013 (r336418) +++ head/sysutils/rsyslog7/distinfo Sat Dec 14 04:39:27 2013 (r336419) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.4.4.tar.gz) = 276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087 -SIZE (rsyslog-7.4.4.tar.gz) = 2910075 +SHA256 (rsyslog-7.4.7.tar.gz) = 5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21 +SIZE (rsyslog-7.4.7.tar.gz) = 2934197 Modified: head/sysutils/rsyslog7/pkg-plist ============================================================================== --- head/sysutils/rsyslog7/pkg-plist Sat Dec 14 02:08:19 2013 (r336418) +++ head/sysutils/rsyslog7/pkg-plist Sat Dec 14 04:39:27 2013 (r336419) @@ -40,5 +40,7 @@ lib/rsyslog/omstdout.la lib/rsyslog/omstdout.so lib/rsyslog/omtesting.la lib/rsyslog/omtesting.so +man/man5/rsyslog.conf.5.gz +man/man8/rsyslogd.8.gz sbin/rsyslogd @dirrmtry lib/rsyslog