diff options
| -rw-r--r-- | sysutils/rsyslog/Makefile | 42 | ||||
| -rw-r--r-- | sysutils/rsyslog/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/rsyslog3/Makefile | 42 | ||||
| -rw-r--r-- | sysutils/rsyslog3/distinfo | 6 |
4 files changed, 60 insertions, 36 deletions
diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile index f465cf1545cb..5e396b53a022 100644 --- a/sysutils/rsyslog/Makefile +++ b/sysutils/rsyslog/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 1.15.0 +PORTVERSION= 1.17.2 CATEGORIES= sysutils MASTER_SITES= SF http://download.rsyslog.com/rsyslog/ @@ -17,25 +17,37 @@ LIB_DEPENDS= logging.0:${PORTSDIR}/devel/liblogging USE_MYSQL= yes USE_RC_SUBR= ${PORTNAME}d -MAKE_ARGS= LIBLOGGING_INC=-I${LOCALBASE}/include \ - LIBLOGGING_BIN=-llogging \ - FEATURE_RFC3195=1 BINDIR=${PREFIX}/sbin MANDIR=${MANPREFIX}/man \ - LPTHREAD=${PTHREAD_LIBS} CC=${CC} -MAKE_ENV= LDFLAGS="${LDFLAGS}" -LDFLAGS+= -L${LOCALBASE}/lib -BUILD_WRKSRC= ${WRKSRC}/freebsd -INSTALL_WRKSRC= ${WRKSRC}/freebsd +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-mysql --disable-klogd --mandir=${MANPREFIX}/man +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN8= rfc3195d.8 rklogd.8 rsyslogd.8 MAN5= rsyslog.conf.5 -PLIST_FILES= sbin/rfc3195d sbin/rklogd sbin/rsyslogd etc/${PORTNAME}.conf.sample +PLIST_FILES= sbin/rfc3195d sbin/rklogd sbin/rsyslogd +PORTDOCS= * post-patch: + @${REINPLACE_CMD} -e 's|<wait.h>|<sys/wait.h>|' ${WRKSRC}/srUtils.c + @${REINPLACE_CMD} -e '/^rfc3195d_LDADD =/s|$$| -llogging|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' ${WRKSRC}/syslogd.c - @${REINPLACE_CMD} -e '/^CFLAGS=/s|=|+=|;s|-O3||;s|-fomit-frame-pointer||;/INSTALL/s|-b |-s |' \ - ${WRKSRC}/master.make - -post-install: - @${INSTALL_DATA} ${WRKSRC}/sample.conf ${PREFIX}/etc/${PORTNAME}.conf.sample + @${ECHO_CMD} '#include <sys/socket.h>' >> ${WRKSRC}/net.h + @${ECHO_CMD} '#include <paths.h>' >> ${WRKSRC}/omusrmsg.h + +post-configure: + @${ECHO_CMD} '#define FEATURE_RFC3195 1' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#define PATCHLEVEL "0"' >> ${WRKSRC}/config.h + +do-install: + @cd ${WRKSRC}&&${INSTALL_PROGRAM} rfc3195d rklogd rsyslogd\ + ${PREFIX}/sbin/ + @cd ${WRKSRC}&&${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5/ + @cd ${WRKSRC}&&${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8/ +.ifndef NOPORTDOCS + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/ +.endif .include <bsd.port.mk> diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo index aae204a8bc71..db6dce2f11de 100644 --- a/sysutils/rsyslog/distinfo +++ b/sysutils/rsyslog/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-1.15.0.tar.gz) = fc680b85e380d7d2b2e8bb06f7de4b27 -SHA256 (rsyslog-1.15.0.tar.gz) = 4e31fdf36156cfb0fd815c944af431890e8f4313716dfa6da2b33d04a23ecbbd -SIZE (rsyslog-1.15.0.tar.gz) = 298999 +MD5 (rsyslog-1.17.2.tar.gz) = de7627997555f8622029e10c9569b678 +SHA256 (rsyslog-1.17.2.tar.gz) = 9f632f5b4db6ad489eb8f3b870e00513e7d1f8c1647465b8f710cad3b6f90864 +SIZE (rsyslog-1.17.2.tar.gz) = 381436 diff --git a/sysutils/rsyslog3/Makefile b/sysutils/rsyslog3/Makefile index f465cf1545cb..5e396b53a022 100644 --- a/sysutils/rsyslog3/Makefile +++ b/sysutils/rsyslog3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 1.15.0 +PORTVERSION= 1.17.2 CATEGORIES= sysutils MASTER_SITES= SF http://download.rsyslog.com/rsyslog/ @@ -17,25 +17,37 @@ LIB_DEPENDS= logging.0:${PORTSDIR}/devel/liblogging USE_MYSQL= yes USE_RC_SUBR= ${PORTNAME}d -MAKE_ARGS= LIBLOGGING_INC=-I${LOCALBASE}/include \ - LIBLOGGING_BIN=-llogging \ - FEATURE_RFC3195=1 BINDIR=${PREFIX}/sbin MANDIR=${MANPREFIX}/man \ - LPTHREAD=${PTHREAD_LIBS} CC=${CC} -MAKE_ENV= LDFLAGS="${LDFLAGS}" -LDFLAGS+= -L${LOCALBASE}/lib -BUILD_WRKSRC= ${WRKSRC}/freebsd -INSTALL_WRKSRC= ${WRKSRC}/freebsd +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-mysql --disable-klogd --mandir=${MANPREFIX}/man +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN8= rfc3195d.8 rklogd.8 rsyslogd.8 MAN5= rsyslog.conf.5 -PLIST_FILES= sbin/rfc3195d sbin/rklogd sbin/rsyslogd etc/${PORTNAME}.conf.sample +PLIST_FILES= sbin/rfc3195d sbin/rklogd sbin/rsyslogd +PORTDOCS= * post-patch: + @${REINPLACE_CMD} -e 's|<wait.h>|<sys/wait.h>|' ${WRKSRC}/srUtils.c + @${REINPLACE_CMD} -e '/^rfc3195d_LDADD =/s|$$| -llogging|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' ${WRKSRC}/syslogd.c - @${REINPLACE_CMD} -e '/^CFLAGS=/s|=|+=|;s|-O3||;s|-fomit-frame-pointer||;/INSTALL/s|-b |-s |' \ - ${WRKSRC}/master.make - -post-install: - @${INSTALL_DATA} ${WRKSRC}/sample.conf ${PREFIX}/etc/${PORTNAME}.conf.sample + @${ECHO_CMD} '#include <sys/socket.h>' >> ${WRKSRC}/net.h + @${ECHO_CMD} '#include <paths.h>' >> ${WRKSRC}/omusrmsg.h + +post-configure: + @${ECHO_CMD} '#define FEATURE_RFC3195 1' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#define PATCHLEVEL "0"' >> ${WRKSRC}/config.h + +do-install: + @cd ${WRKSRC}&&${INSTALL_PROGRAM} rfc3195d rklogd rsyslogd\ + ${PREFIX}/sbin/ + @cd ${WRKSRC}&&${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5/ + @cd ${WRKSRC}&&${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8/ +.ifndef NOPORTDOCS + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/ +.endif .include <bsd.port.mk> diff --git a/sysutils/rsyslog3/distinfo b/sysutils/rsyslog3/distinfo index aae204a8bc71..db6dce2f11de 100644 --- a/sysutils/rsyslog3/distinfo +++ b/sysutils/rsyslog3/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-1.15.0.tar.gz) = fc680b85e380d7d2b2e8bb06f7de4b27 -SHA256 (rsyslog-1.15.0.tar.gz) = 4e31fdf36156cfb0fd815c944af431890e8f4313716dfa6da2b33d04a23ecbbd -SIZE (rsyslog-1.15.0.tar.gz) = 298999 +MD5 (rsyslog-1.17.2.tar.gz) = de7627997555f8622029e10c9569b678 +SHA256 (rsyslog-1.17.2.tar.gz) = 9f632f5b4db6ad489eb8f3b870e00513e7d1f8c1647465b8f710cad3b6f90864 +SIZE (rsyslog-1.17.2.tar.gz) = 381436 |