svn commit: r447100 - head/sysutils/rsyslog8
Matthew Seaman
matthew at FreeBSD.org
Wed Aug 2 11:30:47 UTC 2017
Author: matthew
Date: Wed Aug 2 11:30:46 2017
New Revision: 447100
URL: https://svnweb.freebsd.org/changeset/ports/447100
Log:
Appease portlint by reordering some items in the Makefile
Group FOO_DESC with all the other options helpers for option FOO
When DOCS are enabled and one or both of MYSQL and PGSQL options are
selected, install the corresponding createDB.sql file for generating
the DB schema rsyslog expects [1]
PR: 221012
Reported by: rainer at ultra-secure.de [1]
Modified:
head/sysutils/rsyslog8/Makefile
Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile Wed Aug 2 09:58:24 2017 (r447099)
+++ head/sysutils/rsyslog8/Makefile Wed Aug 2 11:30:46 2017 (r447100)
@@ -20,6 +20,8 @@ BUILD_DEPENDS= rst2man:textproc/py-docutils
PORTSCOUT= limit:^8\.
+USES= libtool pkgconfig autoreconf
+
USE_LDCONFIG= yes
CONFLICTS_BUILD= libinotify-*
@@ -29,69 +31,66 @@ OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GNUTLS GSSAPI
OPTIONS_DEFAULT=GCRYPT
OPTIONS_SUB= yes
-DBI_DESC= LibDBI output module for rsyslog
-ELASTIC_DESC= Elasticsearch module for rsyslog
-GCRYPT_DESC= Enable support for encrypted logfiles
-GNUTLS_DESC= GNUTLS module for rsyslog
-GSSAPI_DESC= GSS API input/output module for rsyslog
-JSONPARSE_DESC= JSONPARSE module for rsyslog
-MYSQL_DESC= MySQL output module for rsyslog
-PGSQL_DESC= PostgreSQL output module for rsyslog
-RELP_DESC= RELP input/output module for rsyslog
-SNMP_DESC= SNMP trap sender for rsyslog
-NORMALIZE_DESC= Message normalization module for rsyslog
-
-USES= libtool pkgconfig autoreconf
-
+DBI_DESC= LibDBI output module for rsyslog
DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
DBI_CONFIGURE_ENABLE= libdbi
DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so
+ELASTIC_DESC= Elasticsearch module for rsyslog
ELASTIC_CONFIGURE_ENABLE= elasticsearch
ELASTIC_LIB_DEPENDS= libcurl.so:ftp/curl
ELASTIC_PLIST_FILES= lib/rsyslog/omelasticsearch.so
+GCRYPT_DESC= Enable support for encrypted logfiles
GCRYPT_CONFIGURE_ENABLE=libgcrypt
GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error
GCRYPT_BUILD_DEPENDS= libgcrypt-config:security/libgcrypt
+GNUTLS_DESC= GNUTLS module for rsyslog
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_IMPLIES= GCRYPT
GNUTLS_CONFIGURE_ENABLE=gnutls
GNUTLS_PLIST_FILES= lib/rsyslog/lmnsd_gtls.so
+GSSAPI_DESC= GSS API input/output module for rsyslog
GSSAPI_CONFIGURE_ENABLE=gssapi-krb5
GSSAPI_PLIST_FILES= lib/rsyslog/imgssapi.so \
lib/rsyslog/lmgssutil.so \
lib/rsyslog/omgssapi.so
+JSONPARSE_DESC= JSONPARSE module for rsyslog
JSONPARSE_CONFIGURE_ENABLE= mmjsonparse
JSONPARSE_PLIST_FILES= lib/rsyslog/mmjsonparse.so
+MYSQL_DESC= MySQL output module for rsyslog
MYSQL_USES= mysql
MYSQL_CONFIGURE_ENABLE= mysql
MYSQL_PLIST_FILES= lib/rsyslog/ommysql.so
+MYSQL_PORTDOCS= plugins/ommysql/createDB.sql
+PGSQL_DESC= PostgreSQL output module for rsyslog
PGSQL_USES= pgsql
PGSQL_CONFIGURE_ENABLE= pgsql
PGSQL_PLIST_FILES= lib/rsyslog/ompgsql.so
+PGSQL_PORTDOCS= plugins/ompgsql/createDB.sql
+RELP_DESC= RELP input/output module for rsyslog
RELP_LIB_DEPENDS= librelp.so:devel/librelp
RELP_CONFIGURE_ENABLE= relp
RELP_PLIST_FILES= lib/rsyslog/imrelp.so \
lib/rsyslog/omrelp.so
+SNMP_DESC= SNMP trap sender for rsyslog
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_ENABLE= snmp
SNMP_PLIST_FILES= lib/rsyslog/omsnmp.so
+NORMALIZE_DESC= Message normalization module for rsyslog
NORMALIZE_LIB_DEPENDS= liblognorm.so:devel/liblognorm
NORMALIZE_CONFIGURE_ENABLE= mmnormalize
NORMALIZE_PLIST_FILES= lib/rsyslog/mmnormalize.so
-.include <bsd.port.options.mk>
-
.ifdef WITH_MYSQL_MICROSECONDS
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds
.endif
@@ -134,5 +133,11 @@ post-patch:
@${REINPLACE_CMD} -e 's,recvmmsg ,,' ${WRKSRC}/configure.ac
.endif
@${FIND} ${WRKSRC} -name '*.bak' -delete
+
+post-install-DOCS-on:
+.for SQL in ${PORTDOCS:M*.sql}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/${SQL:H}
+ @${INSTALL_DATA} ${WRKSRC}/${SQL} ${STAGEDIR}${DOCSDIR}/${SQL}
+.endfor
.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list