From owner-svn-ports-head@freebsd.org Wed Jun 29 23:37:53 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 278AFB86E52; Wed, 29 Jun 2016 23:37:53 +0000 (UTC) (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id DD9A6256E; Wed, 29 Jun 2016 23:37:52 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5TNbqvb049871; Wed, 29 Jun 2016 23:37:52 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5TNbpMA049863; Wed, 29 Jun 2016 23:37:51 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201606292337.u5TNbpMA049863@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 29 Jun 2016 23:37:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417797 - in head: misc misc/freebsd-release-manifests misc/freebsd-release-manifests/files misc/freebsd-release-manifests/files/MANIFESTS ports-mgmt/poudriere ports-mgmt/poudriere-deve... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2016 23:37:53 -0000 Author: bdrewery Date: Wed Jun 29 23:37:51 2016 New Revision: 417797 URL: https://svnweb.freebsd.org/changeset/ports/417797 Log: Move the release MANIFESTS to misc/freebsd-release-manifests. Also add a dependency for ca_root_nss to Poudriere. Added: head/misc/freebsd-release-manifests/ head/misc/freebsd-release-manifests/Makefile (contents, props changed) head/misc/freebsd-release-manifests/files/ head/misc/freebsd-release-manifests/files/MANIFESTS/ - copied from r417796, head/ports-mgmt/poudriere/files/MANIFESTS/ head/misc/freebsd-release-manifests/pkg-descr (contents, props changed) head/misc/freebsd-release-manifests/pkg-plist (contents, props changed) Deleted: head/ports-mgmt/poudriere/files/MANIFESTS/ Modified: head/misc/Makefile head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere-devel/pkg-plist head/ports-mgmt/poudriere/Makefile head/ports-mgmt/poudriere/pkg-plist Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Wed Jun 29 23:20:34 2016 (r417796) +++ head/misc/Makefile Wed Jun 29 23:37:51 2016 (r417797) @@ -121,6 +121,7 @@ SUBDIR += freebsd-doc-tr SUBDIR += freebsd-doc-zh_cn SUBDIR += freebsd-doc-zh_tw + SUBDIR += freebsd-release-manifests SUBDIR += freeguide SUBDIR += ftdi-eeprom SUBDIR += fxload Added: head/misc/freebsd-release-manifests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/freebsd-release-manifests/Makefile Wed Jun 29 23:37:51 2016 (r417797) @@ -0,0 +1,26 @@ +# $FreeBSD$ + +PORTNAME= freebsd-release-manifests +DISTVERSION= 20160404 +PORTREVISION= 0 +CATEGORIES= misc +MASTER_SITES= # +DISTFILES= # + +MAINTAINER= cperciva@FreeBSD.org +COMMENT= FreeBSD release manifests + +LICENSE= BSD2CLAUSE + +NO_BUILD= yes +NO_ARCH= yes +NO_INSTALL= yes + +DATADIR= ${PREFIX}/share/freebsd + +post-install: + @${MKDIR} ${STAGEDIR}${DATADIR}/MANIFESTS + ${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* \ + ${STAGEDIR}${DATADIR}/MANIFESTS/ + +.include Added: head/misc/freebsd-release-manifests/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/freebsd-release-manifests/pkg-descr Wed Jun 29 23:37:51 2016 (r417797) @@ -0,0 +1,3 @@ +MANIFEST files from the FreeBSD release images. + +WWW: https://www.FreeBSD.org Added: head/misc/freebsd-release-manifests/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/freebsd-release-manifests/pkg-plist Wed Jun 29 23:37:51 2016 (r417797) @@ -0,0 +1,46 @@ +%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE +%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Wed Jun 29 23:20:34 2016 (r417796) +++ head/ports-mgmt/poudriere-devel/Makefile Wed Jun 29 23:37:51 2016 (r417797) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.1.99.20160624 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -28,6 +28,9 @@ OPTIONS_DEFINE= ZSH QEMU EXAMPLES OPTIONS_DEFAULT=ZSH OPTIONS_SUB= yes +RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss +RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests + QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static @@ -35,5 +38,7 @@ post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ + ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ + ${STAGEDIR}${DATADIR}/MANIFESTS .include Modified: head/ports-mgmt/poudriere-devel/pkg-plist ============================================================================== --- head/ports-mgmt/poudriere-devel/pkg-plist Wed Jun 29 23:20:34 2016 (r417796) +++ head/ports-mgmt/poudriere-devel/pkg-plist Wed Jun 29 23:37:51 2016 (r417797) @@ -22,6 +22,7 @@ libexec/poudriere/tsort man/man8/poudriere.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample +%%DATADIR%%/MANIFESTS %%DATADIR%%/awk/dependency_loop.awk %%DATADIR%%/awk/humanize.awk %%DATADIR%%/awk/json.awk Modified: head/ports-mgmt/poudriere/Makefile ============================================================================== --- head/ports-mgmt/poudriere/Makefile Wed Jun 29 23:20:34 2016 (r417796) +++ head/ports-mgmt/poudriere/Makefile Wed Jun 29 23:37:51 2016 (r417797) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -24,6 +24,9 @@ OPTIONS_DEFINE= ZSH QEMU EXAMPLES OPTIONS_DEFAULT=ZSH OPTIONS_SUB= yes +RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss +RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests + QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static @@ -31,7 +34,7 @@ post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ - @${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/MANIFESTS - ${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* ${STAGEDIR}${PREFIX}/share/${PORTNAME}/MANIFESTS/ + ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ + ${STAGEDIR}${DATADIR}/MANIFESTS .include Modified: head/ports-mgmt/poudriere/pkg-plist ============================================================================== --- head/ports-mgmt/poudriere/pkg-plist Wed Jun 29 23:20:34 2016 (r417796) +++ head/ports-mgmt/poudriere/pkg-plist Wed Jun 29 23:37:51 2016 (r417797) @@ -21,52 +21,7 @@ libexec/poudriere/tsort man/man8/poudriere.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample -%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE -%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE -%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE -%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE +%%DATADIR%%/MANIFESTS %%DATADIR%%/api.sh %%DATADIR%%/awk/dependency_loop.awk %%DATADIR%%/awk/humanize.awk