Date: Thu, 9 Jun 2016 22:20: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: r416637 - in head: devel/gprbuild devel/gprbuild/files devel/gps textproc/templates_parser www/aws www/aws-demos x11-toolkits/qtada Message-ID: <201606092220.u59MKYEY077221@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Jun 9 22:20:34 2016 New Revision: 416637 URL: https://svnweb.freebsd.org/changeset/ports/416637 Log: devel/gprbuild: Upgrade version 20150506 => 20160609 GPRBuild build is now hosted on github, so we can move away from the yearly releases and update more frequently. Unfortunately the docs makefile is currently broken so docs are disabled currently. When they come back, only txt and html docs will be supported. This new version detected a missing reference in the template-parser port so that port has been fixed and the downstream ports bumped accordingly. It also discovered an interface specification issue in a designer example of qtada. I spent a few minutes trying to fix/workaround it, but ultimately marked it broken. I will also deprecate the port because it no development has occurred since the port was created, and it's not even based on a real release. We'll see if anybody cares (3 month deprecation). Deleted: head/devel/gprbuild/files/patch-gnat_targparm head/devel/gprbuild/files/patch-src_gpr__version.adb Modified: head/devel/gprbuild/Makefile head/devel/gprbuild/distinfo head/devel/gprbuild/files/Makefile.BSD head/devel/gprbuild/pkg-plist head/devel/gps/Makefile head/textproc/templates_parser/Makefile head/www/aws-demos/Makefile head/www/aws/Makefile head/x11-toolkits/qtada/Makefile Modified: head/devel/gprbuild/Makefile ============================================================================== --- head/devel/gprbuild/Makefile Thu Jun 9 22:07:46 2016 (r416636) +++ head/devel/gprbuild/Makefile Thu Jun 9 22:20:34 2016 (r416637) @@ -3,10 +3,7 @@ PORTNAME= gprbuild PORTVERSION= ${SNAPSHOT} -PORTREVISION= 3 CATEGORIES= devel -MASTER_SITES= http://downloads.dragonlace.net/src/ -DISTNAME= gprbuild-gpl-${YEAR}-src MAINTAINER= marino@FreeBSD.org COMMENT= Adacore multi-language software build tool @@ -15,26 +12,29 @@ LICENSE= GPLv3 BUILD_DEPENDS= xmlada>=4.4:textproc/xmlada -YEAR= 2015 -SNAPSHOT= 20150506 +SNAPSHOT= 20160609 USES= ada +USE_GITHUB= yes +GH_ACCOUNT= AdaCore +GH_PROJECT= gprbuild +GH_TAGNAME= 376670f + +PORTDOCS= * MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} -PORTDOCS= html txt pdf -CONHOST= ${CONFIGURE_TARGET} +BUILD_WRKSRC= ${WRKSRC}/construction +INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_TARGET= install -OPTIONS_DEFINE= DOCS -DOCS_INSTALL_TARGET= install-docs - -.include <bsd.port.options.mk> +#OPTIONS_DEFINE= DOCS +#DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +#DOCS_ALL_TARGET= gen-docs +#DOCS_INSTALL_TARGET= install-docs post-patch: - ${CP} ${FILESDIR}/Makefile.BSD ${WRKSRC}/Makefile - @${REINPLACE_CMD} -i "" -e "s,@AUXPREFIX@,${PREFIX}/gcc5-aux," \ + ${MKDIR} ${WRKDIR}/trash ${BUILD_WRKSRC} + ${CP} ${FILESDIR}/Makefile.BSD ${WRKSRC}/construction/Makefile + @${REINPLACE_CMD} -i "" -e "s,@AUXPREFIX@,${PREFIX}/${ADAXX}-aux," \ ${WRKSRC}/share/gprconfig/compilers.xml - ${SED} -e 's|@host@|${CONHOST}|' \ - ${WRKSRC}/src/gprconfig-sdefault.ads.in > \ - ${WRKSRC}/src/gprconfig-sdefault.ads - ${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKSRC}/obj-cov + ${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKDIR}/trash .include <bsd.port.mk> Modified: head/devel/gprbuild/distinfo ============================================================================== --- head/devel/gprbuild/distinfo Thu Jun 9 22:07:46 2016 (r416636) +++ head/devel/gprbuild/distinfo Thu Jun 9 22:20:34 2016 (r416637) @@ -1,2 +1,3 @@ -SHA256 (gprbuild-gpl-2015-src.tar.gz) = 5d5bbc8c57075250c264e2f15d9949383450ac696eb8a90803c2a36b55ecd0e2 -SIZE (gprbuild-gpl-2015-src.tar.gz) = 3424715 +TIMESTAMP = 1465501253 +SHA256 (AdaCore-gprbuild-20160609-376670f_GH0.tar.gz) = c595767f69cca960d5f0f7bfa5f7bdcfb2fcba11822432e87f1eef52cfb68fab +SIZE (AdaCore-gprbuild-20160609-376670f_GH0.tar.gz) = 958175 Modified: head/devel/gprbuild/files/Makefile.BSD ============================================================================== --- head/devel/gprbuild/files/Makefile.BSD Thu Jun 9 22:07:46 2016 (r416636) +++ head/devel/gprbuild/files/Makefile.BSD Thu Jun 9 22:20:34 2016 (r416637) @@ -1,97 +1,80 @@ -.PHONY: all -.PHONY: generate_sources +.PATH: ../src +.PATH: ../gpr/src -AFLAGS= -gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1 -j${PROCESSORS} +STATIC_FLAGS= -gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1 -COBJS= obj/link.o obj/gprbuild_dummies.o +PREFIX?= /usr/local +GPRLIB_INC= -I${PREFIX}/include/xmlada -I../gpr/src +LOOK= -aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada + +libgpr_csrc= gprbuild_dummies.c \ + gpr_imports.c + +LARGS= ${libgpr_csrc:S/^/-largs /:.c=.o} \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_dom.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_input_sources.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_sax.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_schema.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_unicode.a + +APPS= gprclean/gprclean-main.adb \ + gprconfig/gprconfig-main.adb \ + gprbuild/gprbuild-main.adb \ + gprbind/gprbind.adb \ + gprlib/gprlib.adb \ + gprinstall/gprinstall-main.adb \ + gprslave/gprslave.adb \ + gprname/gprname-main.adb \ + gprls/gprls-main.adb + +all: ${APPS:H} + +gprclean: gprclean-main.adb ${libgpr_csrc:.c=.o} + gnatmake -o ${.TARGET} -j${PROCESSORS} \ + ${STATIC_FLAGS} ${GPRLIB_INC} ${LOOK} \ + ${.ALLSRC:M*adb} ${LARGS} + +.for app in ${APPS:Ngprclean*} +${app:H}: gprclean ${app:T} ${libgpr_csrc:.c=.o} + gnatmake -o ${.TARGET} ${STATIC_FLAGS} ${GPRLIB_INC} ${LOOK} \ + ${.ALLSRC:M*adb} ${LARGS} +.endfor -LOOK= -aI${.CURDIR}/gnat -aI${.CURDIR}/gen_src \ - -aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada -LARGS= -largs ${.CURDIR}/obj/link.o \ - -largs ${.CURDIR}/obj/gprbuild_dummies.o \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_dom.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_input_sources.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_sax.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_schema.a \ - -largs ${PREFIX}/lib/xmlada/static/libxmlada_unicode.a - -GENDIR= gen_src -GEN_SRCS= ${GENDIR}/snames.adb ${GENDIR}/snames.ads -DOCSDIR= ${PREFIX}/share/doc/gprbuild +clean: + rm -f *.o *.ali b~* ${APP:H} -all: gprbuild +gen-docs: + ${MAKE} -e -C ${.CURDIR:H}/doc html txt install: mkdir -p ${DESTDIR}${PREFIX}/bin \ ${DESTDIR}${PREFIX}/libexec/gprbuild \ ${DESTDIR}${PREFIX}/share/gpr \ ${DESTDIR}${PREFIX}/share/gprconfig - ${BSD_INSTALL_PROGRAM} ${.CURDIR}/obj/gprclean \ - ${.CURDIR}/obj/gprinstall \ - ${.CURDIR}/obj/gprconfig \ - ${.CURDIR}/obj/gprslave \ - ${.CURDIR}/obj/gprbuild ${DESTDIR}${PREFIX}/bin - ${BSD_INSTALL_PROGRAM} ${.CURDIR}/obj/gprbind \ - ${.CURDIR}/obj/gprlib ${DESTDIR}${PREFIX}/libexec/gprbuild - ${BSD_INSTALL_DATA} ${.CURDIR}/share/_default.gpr \ - ${DESTDIR}${PREFIX}/share/gpr - ${BSD_INSTALL_DATA} ${.CURDIR}/share/gprconfig/* \ - ${DESTDIR}${PREFIX}/share/gprconfig + ${BSD_INSTALL_PROGRAM} \ + ${.CURDIR}/gprclean \ + ${.CURDIR}/gprinstall \ + ${.CURDIR}/gprconfig \ + ${.CURDIR}/gprslave \ + ${.CURDIR}/gprls \ + ${.CURDIR}/gprname \ + ${.CURDIR}/gprbuild \ + ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} \ + ${.CURDIR}/gprbind \ + ${.CURDIR}/gprlib \ + ${DESTDIR}${PREFIX}/libexec/gprbuild + ${BSD_INSTALL_DATA} \ + ${.CURDIR}/../share/_default.gpr \ + ${DESTDIR}${PREFIX}/share/gpr + ${BSD_INSTALL_DATA} \ + ${.CURDIR}/../share/gprconfig/*.x[sm][dl] \ + ${DESTDIR}${PREFIX}/share/gprconfig install-docs: - mkdir -p ${DESTDIR}${DOCSDIR}/html ${DESTDIR}${DOCSDIR}/txt \ - ${DESTDIR}${DOCSDIR}/pdf - ${BSD_INSTALL_DATA} ${.CURDIR}/doc/txt/gprbuild_ug.txt \ - ${DESTDIR}${DOCSDIR}/txt - ${BSD_INSTALL_DATA} ${.CURDIR}/doc/pdf/gprbuild_ug.pdf \ - ${DESTDIR}${DOCSDIR}/pdf - cp -r ${.CURDIR}/doc/html/* ${DESTDIR}${DOCSDIR}/html - rm -rf ${DESTDIR}${DOCSDIR}/html/_sources - ${BSD_INSTALL_DATA} ${.CURDIR}/doc/*.png \ - ${DESTDIR}${DOCSDIR}/html - -gprclean: src/gprclean-main.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprclean-main.adb ${LARGS} - -gprbind: gprclean src/gprslave.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprbind.adb ${LARGS} - -gprlib: gprbind src/gprslave.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprlib.adb ${LARGS} - -gprslave: gprlib src/gprslave.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprslave.adb ${LARGS} - -gprinstall: gprslave src/gprinstall-main.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprinstall-main.adb ${LARGS} - -gprconfig: gprinstall src/gprconfig-main.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprconfig-main.adb ${LARGS} - -gprbuild: gprconfig src/gprbuild-main.adb ${GEN_SRCS} ${COBJS} - gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ - ${.CURDIR}/src/gprbuild-main.adb ${LARGS} - -obj/link.o: gnat/link.c - gcc -c -o ${.CURDIR}/${.TARGET} ${.ALLSRC} - -obj/gprbuild_dummies.o: src/gprbuild_dummies.c - gcc -c -o ${.CURDIR}/${.TARGET} ${.ALLSRC} - -generate_sources: - mkdir -p ${.CURDIR}/${GENDIR} - (cd ${.CURDIR}/gnat && cp xsnamest.adb xutil.* snames.adb-tmpl \ - snames.ads-tmpl snames.h-tmpl ../${GENDIR}) - (cd ${.CURDIR}/${GENDIR} && \ - gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ - ./xsnamest && \ - mv snames.ns snames.ads && \ - mv snames.nb snames.adb) - -${GEN_SRCS}: generate_sources + mkdir -p ${DESTDIR}${PREFIX}/share/doc/gprbuild/txt + ${BSD_INSTALL_DATA} ${.CURDIR}/../doc/txt/gprbuild_ug.txt \ + ${DESTDIR}${PREFIX}/share/doc/gprbuild/txt + rm -rf ${.CURDIR}/../doc/html/_sources + rm -f ${.CURDIR}/../doc/html/.buildinfo + cp -a ${.CURDIR}/../doc/html ${DESTDIR}${PREFIX}/share/doc/gprbuild Modified: head/devel/gprbuild/pkg-plist ============================================================================== --- head/devel/gprbuild/pkg-plist Thu Jun 9 22:07:46 2016 (r416636) +++ head/devel/gprbuild/pkg-plist Thu Jun 9 22:20:34 2016 (r416637) @@ -2,6 +2,8 @@ bin/gprbuild bin/gprclean bin/gprconfig bin/gprinstall +bin/gprls +bin/gprname bin/gprslave libexec/gprbuild/gprbind libexec/gprbuild/gprlib @@ -14,7 +16,6 @@ share/gprconfig/cpp.xml share/gprconfig/cross.xml share/gprconfig/fortran.xml share/gprconfig/gnat.xml -share/gprconfig/gnat_runtime.mapping share/gprconfig/gprconfig.xsd share/gprconfig/linker.xml share/gprconfig/nocompiler.xml Modified: head/devel/gps/Makefile ============================================================================== --- head/devel/gps/Makefile Thu Jun 9 22:07:46 2016 (r416636) +++ head/devel/gps/Makefile Thu Jun 9 22:20:34 2016 (r416637) @@ -3,7 +3,7 @@ PORTNAME= gps PORTVERSION= 6.1.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= gps-6.1.1-src Modified: head/textproc/templates_parser/Makefile ============================================================================== --- head/textproc/templates_parser/Makefile Thu Jun 9 22:07:46 2016 (r416636) +++ head/textproc/templates_parser/Makefile Thu Jun 9 22:20:34 2016 (r416637) @@ -18,11 +18,12 @@ RUN_DEPENDS= xmlada>=4.4:textproc/xmlada USES= ada gmake tar:bzip2 DESTINC= ${STAGEDIR}${PREFIX}/include/templates_parser -PLIST_SUB= LIBVER=11.10.0w +PLIST_SUB= LIBVER=${PORTVERSION:R} MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} \ ENABLE_SHARED=true \ HOST=${CONFIGURE_TARGET} \ TARGET=${CONFIGURE_TARGET} \ + VERSION=${PORTVERSION:R} \ prefix=${PREFIX} PORTDOCS= html Modified: head/www/aws-demos/Makefile ============================================================================== --- head/www/aws-demos/Makefile Thu Jun 9 22:07:46 2016 (r416636) +++ head/www/aws-demos/Makefile Thu Jun 9 22:20:34 2016 (r416637) @@ -3,7 +3,7 @@ PORTNAME= aws PORTVERSION= 3.3.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ PKGNAMESUFFIX= -demos Modified: head/www/aws/Makefile ============================================================================== --- head/www/aws/Makefile Thu Jun 9 22:07:46 2016 (r416636) +++ head/www/aws/Makefile Thu Jun 9 22:20:34 2016 (r416637) @@ -3,7 +3,7 @@ PORTNAME= aws PORTVERSION= 3.3.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ Modified: head/x11-toolkits/qtada/Makefile ============================================================================== --- head/x11-toolkits/qtada/Makefile Thu Jun 9 22:07:46 2016 (r416636) +++ head/x11-toolkits/qtada/Makefile Thu Jun 9 22:20:34 2016 (r416637) @@ -13,6 +13,13 @@ COMMENT= Ada2005 language bindings to Qt LICENSE= GPLv2 +# Error: In library project "Examples_Designer_Custom_Widget_Plugin" +# Unit "Analog_Clock_Plugin" is not in the interface set +# but it is needed by the spec of "Analog_Clock_Plugin.moc" +BROKEN= New gprbuild detected interface issue with designer example +DEPRECATED= No development since 2012, usefulness unclear +EXPIRATION_DATE= 2016-09-09 + BUILD_DEPENDS= gprbuild>=20120510:devel/gprbuild \ asis>=2011:lang/asis
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606092220.u59MKYEY077221>