Date: Thu, 13 Mar 2014 23:46:26 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348143 - in head: lang/adacontrol lang/asis textproc/adabrowse x11-toolkits/qtada Message-ID: <201403132346.s2DNkQXX056111@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Mar 13 23:46:25 2014 New Revision: 348143 URL: http://svnweb.freebsd.org/changeset/ports/348143 QAT: https://qat.redports.org/buildarchive/r348143/ Log: Tie libgnat_util.a to libasis Rather than specify gnat_util every time ASIS is a dependency, set it as a library dependency for ASIS. LIB_DEPENDS doesn't work because it is a static library, so just manually add libgnat_util.a to BUILD_DEPENDS and RUN_DEPENDS, then adjust 3 ports accordingly. Modified: head/lang/adacontrol/Makefile head/lang/asis/Makefile head/textproc/adabrowse/Makefile head/x11-toolkits/qtada/Makefile Modified: head/lang/adacontrol/Makefile ============================================================================== --- head/lang/adacontrol/Makefile Thu Mar 13 23:44:53 2014 (r348142) +++ head/lang/adacontrol/Makefile Thu Mar 13 23:46:25 2014 (r348143) @@ -15,8 +15,7 @@ COMMENT= Tool for detecting use or non-u LICENSE= GPLv2 GMGPL LICENSE_COMB= multi -BUILD_DEPENDS= asis>=2011:${PORTSDIR}/lang/asis \ - gnat_util>=2013:${PORTSDIR}/lang/gnat_util +BUILD_DEPENDS= asis>=2011:${PORTSDIR}/lang/asis USES= ada gmake WRKSRC= ${WRKDIR}/adactl-${PORTVERSION} Modified: head/lang/asis/Makefile ============================================================================== --- head/lang/asis/Makefile Thu Mar 13 23:44:53 2014 (r348142) +++ head/lang/asis/Makefile Thu Mar 13 23:46:25 2014 (r348143) @@ -3,7 +3,7 @@ PORTNAME= asis PORTVERSION= 2011 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src @@ -15,11 +15,14 @@ COMMENT= GNAT implementation of Ada Sema LICENSE= GPLv2 BUILD_DEPENDS= gnat_util>=2013:${PORTSDIR}/lang/gnat_util \ - xmlada>=3.2:${PORTSDIR}/textproc/xmlada + xmlada>=3.2:${PORTSDIR}/textproc/xmlada \ + ${GUSTATIC}:${PORTSDIR}/lang/gnat_util +RUN_DEPENDS= ${GUSTATIC}:${PORTSDIR}/lang/gnat_util USES= ada gmake NO_MTREE= yes MAKE_ENV= PROCESSORS=${MAKE_JOBS_NUMBER} +GUSTATIC= ${LOCALBASE}/lib/gnat_util/libgnat_util.a post-extract: @${REINPLACE_CMD} -e 's|OPSYS|ASISOPSYS|g' \ Modified: head/textproc/adabrowse/Makefile ============================================================================== --- head/textproc/adabrowse/Makefile Thu Mar 13 23:44:53 2014 (r348142) +++ head/textproc/adabrowse/Makefile Thu Mar 13 23:46:25 2014 (r348143) @@ -13,8 +13,7 @@ COMMENT= HTML generator for Ada 95 libra LICENSE= GPLv2 -BUILD_DEPENDS= asis>=2011:${PORTSDIR}/lang/asis \ - gnat_util>=2013:${PORTSDIR}/lang/gnat_util +BUILD_DEPENDS= asis>=2011:${PORTSDIR}/lang/asis USES= ada WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} Modified: head/x11-toolkits/qtada/Makefile ============================================================================== --- head/x11-toolkits/qtada/Makefile Thu Mar 13 23:44:53 2014 (r348142) +++ head/x11-toolkits/qtada/Makefile Thu Mar 13 23:46:25 2014 (r348143) @@ -14,7 +14,6 @@ COMMENT= Ada2005 language bindings to Qt LICENSE= GPLv2 BUILD_DEPENDS= gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \ - gnat_util>=2013:${PORTSDIR}/lang/gnat_util \ asis>=2011:${PORTSDIR}/lang/asis USES= ada gmake pkgconfig @@ -28,7 +27,7 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share ${MV} ${STAGEDIR}${PREFIX}/examples ${STAGEDIR}${PREFIX}/share/ @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ - ${SORT} > ${TMPPLIST} + ${SORT} >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | \ ${SORT} -r | ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' \ -e '/share\/gps$$/d' -e '/share\/gps\/plug-ins$$/d' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403132346.s2DNkQXX056111>