From owner-svn-ports-head@FreeBSD.ORG Sat Nov 9 22:26:46 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 64687E8D; Sat, 9 Nov 2013 22:26:46 +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 519782688; Sat, 9 Nov 2013 22:26:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9MQkWm067779; Sat, 9 Nov 2013 22:26:46 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9MQksq067778; Sat, 9 Nov 2013 22:26:46 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201311092226.rA9MQksq067778@svn.freebsd.org> From: John Marino Date: Sat, 9 Nov 2013 22:26:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333351 - head/lang/gnat-aux 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: Sat, 09 Nov 2013 22:26:46 -0000 Author: marino Date: Sat Nov 9 22:26:45 2013 New Revision: 333351 URL: http://svnweb.freebsd.org/changeset/ports/333351 Log: lang/gnat-aux: convert to staging Also set license to GPLv3, but don't install it as it interferes with the automatically generated package list. Deleted: head/lang/gnat-aux/pkg-plist Modified: head/lang/gnat-aux/Makefile Modified: head/lang/gnat-aux/Makefile ============================================================================== --- head/lang/gnat-aux/Makefile Sat Nov 9 22:21:20 2013 (r333350) +++ head/lang/gnat-aux/Makefile Sat Nov 9 22:26:45 2013 (r333351) @@ -13,7 +13,8 @@ DISTFILES= gcc-core-${GCC_VERSION}.tar.b MAINTAINER= marino@FreeBSD.org COMMENT= GNAT Ada compiler based on GCC ${GCC_BRANCH} -NO_STAGE= yes +LICENSE= GPLv3 + .include "${.CURDIR}/Makefile.common" LANGS= c @@ -24,6 +25,8 @@ BOOTSTRAP_TRIPLET= NOT_SET FULL_GNATGCC= NOT_SET GARCH= ${ARCH:S/amd64/x86_64/} OS_LABEL4VERS= [${OPSYS}${GARCH:C,^.*(64),\1,}] +NO_LICENSES_INSTALL= yes +NO_MTREE= yes OPTIONS_DEFINE= ADA CXX FORT OBJC TESTSUITE OPTIONS_DEFAULT= ADA CXX FORT OBJC @@ -55,13 +58,8 @@ BUILDDIR= ${WRKDIR}/build CFG_SCRIPT= ${WRKSRC}/configure REVFILE= ${WRKSRC}/gcc/REVISION BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap -DESTINY= ${WRKDIR}/destdir PKG_PREFIX= ${PREFIX} -USE_LDCONFIG= ${PREFIX}/lib/gcc -MAN1= gnatcpp.1 gnatgcc.1 gnatgcov.1 -MAN1PREFIX= ${PREFIX}/share -MAN7PREFIX= ${PREFIX}/share -NO_MANCOMPRESS= yes +AWKMANPAGE= '{if ($$0 ~ /^man\/man[1-9]\/.+[1-9]$$/) print $$0 ".gz"; else print $$0}' # If we find gnatgcc and friends in standard location, then we'll use this # compiler instead of downloading the bootstrap. @@ -102,7 +100,6 @@ DISTFILES+= gcc-ada-${GCC_VERSION}.tar.b LANGS+= c++ APPLY_DIFFS+= cxx DISTFILES+= gcc-g++-${GCC_VERSION}.tar.bz2 -MAN1+= gnatg++.1 .endif ############### @@ -113,7 +110,6 @@ MAN1+= gnatg++.1 LANGS+= fortran APPLY_DIFFS+= fortran DISTFILES+= gcc-fortran-${GCC_VERSION}.tar.bz2 -MAN1+= gnatgfortran.1 QUADOPT= --enable-libquadmath .else QUADOPT= --disable-libquadmath @@ -216,7 +212,7 @@ do-configure: ${CFG_SCRIPT} ${CONFIGURE_ARGS} do-build: - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all test: build test-ada test-fortran test-objc test-cxx test-c @@ -247,23 +243,18 @@ test-c: .endif do-install: - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} install-strip DESTDIR=${DESTINY} - ${RM} ${DESTINY}${PREFIX}/lib/libiberty.a - ${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/ + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} install-strip DESTDIR=${STAGEDIR} + ${RM} ${STAGEDIR}${PREFIX}/lib/libiberty.a post-install: - ${RM} -f ${WRKDIR}/PLIST.all - ${RM} -rf ${DESTINY}/man - ${MV} ${DESTINY}${PREFIX}/share/man ${DESTINY}/ - cd ${DESTINY}; ${FIND} man -type d \ - -exec ${MKDIR} ${DESTINY}${PREFIX}/share/{} \; - cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ - ${SORT} >> ${WRKDIR}/PLIST.all - cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${SORT} -r | \ - ${SED} -E '/^(bin|sbin|lib|libexec|share)$$/d' | \ - ${SED} -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all - - cd ${WRKDIR}; ${SED} -i -e "/PLIST.all/ r PLIST.all" ${TMPPLIST} + ${MV} ${STAGEDIR}${PREFIX}/share/man ${STAGEDIR}/${PREFIX} + cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \ + ${SORT} -dr | ${XARGS} ${RMDIR} + cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ + ${AWK} ${AWKMANPAGE} | ${SORT} >> ${TMPPLIST} + cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${SORT} -r | \ + ${SED} -E -e '/^(bin|sbin|lib|libexec|share|man|include)$$/d' \ + -e '/^man\/man[1-9]$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST} .if ${OPSYS} == FreeBSD . if ${OSVERSION} > 900000 && ${OSVERSION} < 900507 @${ECHO_MSG} "===================================================================="