From owner-svn-ports-all@FreeBSD.ORG Sun Jun 1 11:47:15 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 DCC31706; Sun, 1 Jun 2014 11:47:14 +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 BE81E24DD; Sun, 1 Jun 2014 11:47:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51BlE8r020307; Sun, 1 Jun 2014 11:47:14 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51BlE5Y020305; Sun, 1 Jun 2014 11:47:14 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406011147.s51BlE5Y020305@svn.freebsd.org> From: Pawel Pekala Date: Sun, 1 Jun 2014 11:47:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356102 - head/lang/intel2gas 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 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, 01 Jun 2014 11:47:15 -0000 Author: pawel Date: Sun Jun 1 11:47:14 2014 New Revision: 356102 URL: http://svnweb.freebsd.org/changeset/ports/356102 QAT: https://qat.redports.org/buildarchive/r356102/ Log: - Add staging support - Convert to new options framework - Use DATADIR, DOCSDIR to make things simplier Modified: head/lang/intel2gas/Makefile head/lang/intel2gas/pkg-plist Modified: head/lang/intel2gas/Makefile ============================================================================== --- head/lang/intel2gas/Makefile Sun Jun 1 11:45:28 2014 (r356101) +++ head/lang/intel2gas/Makefile Sun Jun 1 11:47:14 2014 (r356102) @@ -12,21 +12,14 @@ COMMENT= Converts Intel assembly languag GNU_CONFIGURE= yes MAKE_ARGS= CXX="${CXX}" -DATAPREFIX= ${PREFIX}/share/intel2gas -DATADIRS= i2g g2i m2g -DOCS= BUGS DATAFILES README +OPTIONS_DEFINE= DOCS -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/intel2gas ${PREFIX}/bin - ${MKDIR} ${DATAPREFIX} -.for dir in ${DATADIRS} - ${MKDIR} ${DATAPREFIX}/${dir} - cd ${WRKSRC}; ${INSTALL_DATA} ${dir}/* ${DATAPREFIX}/${dir} -.endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/intel2gas - cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/intel2gas -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/intel2gas ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} "i2g g2i m2g" ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}; ${INSTALL_DATA} BUGS DATAFILES README \ + ${STAGEDIR}${DOCSDIR}) .include Modified: head/lang/intel2gas/pkg-plist ============================================================================== --- head/lang/intel2gas/pkg-plist Sun Jun 1 11:45:28 2014 (r356101) +++ head/lang/intel2gas/pkg-plist Sun Jun 1 11:47:14 2014 (r356102) @@ -1,107 +1,107 @@ bin/intel2gas -%%PORTDOCS%%share/doc/intel2gas/BUGS -%%PORTDOCS%%share/doc/intel2gas/DATAFILES -%%PORTDOCS%%share/doc/intel2gas/README -share/intel2gas/g2i/+-.01.list -share/intel2gas/g2i/+-.02.list -share/intel2gas/g2i/addr.syntax -share/intel2gas/g2i/address.syntax -share/intel2gas/g2i/data.01.list -share/intel2gas/g2i/data.02.list -share/intel2gas/g2i/data.04.list -share/intel2gas/g2i/fpureg.syntax -share/intel2gas/g2i/jump.syntax -share/intel2gas/g2i/jumpaddr.syntax -share/intel2gas/g2i/main.syntax -share/intel2gas/g2i/mathnum.syntax -share/intel2gas/g2i/num.syntax -share/intel2gas/g2i/numlist.syntax -share/intel2gas/g2i/op.01.list -share/intel2gas/g2i/op.02.list -share/intel2gas/g2i/op.04.list -share/intel2gas/g2i/op.08.list -share/intel2gas/g2i/op.10.list -share/intel2gas/g2i/op.20.list -share/intel2gas/g2i/reg.01.list -share/intel2gas/g2i/reg.02.list -share/intel2gas/g2i/reg.04.list -share/intel2gas/g2i/reg.08.list -share/intel2gas/g2i/reg.10.list -share/intel2gas/g2i/section.01.list -share/intel2gas/g2i/size.01.list -share/intel2gas/g2i/size.02.list -share/intel2gas/g2i/size.04.list -share/intel2gas/g2i/size.08.list -share/intel2gas/g2i/size.10.list -share/intel2gas/g2i/strings.syntax -share/intel2gas/g2i/textlist.syntax -share/intel2gas/i2g/+-.01.list -share/intel2gas/i2g/+-.02.list -share/intel2gas/i2g/address.syntax -share/intel2gas/i2g/data.01.list -share/intel2gas/i2g/data.02.list -share/intel2gas/i2g/data.04.list -share/intel2gas/i2g/data.08.list -share/intel2gas/i2g/discard.01.list -share/intel2gas/i2g/fpureg.syntax -share/intel2gas/i2g/jump.syntax -share/intel2gas/i2g/main.syntax -share/intel2gas/i2g/mathnum.syntax -share/intel2gas/i2g/num.syntax -share/intel2gas/i2g/numlist.syntax -share/intel2gas/i2g/op.01.list -share/intel2gas/i2g/op.02.list -share/intel2gas/i2g/op.04.list -share/intel2gas/i2g/op.08.list -share/intel2gas/i2g/op.10.list -share/intel2gas/i2g/op.20.list -share/intel2gas/i2g/reg.01.list -share/intel2gas/i2g/reg.02.list -share/intel2gas/i2g/reg.04.list -share/intel2gas/i2g/reg.08.list -share/intel2gas/i2g/reg.10.list -share/intel2gas/i2g/section.01.list -share/intel2gas/i2g/size.01.list -share/intel2gas/i2g/size.02.list -share/intel2gas/i2g/size.04.list -share/intel2gas/i2g/size.08.list -share/intel2gas/i2g/size.10.list -share/intel2gas/i2g/textlist.syntax -share/intel2gas/m2g/+-.01.list -share/intel2gas/m2g/+-.02.list -share/intel2gas/m2g/address.syntax -share/intel2gas/m2g/data.01.list -share/intel2gas/m2g/data.02.list -share/intel2gas/m2g/data.04.list -share/intel2gas/m2g/data.08.list -share/intel2gas/m2g/discard.01.list -share/intel2gas/m2g/fpureg.syntax -share/intel2gas/m2g/jump.syntax -share/intel2gas/m2g/main.syntax -share/intel2gas/m2g/manypublics.syntax -share/intel2gas/m2g/mathnum.syntax -share/intel2gas/m2g/num.syntax -share/intel2gas/m2g/numlist.syntax -share/intel2gas/m2g/op.01.list -share/intel2gas/m2g/op.02.list -share/intel2gas/m2g/op.04.list -share/intel2gas/m2g/op.08.list -share/intel2gas/m2g/op.10.list -share/intel2gas/m2g/op.20.list -share/intel2gas/m2g/reg.01.list -share/intel2gas/m2g/reg.02.list -share/intel2gas/m2g/reg.04.list -share/intel2gas/m2g/reg.08.list -share/intel2gas/m2g/reg.10.list -share/intel2gas/m2g/section.01.list -share/intel2gas/m2g/size.01.list -share/intel2gas/m2g/size.02.list -share/intel2gas/m2g/size.04.list -share/intel2gas/m2g/size.08.list -share/intel2gas/m2g/size.10.list -share/intel2gas/m2g/textlist.syntax -@dirrm share/intel2gas/m2g -@dirrm share/intel2gas/i2g -@dirrm share/intel2gas/g2i -@dirrm share/intel2gas -%%PORTDOCS%%@dirrm share/doc/intel2gas +%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/DATAFILES +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/g2i/+-.01.list +%%DATADIR%%/g2i/+-.02.list +%%DATADIR%%/g2i/addr.syntax +%%DATADIR%%/g2i/address.syntax +%%DATADIR%%/g2i/data.01.list +%%DATADIR%%/g2i/data.02.list +%%DATADIR%%/g2i/data.04.list +%%DATADIR%%/g2i/fpureg.syntax +%%DATADIR%%/g2i/jump.syntax +%%DATADIR%%/g2i/jumpaddr.syntax +%%DATADIR%%/g2i/main.syntax +%%DATADIR%%/g2i/mathnum.syntax +%%DATADIR%%/g2i/num.syntax +%%DATADIR%%/g2i/numlist.syntax +%%DATADIR%%/g2i/op.01.list +%%DATADIR%%/g2i/op.02.list +%%DATADIR%%/g2i/op.04.list +%%DATADIR%%/g2i/op.08.list +%%DATADIR%%/g2i/op.10.list +%%DATADIR%%/g2i/op.20.list +%%DATADIR%%/g2i/reg.01.list +%%DATADIR%%/g2i/reg.02.list +%%DATADIR%%/g2i/reg.04.list +%%DATADIR%%/g2i/reg.08.list +%%DATADIR%%/g2i/reg.10.list +%%DATADIR%%/g2i/section.01.list +%%DATADIR%%/g2i/size.01.list +%%DATADIR%%/g2i/size.02.list +%%DATADIR%%/g2i/size.04.list +%%DATADIR%%/g2i/size.08.list +%%DATADIR%%/g2i/size.10.list +%%DATADIR%%/g2i/strings.syntax +%%DATADIR%%/g2i/textlist.syntax +%%DATADIR%%/i2g/+-.01.list +%%DATADIR%%/i2g/+-.02.list +%%DATADIR%%/i2g/address.syntax +%%DATADIR%%/i2g/data.01.list +%%DATADIR%%/i2g/data.02.list +%%DATADIR%%/i2g/data.04.list +%%DATADIR%%/i2g/data.08.list +%%DATADIR%%/i2g/discard.01.list +%%DATADIR%%/i2g/fpureg.syntax +%%DATADIR%%/i2g/jump.syntax +%%DATADIR%%/i2g/main.syntax +%%DATADIR%%/i2g/mathnum.syntax +%%DATADIR%%/i2g/num.syntax +%%DATADIR%%/i2g/numlist.syntax +%%DATADIR%%/i2g/op.01.list +%%DATADIR%%/i2g/op.02.list +%%DATADIR%%/i2g/op.04.list +%%DATADIR%%/i2g/op.08.list +%%DATADIR%%/i2g/op.10.list +%%DATADIR%%/i2g/op.20.list +%%DATADIR%%/i2g/reg.01.list +%%DATADIR%%/i2g/reg.02.list +%%DATADIR%%/i2g/reg.04.list +%%DATADIR%%/i2g/reg.08.list +%%DATADIR%%/i2g/reg.10.list +%%DATADIR%%/i2g/section.01.list +%%DATADIR%%/i2g/size.01.list +%%DATADIR%%/i2g/size.02.list +%%DATADIR%%/i2g/size.04.list +%%DATADIR%%/i2g/size.08.list +%%DATADIR%%/i2g/size.10.list +%%DATADIR%%/i2g/textlist.syntax +%%DATADIR%%/m2g/+-.01.list +%%DATADIR%%/m2g/+-.02.list +%%DATADIR%%/m2g/address.syntax +%%DATADIR%%/m2g/data.01.list +%%DATADIR%%/m2g/data.02.list +%%DATADIR%%/m2g/data.04.list +%%DATADIR%%/m2g/data.08.list +%%DATADIR%%/m2g/discard.01.list +%%DATADIR%%/m2g/fpureg.syntax +%%DATADIR%%/m2g/jump.syntax +%%DATADIR%%/m2g/main.syntax +%%DATADIR%%/m2g/manypublics.syntax +%%DATADIR%%/m2g/mathnum.syntax +%%DATADIR%%/m2g/num.syntax +%%DATADIR%%/m2g/numlist.syntax +%%DATADIR%%/m2g/op.01.list +%%DATADIR%%/m2g/op.02.list +%%DATADIR%%/m2g/op.04.list +%%DATADIR%%/m2g/op.08.list +%%DATADIR%%/m2g/op.10.list +%%DATADIR%%/m2g/op.20.list +%%DATADIR%%/m2g/reg.01.list +%%DATADIR%%/m2g/reg.02.list +%%DATADIR%%/m2g/reg.04.list +%%DATADIR%%/m2g/reg.08.list +%%DATADIR%%/m2g/reg.10.list +%%DATADIR%%/m2g/section.01.list +%%DATADIR%%/m2g/size.01.list +%%DATADIR%%/m2g/size.02.list +%%DATADIR%%/m2g/size.04.list +%%DATADIR%%/m2g/size.08.list +%%DATADIR%%/m2g/size.10.list +%%DATADIR%%/m2g/textlist.syntax +@dirrm %%DATADIR%%/m2g +@dirrm %%DATADIR%%/i2g +@dirrm %%DATADIR%%/g2i +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%