Attachment 143325 Details for Bug 190563 – Patch for msyslog

[patch] Patch for msyslog

msyslog-1.08g.patch (text/plain), 4.56 KB, created by Muhammad Moinur Rahman on 2014-06-03 10:51:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-06-03 10:51:35 UTC

Size: 4.56 KB

patch

obsolete

>diff -ruN /usr/ports//sysutils/msyslog/Makefile ./Makefile
>--- /usr/ports//sysutils/msyslog/Makefile	2014-05-29 17:20:14.000000000 +0600
>+++ ./Makefile	2014-06-03 16:48:22.155113245 +0600
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	msyslog
> PORTVERSION=	1.08g
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.X/${PORTVERSION} \
> 		http://www1.corest.com/download/msyslog/
>@@ -12,40 +12,33 @@
> MAINTAINER=	5u623l20@gmail.com
> COMMENT=	Flexible and easy to integrate syslog daemon
> 
>+LICENSE=	BSD4CLAUSE MIT
>+LICENSE_COMB=	dual
>+
> OPTIONS_DEFINE=	MYSQL PGSQL
>+OPTIONS_SUB=	yes
>+MYSQL_USE=	MYSQL=yes
>+MYSQL_CONFIGURE_OFF=	--without-mysql
>+PGSQL_USE=	PGSQL=yes
>+PGSQL_CONFIGURE_OFF=	--without-pgsql
> 
> WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
> 
> GNU_CONFIGURE=	yes
> USES=		gmake
> USE_RC_SUBR=	msyslogd
>-PKGMESSAGE=	${WRKDIR}/pkg-message
>+SUB_FILES=	pkg-message
> USE_LDCONFIG=	yes
> MANCOMPRESSED=	yes
> 
> PORTSCOUT=	skipv:1.09d
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${OSVERSION} > 900006
> EXTRA_PATCHES=	${PATCHDIR}/utmpx-src-modules-om_classic.c
> .endif
> 
>-.if ${PORT_OPTIONS:MMYSQL}
>-USE_MYSQL=	yes
>-MAN8+=	om_mysql.8
>-.else
>-CONFIGURE_ARGS+=	--without-mysql
>-.endif
>-
>-.if ${PORT_OPTIONS:MPGSQL}
>-USE_PGSQL=	yes
>-MAN8+=	om_pgsql.8
>-.else
>-CONFIGURE_ARGS+=	--without-pgsql
>-.endif
>-
> post-patch:
> 	@${FIND} ${WRKSRC}/src/modules -name "*.c" | \
> 	    ${XARGS} ${REINPLACE_CMD} -e "s|typedef int socklen_t;||g"
>@@ -55,12 +48,15 @@
> 	    ${XARGS} ${REINPLACE_CMD} -e 's|/dev/log|/var/run/log|g' \
> 	    -e "s|/etc/syslog.conf|${PREFIX}/etc/syslog.conf|g"
> 	@${FIND} ${WRKSRC}/src/ -name "*.bak" -delete
>+	@${REINPLACE_CMD} -e 's|@prefix@|${STAGEDIR}${PREFIX}|g' \
>+		${WRKSRC}/src/modules/Makefile.in \
>+		${WRKSRC}/src/peo/Makefile.in \
>+		${WRKSRC}/src/Makefile.in
>+	@${REINPLACE_CMD} -e 's|@mandir@|${STAGEDIR}${PREFIX}/man|g' \
>+		${WRKSRC}/src/man/GNUmakefile.in
> 
> post-install:
>-	@${MKDIR} ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/src/examples/* ${EXAMPLESDIR}
>-	@${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
>-	    > ${PKGMESSAGE}
>-	@${CAT} ${PKGMESSAGE}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/src/examples/* ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports//sysutils/msyslog/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports//sysutils/msyslog/files/pkg-message.in	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/pkg-message.in	2014-01-22 21:52:06.000000000 +0600
>@@ -0,0 +1,20 @@
>+================================================================================
>+To replace FreeBSD's standard syslogd with msyslog, do this:
>+
>+1) Create a configuration in %%PREFIX%%/etc/syslog.conf.
>+    See %%PREFIX%%/share/examples/msyslog for examples.
>+
>+2) Set up a startup script in %%PREFIX%%/etc/rc.d.
>+    For your convinience, a msyslog.sh has been provided.
>+    put this in /etc/rc.conf
>+  
>+    msyslogd_enable="YES"
>+
>+3) Pass right values from man pages to /etc/rc.conf for 
>+    msyslogd_flags=""
>+
>+4) Stop the standard FreeBSD syslogd from starting automatically by putting this
>+    in the end of /etc/rc.conf:
>+
>+    syslogd_enable="NO"
>+================================================================================
>diff -ruN /usr/ports//sysutils/msyslog/pkg-message ./pkg-message
>--- /usr/ports//sysutils/msyslog/pkg-message	2014-01-22 21:52:06.000000000 +0600
>+++ ./pkg-message	1970-01-01 06:00:00.000000000 +0600
>@@ -1,20 +0,0 @@
>-================================================================================
>-To replace FreeBSD's standard syslogd with msyslog, do this:
>-
>-1) Create a configuration in %%PREFIX%%/etc/syslog.conf.
>-    See %%PREFIX%%/share/examples/msyslog for examples.
>-
>-2) Set up a startup script in %%PREFIX%%/etc/rc.d.
>-    For your convinience, a msyslog.sh has been provided.
>-    put this in /etc/rc.conf
>-  
>-    msyslogd_enable="YES"
>-
>-3) Pass right values from man pages to /etc/rc.conf for 
>-    msyslogd_flags=""
>-
>-4) Stop the standard FreeBSD syslogd from starting automatically by putting this
>-    in the end of /etc/rc.conf:
>-
>-    syslogd_enable="NO"
>-================================================================================
>diff -ruN /usr/ports//sysutils/msyslog/pkg-plist ./pkg-plist
>--- /usr/ports//sysutils/msyslog/pkg-plist	2014-01-22 21:16:56.000000000 +0600
>+++ ./pkg-plist	2014-06-03 16:36:58.995159396 +0600
>@@ -14,6 +14,8 @@
> man/man8/om_udp.8.gz
> man/man8/peochk.8.gz
> man/man8/syslogd.8.gz
>+%%MYSQL%%/man/man8/om_mysql.8.gz
>+%%PGSQL%%/man/man8/om_pgsql.8.gz
> %%EXAMPLESDIR%%/im_mymodule.c
> %%EXAMPLESDIR%%/om_mymodule.c
> %%EXAMPLESDIR%%/syslog.conf.classic

Actions: View | Diff

Attachments on bug 190563: 143325