Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Dec 2013 04:39:27 +0000 (UTC)
From:      Brad Davis <brd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336419 - head/sysutils/rsyslog7
Message-ID:  <201312140439.rBE4dRGQ097083@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
 .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 <bsd.port.post.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312140439.rBE4dRGQ097083>