From owner-svn-ports-all@FreeBSD.ORG Tue Dec 17 03:07:01 2013 Return-Path: Delivered-To: svn-ports-all@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 C5762BEB; Tue, 17 Dec 2013 03:07:01 +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 A68911F7C; Tue, 17 Dec 2013 03:07:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH371MK052738; Tue, 17 Dec 2013 03:07:01 GMT (envelope-from brd@svn.freebsd.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH371hZ052733; Tue, 17 Dec 2013 03:07:01 GMT (envelope-from brd@svn.freebsd.org) Message-Id: <201312170307.rBH371hZ052733@svn.freebsd.org> From: Brad Davis Date: Tue, 17 Dec 2013 03:07:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336690 - in head/sysutils/rsyslog7-devel: . files 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: Tue, 17 Dec 2013 03:07:01 -0000 Author: brd (doc committer) Date: Tue Dec 17 03:07:00 2013 New Revision: 336690 URL: http://svnweb.freebsd.org/changeset/ports/336690 Log: - Update sysutils/rsyslog7-devel to 7.5.7 - Sync the Makefile with sysutils/rsyslog7 to make updates easier Reviewed by: swills@ Deleted: head/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c Modified: head/sysutils/rsyslog7-devel/Makefile head/sysutils/rsyslog7-devel/distinfo Modified: head/sysutils/rsyslog7-devel/Makefile ============================================================================== --- head/sysutils/rsyslog7-devel/Makefile Tue Dec 17 02:49:20 2013 (r336689) +++ head/sysutils/rsyslog7-devel/Makefile Tue Dec 17 03:07:00 2013 (r336690) @@ -1,23 +1,22 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.5.5 -PORTREVISION= 1 +PORTVERSION= 7.5.7 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS -GNU_CONFIGURE= yes -USE_LDCONFIG= yes +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 \ - uuid:${PORTSDIR}/misc/e2fsprogs-libuuid + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid -BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt +USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf PORTSCOUT= limit:^7\.5 PORTDOCS= * @@ -37,11 +36,10 @@ SNMP_DESC= SNMP trap sender for rsyslog USES= pkgconfig -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDBI} -LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi +LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ lib/rsyslog/omlibdbi.so @@ -50,8 +48,8 @@ CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \ - gcrypt:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so @@ -90,7 +88,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 \ @@ -101,7 +99,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 @@ -110,7 +108,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 @@ -130,6 +128,7 @@ CONFLICTS= rsyslog6-* rsyslog-[0-9].* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug @@ -144,13 +143,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/|'\ @@ -161,15 +157,9 @@ 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} -d ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/sysutils/rsyslog7-devel/distinfo ============================================================================== --- head/sysutils/rsyslog7-devel/distinfo Tue Dec 17 02:49:20 2013 (r336689) +++ head/sysutils/rsyslog7-devel/distinfo Tue Dec 17 03:07:00 2013 (r336690) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.5.5.tar.gz) = 0c63fd9f963a366aa1b4003852542da1a727e82c092d1fd3a0ab3260815d07a4 -SIZE (rsyslog-7.5.5.tar.gz) = 2996834 +SHA256 (rsyslog-7.5.7.tar.gz) = 0bc21d20e5b3460554d7c60d347f3207153c52c68b6b870bfa7f27163c24682a +SIZE (rsyslog-7.5.7.tar.gz) = 2592596