From eaf6bd4cd1b6fb5ca7eae745dbee7a8dd7ab7293 Mon Sep 17 00:00:00 2001 From: Pete Fritchman Date: Wed, 29 Aug 2001 06:37:43 +0000 Subject: - update to version 1.07 - add a backup MASTER_SITE - sort MAN8 - handle doc install better, use DOCSDIR - move message from Makefile post-install target to pkg-message - sort pkg-plist PR: 30109 Submitted by: maintainer --- sysutils/msyslog/Makefile | 44 ++++++++++++++------------------------------ sysutils/msyslog/distinfo | 2 +- sysutils/msyslog/pkg-message | 14 ++++++++++++++ sysutils/msyslog/pkg-plist | 27 ++++++++++++++------------- 4 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 sysutils/msyslog/pkg-message diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile index 57508919b830..e0cf468024fc 100644 --- a/sysutils/msyslog/Makefile +++ b/sysutils/msyslog/Makefile @@ -6,9 +6,10 @@ # PORTNAME= msyslog -PORTVERSION= 1.05 +PORTVERSION= 1.07 CATEGORIES= sysutils -MASTER_SITES= http://www.core-sdi.com/soft/ +MASTER_SITES= http://www.core-sdi.com/soft/ \ + ftp://ftp.nuug.no/pub/anders/distfiles/ DISTNAME= ${PORTNAME}-v${PORTVERSION} EXTRACT_SUFX= .tgz @@ -32,8 +33,8 @@ CONFIGURE_ARGS+= --without-pgsql .endif MAN5= syslog.conf.5 -MAN8= syslogd.8 im_bsd.8 im_unix.8 om_classic.8 om_tcp.8 im_tcp.8 om_peo.8 \ - peochk.8 +MAN8= im_bsd.8 im_tcp.8 im_udp.8 im_unix.8 om_classic.8 om_tcp.8 om_peo.8 \ + om_regex.8 peochk.8 syslogd.8 .if defined(WITH_MYSQL) MAN8+= om_mysql.8 .endif @@ -43,7 +44,8 @@ MAN8+= om_pgsql.8 MANCOMPRESSED= yes INSTALLS_SHLIB= yes -DOCDIR= ${PREFIX}/share/doc/${PORTNAME} +DOCS= AUTHORS src/TODO README NEWS doc/HOW_TO_WRITE_A_MODULE \ + doc/HOW-TO-UPGRADE FIXPREFIX= README src/man/om_peo.8 src/man/syslog.conf.5 \ src/man/syslogd.8 src/TODO src/syslogd.h @@ -56,36 +58,18 @@ pre-patch: .endfor post-install: + ${INSTALL} -d -o root -g wheel -m 0775 ${PREFIX}/share/examples/msyslog + ${INSTALL_DATA} ${WRKSRC}/src/examples/* \ + ${PREFIX}/share/examples/msyslog .if !defined(NOPORTDOCS) - ${INSTALL} -d -o root -g wheel -m 0775 ${DOCDIR}/examples - ${INSTALL_DATA} ${WRKSRC}/src/examples/* ${DOCDIR}/examples/ - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/src/TODO ${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/HOW_TO_WRITE_A_MODULE ${DOCDIR}/ + ${INSTALL} -d -o root -g wheel -m 0775 ${DOCSDIR} +.for f in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor .endif @if [ ! -f ${PREFIX}/etc/rc.d/msyslog.sh.sample ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/msyslog.sh.sample startup file."; \ ${INSTALL_SCRIPT} ${FILESDIR}/msyslog.sh.sample ${PREFIX}/etc/rc.d/msyslog.sh.sample; \ fi - @${ECHO} "================================================================================" - @${ECHO} - @${ECHO} "To replace FreeBSD's standard syslogd, do this:" - @${ECHO} - @${ECHO} "a) create a configuration in ${PREFIX}/etc/syslog.conf." -.if !defined(NOPORTDOCS) - @${ECHO} " See ${DOCDIR}/examples for examples." -.endif - @${ECHO} - @${ECHO} "b) Set up a startup script in ${PREFIX}/etc/rc.d. For your convinience, a" - @${ECHO} " msyslog.sh.sample has been provided." - @${ECHO} - @${ECHO} "c) Stop the standard FreeBSD syslogd from starting automatically by putting this" - @${ECHO} " in the end of /etc/rc.conf:" - @${ECHO} - @${ECHO} "syslogd_enable=\"NO\"" - @${ECHO} - @${ECHO} "================================================================================" .include diff --git a/sysutils/msyslog/distinfo b/sysutils/msyslog/distinfo index 8d7721929005..0f62c5602ddf 100644 --- a/sysutils/msyslog/distinfo +++ b/sysutils/msyslog/distinfo @@ -1 +1 @@ -MD5 (msyslog-v1.05.tgz) = 81ffe260445a01db204022bc1f47f133 +MD5 (msyslog-v1.07.tgz) = b32bacaeba7e8a09923453517fb12762 diff --git a/sysutils/msyslog/pkg-message b/sysutils/msyslog/pkg-message new file mode 100644 index 000000000000..b0d0e238058d --- /dev/null +++ b/sysutils/msyslog/pkg-message @@ -0,0 +1,14 @@ +================================================================================ +To replace FreeBSD's standard syslogd with msyslog, do this: + +a) create a configuration in ${PREFIX}/etc/syslog.conf. + See ${PREFIX}/share/examples/msyslog for examples. + +b) Set up a startup script in ${PREFIX}/etc/rc.d. + For your convinience, a msyslog.sh.sample has been provided. + +c) Stop the standard FreeBSD syslogd from starting automatically by putting this + in the end of /etc/rc.conf: + +syslogd_enable="NO" +================================================================================ diff --git a/sysutils/msyslog/pkg-plist b/sysutils/msyslog/pkg-plist index 554bff575847..494cbcf80d86 100644 --- a/sysutils/msyslog/pkg-plist +++ b/sysutils/msyslog/pkg-plist @@ -1,18 +1,19 @@ +etc/rc.d/msyslog.sh.sample lib/libmsyslog.so.4 -sbin/syslogd sbin/peochk -etc/rc.d/msyslog.sh.sample -%%PORTDOCS%%share/doc/msyslog/examples/im_mymodule.c -%%PORTDOCS%%share/doc/msyslog/examples/om_mymodule.c -%%PORTDOCS%%share/doc/msyslog/examples/syslog.conf.classic -%%PORTDOCS%%share/doc/msyslog/examples/syslog.conf.mysql -%%PORTDOCS%%share/doc/msyslog/examples/syslog.conf.peo -%%PORTDOCS%%share/doc/msyslog/examples/syslog.conf.pgsql -%%PORTDOCS%%share/doc/msyslog/examples/syslog.conf.regex +sbin/syslogd %%PORTDOCS%%share/doc/msyslog/AUTHORS -%%PORTDOCS%%share/doc/msyslog/TODO -%%PORTDOCS%%share/doc/msyslog/README -%%PORTDOCS%%share/doc/msyslog/NEWS +%%PORTDOCS%%share/doc/msyslog/HOW-TO-UPGRADE %%PORTDOCS%%share/doc/msyslog/HOW_TO_WRITE_A_MODULE -%%PORTDOCS%%@dirrm share/doc/msyslog/examples +%%PORTDOCS%%share/doc/msyslog/NEWS +%%PORTDOCS%%share/doc/msyslog/README +%%PORTDOCS%%share/doc/msyslog/TODO +share/examples/msyslog/im_mymodule.c +share/examples/msyslog/om_mymodule.c +share/examples/msyslog/syslog.conf.classic +share/examples/msyslog/syslog.conf.mysql +share/examples/msyslog/syslog.conf.peo +share/examples/msyslog/syslog.conf.pgsql +share/examples/msyslog/syslog.conf.regex +@dirrm share/examples/msyslog %%PORTDOCS%%@dirrm share/doc/msyslog -- cgit v1.2.3