svn commit: r356428 - in head/sysutils/msyslog: . files

[Vanilla I. Shu]

Author: vanilla
Date: Wed Jun  4 04:02:39 2014
New Revision: 356428
URL: http://svnweb.freebsd.org/changeset/ports/356428
QAT: https://qat.redports.org/buildarchive/r356428/

Log:
  Stagify.
  
  PR:		ports/190563
  Submitted by:	maintainer

Added:
  head/sysutils/msyslog/files/pkg-message.in   (contents, props changed)
Deleted:
  head/sysutils/msyslog/pkg-message
Modified:
  head/sysutils/msyslog/Makefile
  head/sysutils/msyslog/pkg-plist

Modified: head/sysutils/msyslog/Makefile
==============================================================================
--- head/sysutils/msyslog/Makefile	Wed Jun  4 03:57:11 2014	(r356427)
+++ head/sysutils/msyslog/Makefile	Wed Jun  4 04:02:39 2014	(r356428)
@@ -12,40 +12,33 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}-sr
 MAINTAINER=	5u623l20 at 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 @@ post-patch:
 	    ${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>

Added: head/sysutils/msyslog/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/msyslog/files/pkg-message.in	Wed Jun  4 04:02:39 2014	(r356428)
@@ -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"
+================================================================================

Modified: head/sysutils/msyslog/pkg-plist
==============================================================================
--- head/sysutils/msyslog/pkg-plist	Wed Jun  4 03:57:11 2014	(r356427)
+++ head/sysutils/msyslog/pkg-plist	Wed Jun  4 04:02:39 2014	(r356428)
@@ -14,6 +14,8 @@ man/man8/om_tcp.8.gz
 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