Date: Fri, 14 Mar 2014 08:36:34 +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: r348171 - in head/lang/adacontrol: . files Message-ID: <201403140836.s2E8aYZ5076531@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Fri Mar 14 08:36:33 2014 New Revision: 348171 URL: http://svnweb.freebsd.org/changeset/ports/348171 QAT: https://qat.redports.org/buildarchive/r348171/ Log: lang/adacontrol: Reaction to gcc-aux upgrade to gcc49 While the version remains the same, AdaControl comes with two flavors of distfiles: "old" and "new". The "old" distfile was appropriate for gcc47-aux, but the "new" one is required for the gcc49-based ada compiler. This change updates the distfile to be used to build adacontrol. Deleted: head/lang/adacontrol/files/ Modified: head/lang/adacontrol/Makefile head/lang/adacontrol/distinfo head/lang/adacontrol/pkg-plist Modified: head/lang/adacontrol/Makefile ============================================================================== --- head/lang/adacontrol/Makefile Fri Mar 14 08:36:05 2014 (r348170) +++ head/lang/adacontrol/Makefile Fri Mar 14 08:36:33 2014 (r348171) @@ -3,10 +3,10 @@ PORTNAME= adacontrol PORTVERSION= 1.15r5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= SF/adacontrol -DISTNAME= adactl_old-${PORTVERSION}-src +DISTNAME= adactl-${PORTVERSION}-src EXTRACT_SUFX= .tgz MAINTAINER= marino@FreeBSD.org @@ -17,26 +17,36 @@ LICENSE_COMB= multi BUILD_DEPENDS= asis>=2011:${PORTSDIR}/lang/asis -USES= ada gmake +USES= ada WRKSRC= ${WRKDIR}/adactl-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= build +PORTDOCS= adacontrol* + +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +do-build: + (cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -Pbuild) do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${PREFIX}/share/gps/plug-ins - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/gps/html - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/adacontrol - ${MKDIR} ${STAGEDIR}${PREFIX}/share/gprconfig + ${MKDIR} ${STAGEDIR}${PREFIX}/bin \ + ${STAGEDIR}${PREFIX}/share/gps/plug-ins \ + ${STAGEDIR}${PREFIX}/share/doc/gps/html \ + ${STAGEDIR}${PREFIX}/share/gprconfig ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/adactl ${BUILD_WRKSRC}/pfni \ ${BUILD_WRKSRC}/ptree ${STAGEDIR}/${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/GPS/adacontrol.xml \ ${STAGEDIR}${PREFIX}/share/gprconfig ${INSTALL_DATA} ${WRKSRC}/GPS/*adactl* ${WRKSRC}/GPS/pfni.* \ ${STAGEDIR}${PREFIX}/share/gps/plug-ins - ${INSTALL_MAN} ${WRKSRC}/doc/*.html \ + ${INSTALL_DATA} ${WRKSRC}/doc/*.html \ ${STAGEDIR}${PREFIX}/share/doc/gps/html - ${INSTALL_MAN} ${WRKSRC}/doc/*.pdf ${WRKSRC}/doc/*.html \ - ${STAGEDIR}${PREFIX}/share/doc/adacontrol +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${WRKSRC}/doc/*.html \ + ${STAGEDIR}${DOCSDIR} +.endif .include <bsd.port.mk> Modified: head/lang/adacontrol/distinfo ============================================================================== --- head/lang/adacontrol/distinfo Fri Mar 14 08:36:05 2014 (r348170) +++ head/lang/adacontrol/distinfo Fri Mar 14 08:36:33 2014 (r348171) @@ -1,2 +1,2 @@ -SHA256 (adactl_old-1.15r5-src.tgz) = 0d495ee1f6c643c807f295474f32726c5935c5ec8a94c847c25e803b1546f4fb -SIZE (adactl_old-1.15r5-src.tgz) = 1700731 +SHA256 (adactl-1.15r5-src.tgz) = e3e3029ad5b7ad941bff64eafe2566ec3f7815af8e03066cbb4cd87235023e4e +SIZE (adactl-1.15r5-src.tgz) = 1707819 Modified: head/lang/adacontrol/pkg-plist ============================================================================== --- head/lang/adacontrol/pkg-plist Fri Mar 14 08:36:05 2014 (r348170) +++ head/lang/adacontrol/pkg-plist Fri Mar 14 08:36:33 2014 (r348171) @@ -1,10 +1,6 @@ bin/adactl bin/pfni bin/ptree -%%DOCSDIR%%/adacontrol_pm.html -%%DOCSDIR%%/adacontrol_pm.pdf -%%DOCSDIR%%/adacontrol_ug.html -%%DOCSDIR%%/adacontrol_ug.pdf share/doc/gps/html/adacontrol_pm.html share/doc/gps/html/adacontrol_ug.html share/gprconfig/adacontrol.xml @@ -14,7 +10,6 @@ share/gps/plug-ins/adactl_ask.gif share/gps/plug-ins/pfni.py share/gps/plug-ins/pfni.xml share/gps/plug-ins/zadactl.xml -@dirrm %%DOCSDIR%% @dirrmtry share/doc/gps/html @dirrmtry share/doc/gps @dirrmtry share/doc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403140836.s2E8aYZ5076531>