From owner-svn-ports-all@freebsd.org Sun Sep 2 14:00:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57E51FF0207; Sun, 2 Sep 2018 14:00:39 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F29779D92; Sun, 2 Sep 2018 14:00:39 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E42051A29F; Sun, 2 Sep 2018 14:00:38 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w82E0ciQ008547; Sun, 2 Sep 2018 14:00:38 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w82E0cc8008546; Sun, 2 Sep 2018 14:00:38 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201809021400.w82E0cc8008546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sun, 2 Sep 2018 14:00:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478790 - head/net-mgmt/net-snmp X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: head/net-mgmt/net-snmp X-SVN-Commit-Revision: 478790 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2018 14:00:39 -0000 Author: zi Date: Sun Sep 2 14:00:38 2018 New Revision: 478790 URL: https://svnweb.freebsd.org/changeset/ports/478790 Log: - Make newsyslog config file installation OPTIONable - Convert USE_MYSQL to USES=mysql PR: 231085 Submitted by: Dries Michiels Modified: head/net-mgmt/net-snmp/Makefile head/net-mgmt/net-snmp/pkg-plist Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Sun Sep 2 13:11:49 2018 (r478789) +++ head/net-mgmt/net-snmp/Makefile Sun Sep 2 14:00:38 2018 (r478790) @@ -25,8 +25,8 @@ NOT_FOR_ARCHS_REASON= SSP is currently broken on MIPS OPTIONS_DEFINE= IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \ MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS JAIL AX_DISABLE_TRAP \ - TLS -OPTIONS_DEFAULT=PERL PERL_EMBEDDED DUMMY SMUX + TLS NEWSYSLOG +OPTIONS_DEFAULT=PERL PERL_EMBEDDED DUMMY SMUX NEWSYSLOG OPTIONS_SUB= yes MFD_REWRITES_DESC= Use new MFD rewrites of mib modules @@ -38,6 +38,7 @@ AX_DISABLE_TRAP_DESC= Disable agentx subagent code in UNPRIVILEGED_DESC= Allow unprivileged users to execute net-snmp SMUX_DESC= Build with SNMP multiplexing (SMUX) support JAIL_DESC= Options for running snmpd within a jail(8) +NEWSYSLOG_DESC= Automatically rotate snmpd.log via newsyslog MAKE_JOBS_UNSAFE= yes @@ -123,7 +124,7 @@ PLIST_SUB+= WITH_PERL="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+=--with-mysql CONFIGURE_ENV+= MYSQLCONFIG=${LOCALBASE}/bin/mysql_config .endif @@ -282,13 +283,16 @@ post-build: .endif post-install: strip-files install-config-files install-doc-files - @${MKDIR} ${STAGEDIR}/var/agentx ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d + @${MKDIR} ${STAGEDIR}/var/agentx @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmp.so.${SHLIB_VERSION} libnetsnmp.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpagent.so.${SHLIB_VERSION} libnetsnmpagent.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmphelpers.so.${SHLIB_VERSION} libnetsnmphelpers.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpmibs.so.${SHLIB_VERSION} libnetsnmpmibs.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmptrapd.so.${SHLIB_VERSION} libnetsnmptrapd.so) +.if ${PORT_OPTIONS:MNEWSYSLOG} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} ${FILESDIR}/net-snmp.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/ +.endif strip-files: (cd ${STAGEDIR}${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}) Modified: head/net-mgmt/net-snmp/pkg-plist ============================================================================== --- head/net-mgmt/net-snmp/pkg-plist Sun Sep 2 13:11:49 2018 (r478789) +++ head/net-mgmt/net-snmp/pkg-plist Sun Sep 2 14:00:38 2018 (r478790) @@ -30,7 +30,7 @@ bin/snmpvacm bin/snmpwalk %%WITH_TKMIB%%bin/tkmib bin/traptoemail -etc/newsyslog.conf.d/net-snmp.conf +%%NEWSYSLOG%%etc/newsyslog.conf.d/net-snmp.conf include/net-snmp/agent/agent_callbacks.h include/net-snmp/agent/agent_handler.h include/net-snmp/agent/agent_index.h