From owner-svn-ports-head@FreeBSD.ORG Sun Nov 10 12:31:48 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id BDDE36B; Sun, 10 Nov 2013 12:31:48 +0000 (UTC) (envelope-from marino@FreeBSD.org) 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 921D927B6; Sun, 10 Nov 2013 12:31:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAACVmrd062490; Sun, 10 Nov 2013 12:31:48 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAACVmXc062489; Sun, 10 Nov 2013 12:31:48 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201311101231.rAACVmXc062489@svn.freebsd.org> From: John Marino Date: Sun, 10 Nov 2013 12:31:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333388 - head/devel/matreshka 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.14 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: Sun, 10 Nov 2013 12:31:48 -0000 Author: marino Date: Sun Nov 10 12:31:47 2013 New Revision: 333388 URL: http://svnweb.freebsd.org/changeset/ports/333388 Log: devel/matreshka: Convert to staging * Convert USE_GMAKE to USES * Don't install license as it messes up auto-plist * Bump portrevision because plist is now missing license Modified: head/devel/matreshka/Makefile Modified: head/devel/matreshka/Makefile ============================================================================== --- head/devel/matreshka/Makefile Sun Nov 10 12:09:26 2013 (r333387) +++ head/devel/matreshka/Makefile Sun Nov 10 12:31:47 2013 (r333388) @@ -3,6 +3,7 @@ PORTNAME= matreshka PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://forge.ada-ru.org/matreshka/downloads/ @@ -13,9 +14,8 @@ LICENSE= BSD BUILD_DEPENDS= gprbuild>=20120510:${PORTSDIR}/devel/gprbuild -USES= ada -USE_GMAKE= yes -DESTINY= ${WRKDIR}/destino +USES= ada gmake +NO_MTREE= yes OPTIONS_DEFINE= SQLITE3 FIREBIRD PGSQL MYSQL ORACLE AMF OPTIONS_DEFAULT=SQLITE3 FIREBIRD PGSQL MYSQL @@ -23,11 +23,10 @@ OPTIONS_DEFAULT=SQLITE3 FIREBIRD PGSQL M AMF_DESC= Build Ada Modeling Framework MAKE_JOBS_UNSAFE= yes +NO_LICENSES_INSTALL= yes -MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMBER} \ - DESTDIR=${DESTINY} +MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMBER} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MFIREBIRD} @@ -55,12 +54,10 @@ MAKE_ENV+= WANT_AMF=yes .endif post-install: - ${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/ - @cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ - ${SORT} > ${WRKDIR}/PLIST.all - @cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \ - ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all - @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${WRKDIR}/PLIST.all - @${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ + ${SORT} > ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \ + ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST} + @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST} .include