From owner-svn-ports-all@freebsd.org Sat Dec 5 09:37:41 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E407474447; Sat, 5 Dec 2020 09:37:41 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cp4HT2C3Zz3Drq; Sat, 5 Dec 2020 09:37:41 +0000 (UTC) (envelope-from amdmi3@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 3E8A11BBAE; Sat, 5 Dec 2020 09:37:41 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B59bf8m029427; Sat, 5 Dec 2020 09:37:41 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B59begh029425; Sat, 5 Dec 2020 09:37:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202012050937.0B59begh029425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 5 Dec 2020 09:37:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557047 - head/security/snort X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/security/snort X-SVN-Commit-Revision: 557047 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.34 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: Sat, 05 Dec 2020 09:37:41 -0000 Author: amdmi3 Date: Sat Dec 5 09:37:40 2020 New Revision: 557047 URL: https://svnweb.freebsd.org/changeset/ports/557047 Log: - Switch to options helpers - Only install docs when requested - Update WWW Approved by: portmgr blanket Modified: head/security/snort/Makefile head/security/snort/pkg-descr Modified: head/security/snort/Makefile ============================================================================== --- head/security/snort/Makefile Sat Dec 5 09:21:04 2020 (r557046) +++ head/security/snort/Makefile Sat Dec 5 09:37:40 2020 (r557047) @@ -81,8 +81,6 @@ APPID_LIB_DEPENDS= libluajit-5.1.so:lang/luajit APPID_CONFIGURE_ENV+= luajit_CFLAGS="-I${LOCALBASE}/include/luajit-2.0" \ luajit_LIBS="-L${LOCALBASE}/lib -lluajit-5.1" -.include - CONFIG_FILES= classification.config gen-msg.map reference.config \ snort.conf threshold.conf unicode.map file_magic.conf @@ -104,19 +102,18 @@ post-patch: -e '/^# include .PREPROC_RULE/s/# include/include/' \ ${WRKSRC}/etc/snort.conf +post-patch-IPV6-off: # IPv6 is no longer a ./configure option! -.if ! ${PORT_OPTIONS:MIPV6} @${REINPLACE_CMD} -e '/normalize_ip6/s/^preprocessor/#preprocessor/' \ -e '/normalize_icmp6/s/^preprocessor/#preprocessor/' \ ${WRKSRC}/etc/snort.conf -.endif post-build: @${FIND} ${WRKSRC}/src -name '*.0' -type f -exec ${STRIP_CMD} {} \; post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${RULES_DIR} ${STAGEDIR}${LOGS_DIR} \ - ${STAGEDIR}${PREPROC_RULE_DIR} ${STAGEDIR}${DOCSDIR} + ${STAGEDIR}${PREPROC_RULE_DIR} .for f in ${CONFIG_FILES} ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${ETCDIR}/${f}-sample @@ -125,6 +122,9 @@ post-install: .for f in ${PREPROC_RULES} ${INSTALL_DATA} ${WRKSRC}/preproc_rules/${f} ${STAGEDIR}${PREPROC_RULE_DIR}/${f}-sample .endfor + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${PREPROC_RULE_DIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include Modified: head/security/snort/pkg-descr ============================================================================== --- head/security/snort/pkg-descr Sat Dec 5 09:21:04 2020 (r557046) +++ head/security/snort/pkg-descr Sat Dec 5 09:37:40 2020 (r557047) @@ -18,4 +18,4 @@ Stuff(TM) about your packets (as I see it anyway). Th to modify to provide more complete packet decoding, so feel free to make suggestions. -WWW: http://www.snort.org/ +WWW: https://www.snort.org/