From 637eb895fbd0d30dbb38d91ed84cd8107d6d7eb7 Mon Sep 17 00:00:00 2001 From: Andrew Pantyukhin Date: Fri, 28 Sep 2007 15:29:14 +0000 Subject: [PATCH] - Update to 1.19.8 - Disable mysql support temporarily --- sysutils/rsyslog/Makefile | 7 +++---- sysutils/rsyslog/distinfo | 6 +++--- sysutils/rsyslog/pkg-plist | 3 --- sysutils/rsyslog3/Makefile | 7 +++---- sysutils/rsyslog3/distinfo | 6 +++--- sysutils/rsyslog3/pkg-plist | 3 --- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile index 5f02e142b781..21ae5442bde8 100644 --- a/sysutils/rsyslog/Makefile +++ b/sysutils/rsyslog/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 1.19.6 +PORTVERSION= 1.19.8 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ CENKES @@ -15,12 +15,11 @@ COMMENT= Enhanced syslog daemon LIB_DEPENDS= logging.0:${PORTSDIR}/devel/liblogging -USE_MYSQL= yes USE_RC_SUBR= ${PORTNAME}d CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-mysql --disable-klogd --disable-static +CONFIGURE_ARGS= --disable-klogd --disable-static CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" SUB_FILES= pkg-message @@ -30,12 +29,12 @@ PORT_VERBS= rfc3195d rklogd ${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's|||' ${WRKSRC}/srUtils.c - @${REINPLACE_CMD} -e 's|sigaction_t|sigaction|' ${WRKSRC}/rfc3195d.c @${REINPLACE_CMD} -e '/^rfc3195d_LDADD =/s|$$| -llogging|;s|-ldl||'\ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/Makefile.in ${WRKSRC}/syslogd.c + @${REINPLACE_CMD} -e 's|TTY_NAME_MAX|9|' ${WRKSRC}/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${ECHO_CMD} '#include ' >> ${WRKSRC}/net.h diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo index f5e0463c79c5..a48987ac3d79 100644 --- a/sysutils/rsyslog/distinfo +++ b/sysutils/rsyslog/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-1.19.6.tar.gz) = 0aa4ea5d07d3c2ba3080b4a64280ff72 -SHA256 (rsyslog-1.19.6.tar.gz) = 9ec137f6c6a8d79a61b3171600a44b4b44bc5bdfecbc0018dec46f54259eb113 -SIZE (rsyslog-1.19.6.tar.gz) = 639399 +MD5 (rsyslog-1.19.8.tar.gz) = 8879acbe8d5ee209997ebe72de473a14 +SHA256 (rsyslog-1.19.8.tar.gz) = fe69243cba86ac6c183b56637693fc8d4e6766983784bd82e6234eaca92b087a +SIZE (rsyslog-1.19.8.tar.gz) = 701577 diff --git a/sysutils/rsyslog/pkg-plist b/sysutils/rsyslog/pkg-plist index e5ff4585d4cf..7a09dfcbba77 100644 --- a/sysutils/rsyslog/pkg-plist +++ b/sysutils/rsyslog/pkg-plist @@ -1,5 +1,3 @@ -lib/rsyslog/ommysql.la -lib/rsyslog/ommysql.so sbin/rfc3195d sbin/rklogd sbin/rsyslogd @@ -46,5 +44,4 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/status.html %%PORTDOCS%%%%DOCSDIR%%/syslog-protocol.html %%PORTDOCS%%%%DOCSDIR%%/version_naming.html -@dirrm lib/rsyslog %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/sysutils/rsyslog3/Makefile b/sysutils/rsyslog3/Makefile index 5f02e142b781..21ae5442bde8 100644 --- a/sysutils/rsyslog3/Makefile +++ b/sysutils/rsyslog3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 1.19.6 +PORTVERSION= 1.19.8 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ CENKES @@ -15,12 +15,11 @@ COMMENT= Enhanced syslog daemon LIB_DEPENDS= logging.0:${PORTSDIR}/devel/liblogging -USE_MYSQL= yes USE_RC_SUBR= ${PORTNAME}d CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-mysql --disable-klogd --disable-static +CONFIGURE_ARGS= --disable-klogd --disable-static CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" SUB_FILES= pkg-message @@ -30,12 +29,12 @@ PORT_VERBS= rfc3195d rklogd ${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's|||' ${WRKSRC}/srUtils.c - @${REINPLACE_CMD} -e 's|sigaction_t|sigaction|' ${WRKSRC}/rfc3195d.c @${REINPLACE_CMD} -e '/^rfc3195d_LDADD =/s|$$| -llogging|;s|-ldl||'\ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/Makefile.in ${WRKSRC}/syslogd.c + @${REINPLACE_CMD} -e 's|TTY_NAME_MAX|9|' ${WRKSRC}/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${ECHO_CMD} '#include ' >> ${WRKSRC}/net.h diff --git a/sysutils/rsyslog3/distinfo b/sysutils/rsyslog3/distinfo index f5e0463c79c5..a48987ac3d79 100644 --- a/sysutils/rsyslog3/distinfo +++ b/sysutils/rsyslog3/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-1.19.6.tar.gz) = 0aa4ea5d07d3c2ba3080b4a64280ff72 -SHA256 (rsyslog-1.19.6.tar.gz) = 9ec137f6c6a8d79a61b3171600a44b4b44bc5bdfecbc0018dec46f54259eb113 -SIZE (rsyslog-1.19.6.tar.gz) = 639399 +MD5 (rsyslog-1.19.8.tar.gz) = 8879acbe8d5ee209997ebe72de473a14 +SHA256 (rsyslog-1.19.8.tar.gz) = fe69243cba86ac6c183b56637693fc8d4e6766983784bd82e6234eaca92b087a +SIZE (rsyslog-1.19.8.tar.gz) = 701577 diff --git a/sysutils/rsyslog3/pkg-plist b/sysutils/rsyslog3/pkg-plist index e5ff4585d4cf..7a09dfcbba77 100644 --- a/sysutils/rsyslog3/pkg-plist +++ b/sysutils/rsyslog3/pkg-plist @@ -1,5 +1,3 @@ -lib/rsyslog/ommysql.la -lib/rsyslog/ommysql.so sbin/rfc3195d sbin/rklogd sbin/rsyslogd @@ -46,5 +44,4 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/status.html %%PORTDOCS%%%%DOCSDIR%%/syslog-protocol.html %%PORTDOCS%%%%DOCSDIR%%/version_naming.html -@dirrm lib/rsyslog %%PORTDOCS%%@dirrm %%DOCSDIR%%