From owner-svn-ports-all@FreeBSD.ORG Wed Aug 27 21:52:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B698A03; Wed, 27 Aug 2014 21:52:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 570E93165; Wed, 27 Aug 2014 21:52:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RLqQu4008093; Wed, 27 Aug 2014 21:52:26 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RLqPcY008087; Wed, 27 Aug 2014 21:52:25 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201408272152.s7RLqPcY008087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 27 Aug 2014 21:52:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366361 - in head: Mk net-mgmt/netmond X-SVN-Group: ports-head 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.18-1 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: Wed, 27 Aug 2014 21:52:26 -0000 Author: mandree Date: Wed Aug 27 21:52:25 2014 New Revision: 366361 URL: http://svnweb.freebsd.org/changeset/ports/366361 QAT: https://qat.redports.org/buildarchive/r366361/ Log: Fix @dirrm auto-generation for PORTDOCS/PORTEXAMPLES/PORTDATA with globs. Fix up net-mgmt/netmond pkg-plist for @mode (regression with pkg from r347404 committed by rene@) and remove two @dirrm lines that are now excess. Exp-run completed. PR: 191746 Reviewed by: antoine Approved by: portmgr (antoine) Modified: head/Mk/bsd.port.mk head/net-mgmt/netmond/Makefile head/net-mgmt/netmond/pkg-plist Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Aug 27 21:18:23 2014 (r366360) +++ head/Mk/bsd.port.mk Wed Aug 27 21:52:25 2014 (r366361) @@ -645,6 +645,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Should not be set when no documentation files are # installed. # Useful for dynamically generated documentation. +# NOTE: this may fail to generate @dirrm entries for +# complex patterns. In such a case, please abstain from +# using DOCSDIR and add files and @dirrm-directories to +# pkg-plist instead (see make makeplist). # # Set the following to specify all documentation your port installs into # ${EXAMPLESDIR} @@ -5555,7 +5559,7 @@ add-plist-docs: .endfor @${FIND} -P ${PORTDOCS:S/^/${STAGEDIR}${DOCSDIR}\//} ! -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${PORTDOCS:S/^/${STAGEDIR}${DOCSDIR}\//} -type d 2>/dev/null | \ + @${FIND} -P -d ${PORTDOCS:S/^/${STAGEDIR}${DOCSDIR}\//:C,/[^/]*[*?\[][^/]*$,,} -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} @${ECHO_CMD} "@dirrm ${DOCSDIR_REL}" >> ${TMPPLIST} .endif @@ -5577,7 +5581,7 @@ add-plist-examples: .endfor @${FIND} -P ${PORTEXAMPLES:S/^/${STAGEDIR}${EXAMPLESDIR}\//} ! -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${PORTEXAMPLES:S/^/${STAGEDIR}${EXAMPLESDIR}\//} -type d 2>/dev/null | \ + @${FIND} -P -d ${PORTEXAMPLES:C,/[^/]*[*?\[][^/]*$,,:S/^/${STAGEDIR}${EXAMPLESDIR}\//} -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} @${ECHO_CMD} "@dirrm ${EXAMPLESDIR_REL}" >> ${TMPPLIST} .endif @@ -5599,7 +5603,7 @@ add-plist-data: .endfor @${FIND} -P ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} ! -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${PORTDATA:S/^/${STAGEDIR}${DATADIR}\//} -type d 2>/dev/null | \ + @${FIND} -P -d ${PORTDATA:C,/[^/]*[*?\[][^/]*$,,:S/^/${STAGEDIR}${DATADIR}\//} -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} @${ECHO_CMD} "@dirrm ${DATADIR_REL}" >> ${TMPPLIST} .endif Modified: head/net-mgmt/netmond/Makefile ============================================================================== --- head/net-mgmt/netmond/Makefile Wed Aug 27 21:18:23 2014 (r366360) +++ head/net-mgmt/netmond/Makefile Wed Aug 27 21:52:25 2014 (r366361) @@ -3,7 +3,7 @@ PORTNAME= netmond PORTVERSION= 2.2b6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MASTER_SITES= http://freebsd.unixfreunde.de/sources/:daemon \ ftp://ftp.risp.ru/pub/RinetSoftware/:daemon \ Modified: head/net-mgmt/netmond/pkg-plist ============================================================================== --- head/net-mgmt/netmond/pkg-plist Wed Aug 27 21:18:23 2014 (r366360) +++ head/net-mgmt/netmond/pkg-plist Wed Aug 27 21:52:25 2014 (r366361) @@ -3,10 +3,8 @@ %%GD%%sbin/ifgraph sbin/netmond sbin/netmond_watchdog -@mode u+s +@mode 04555 sbin/netmondctl @mode @group wheel etc/netmond.conf.sample -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ru -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/en