From owner-svn-ports-all@FreeBSD.ORG Sat Dec 14 09:52:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35556EA2; Sat, 14 Dec 2013 09:52:43 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FF0315F7; Sat, 14 Dec 2013 09:52:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE9qg4X010545; Sat, 14 Dec 2013 09:52:42 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE9qgg9010540; Sat, 14 Dec 2013 09:52:42 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312140952.rBE9qgg9010540@svn.freebsd.org> From: Matthias Andree Date: Sat, 14 Dec 2013 09:52:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336430 - in head: audio/squash devel/cvschk devel/libublio sysutils/busybox 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.17 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, 14 Dec 2013 09:52:43 -0000 Author: mandree Date: Sat Dec 14 09:52:41 2013 New Revision: 336430 URL: http://svnweb.freebsd.org/changeset/ports/336430 Log: Convert to staging. Modified: head/audio/squash/Makefile head/devel/cvschk/Makefile head/devel/cvschk/pkg-plist head/devel/libublio/Makefile head/sysutils/busybox/Makefile Modified: head/audio/squash/Makefile ============================================================================== --- head/audio/squash/Makefile Sat Dec 14 09:27:14 2013 (r336429) +++ head/audio/squash/Makefile Sat Dec 14 09:52:41 2013 (r336430) @@ -19,7 +19,6 @@ LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/aud libao.so:${PORTSDIR}/audio/libao RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3v2 -NO_STAGE= yes USE_BZIP2= yes USES= gmake USE_RUBY= yes @@ -41,18 +40,18 @@ post-patch: ${WRKSRC}/src/global.c do-install: - ${MKDIR} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/squash ${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/squash ${STAGEDIR}${PREFIX}/bin .for FILE in collect_info edit_tag export_music import_music joystick uncollect_info - ${INSTALL_SCRIPT} ${WRKSRC}/extra/${FILE}.rb ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/extra/${FILE}.rb ${STAGEDIR}${PREFIX}/bin .endfor - ${MKDIR} ${RUBY_SITELIBDIR} - ${INSTALL_DATA} ${WRKSRC}/extra/musicdb_lib.rb ${RUBY_SITELIBDIR} - ${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${PREFIX}/etc/squash.conf.dist + ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR} + ${INSTALL_DATA} ${WRKSRC}/extra/musicdb_lib.rb ${STAGEDIR}${RUBY_SITELIBDIR} + ${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${STAGEDIR}${PREFIX}/etc/squash.conf.dist .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README doc/FEATURES doc/LOCKS doc/INSTALL doc/USERS_GUIDE - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/devel/cvschk/Makefile ============================================================================== --- head/devel/cvschk/Makefile Sat Dec 14 09:27:14 2013 (r336429) +++ head/devel/cvschk/Makefile Sat Dec 14 09:52:41 2013 (r336430) @@ -16,15 +16,13 @@ USES= perl5 USE_PERL5= run NO_BUILD= yes NO_WRKSUBDIR= yes -MAN1= cvschk.1 -NO_STAGE= yes do-configure: ${SED} -e "s,^#!/usr/bin/perl -w,#! ${PERL} -w," \ <${DISTDIR}/${DISTNAME} >${WRKSRC}/${DISTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${FILESDIR}/cvschk.1 ${PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${FILESDIR}/cvschk.1 ${STAGEDIR}${PREFIX}/man/man1 .include Modified: head/devel/cvschk/pkg-plist ============================================================================== --- head/devel/cvschk/pkg-plist Sat Dec 14 09:27:14 2013 (r336429) +++ head/devel/cvschk/pkg-plist Sat Dec 14 09:52:41 2013 (r336430) @@ -1 +1,2 @@ bin/cvschk +man/man1/cvschk.1.gz Modified: head/devel/libublio/Makefile ============================================================================== --- head/devel/libublio/Makefile Sat Dec 14 09:27:14 2013 (r336429) +++ head/devel/libublio/Makefile Sat Dec 14 09:52:41 2013 (r336430) @@ -21,7 +21,8 @@ PLIST_SUB+= PROFLIB="" SRCCONF= /dev/null MAKE_ENV+= SRCCONF=${SRCCONF} -NO_STAGE= yes +NEED_ROOT= yes + .include post-extract: @@ -36,8 +37,8 @@ pre-install: post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/sysutils/busybox/Makefile ============================================================================== --- head/sysutils/busybox/Makefile Sat Dec 14 09:27:14 2013 (r336429) +++ head/sysutils/busybox/Makefile Sat Dec 14 09:52:41 2013 (r336430) @@ -23,7 +23,6 @@ MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOST USES= gmake USE_BZIP2= yes # avoid clang, breaks in findutils/find.c l. 752+, -NO_STAGE= yes # uses a GCC extension/invalid C code: USE_GCC?= 4.2+ @@ -50,10 +49,10 @@ do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR} - ${RM} -f ${DOCSDIR}/.gitignore + cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + ${RM} -f ${STAGEDIR}${DOCSDIR}/.gitignore .endif .include