From fc445b2e3f2fe16d96e8f4333d11b52df231a9ff Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 23 Jun 2015 22:20:35 +0000 Subject: [PATCH] Ada Framework: Switch to gcc5-aux, upgrade 6 packages at once The transition from gcc-aux to gcc5-aux in the Ada framework has been blocked by the inability to build gtkada3 and, once resolved, GPS (due to tight locking with compiler). A few days ago, Adacore made their annual release of their main libre products, include GPS. However, some products were tightly coupled with the recent compilers, so in order to upgrade, the compiler had to be switched and dependencies require many ports to be upgraded at once: * lang/asis * devel/gnatcoll * devel/gps * x11-toolkits/gtkada3 * www/aws * www/aws-demos While the version upgrades were modest in most cases (gps, gtkada3), the amount of work put into each port was significant. There are too many improvements to mention here. A few include the removal of dynamic package lists and incorporating gnatcoll into gps to avoid building it twice. A private "exp-run" was done all on all 50+ Ada ports to ensure they still build. Also, a new argument was added to Uses/ada.mk, "run", that pulls in the GNAT compiler as a run depends. This was necessary for GPS that will not launch correctly without the compiler in place. --- Mk/Uses/ada.mk | 12 +- devel/gnatcoll/Makefile | 66 +- devel/gnatcoll/distinfo | 4 +- devel/gnatcoll/files/patch-configure | 11 + .../files/patch-src_gnatcoll__iconv.gpr | 2 +- .../files/patch-src_gnatcoll__readline.gpr.in | 2 +- ...tch-src_iconv_with__iconv_iconv__support.c | 15 +- devel/gnatcoll/pkg-plist | 46 +- devel/gps/Makefile | 113 ++- devel/gps/distinfo | 4 +- devel/gps/files/patch-Makefile.in | 24 +- .../patch-browsers_src_browsers-scripts.adb | 133 ---- .../files/patch-common_core_src_os-utils.c | 19 + devel/gps/files/patch-common_tty_terminals.c | 12 - devel/gps/files/patch-docs_Makefile.in | 2 +- .../patch-gnatlib_src_gnatcoll__iconv.gpr | 12 - ...atch-gnatlib_src_gnatcoll__readline.gpr.in | 21 - ...lib_src_iconv_with__iconv_iconv__support.c | 11 - devel/gps/files/patch-gps_Makefile | 22 + devel/gps/files/patch-shared.gpr | 47 ++ devel/gps/files/patch-widgets_widgets.gpr | 4 +- devel/gps/pkg-plist | 641 ++++++++++++++++++ lang/asis/Makefile | 42 +- lang/asis/distinfo | 4 +- lang/asis/files/asis.gpr | 12 + lang/asis/files/patch-Makefile.stub | 6 +- lang/asis/files/patch-asis_a4g-gnat__int.adb | 4 +- lang/asis/files/patch-no-OpenVMS.diff | 70 -- lang/asis/pkg-plist | 211 ++++++ lang/gnat_util/Makefile | 6 +- www/aws-demos/Makefile | 5 +- www/aws/Makefile | 14 +- www/aws/distinfo | 4 +- .../files/{patch-makefile => patch-Makefile} | 6 +- www/aws/files/patch-aws.gpr | 2 +- ...{patch-gps_makefile => patch-gps_Makefile} | 4 +- www/aws/files/patch-include_include.gpr | 4 +- .../patch-regtests_0043__check__mem_test.opt | 2 +- ...-regtests_0213__check__mem__nossl_test.opt | 2 +- www/aws/files/patch-src_core_aws-net.adb | 4 +- ...xtended_aws-services-dispatchers-timer.adb | 37 - ...tended_aws-services-web__block-context.ads | 11 + www/aws/files/patch-src_src.gpr | 14 +- www/aws/files/patch-ssl__crypto_lib.gpr | 4 +- www/aws/files/patch-tools_tools.gpr | 8 +- www/aws/pkg-plist | 468 ++++++------- x11-toolkits/gtkada3/Makefile | 55 +- x11-toolkits/gtkada3/distinfo | 4 +- x11-toolkits/gtkada3/files/patch-Makefile.in | 26 + x11-toolkits/gtkada3/files/patch-configure | 19 +- .../gtkada3/files/patch-docs_Makefile.in | 2 +- .../files/patch-src_gtkada-canvas__view.ads | 89 --- x11-toolkits/gtkada3/pkg-plist | 43 +- 53 files changed, 1519 insertions(+), 886 deletions(-) create mode 100644 devel/gnatcoll/files/patch-configure delete mode 100644 devel/gps/files/patch-browsers_src_browsers-scripts.adb create mode 100644 devel/gps/files/patch-common_core_src_os-utils.c delete mode 100644 devel/gps/files/patch-common_tty_terminals.c delete mode 100644 devel/gps/files/patch-gnatlib_src_gnatcoll__iconv.gpr delete mode 100644 devel/gps/files/patch-gnatlib_src_gnatcoll__readline.gpr.in delete mode 100644 devel/gps/files/patch-gnatlib_src_iconv_with__iconv_iconv__support.c create mode 100644 devel/gps/files/patch-gps_Makefile create mode 100644 devel/gps/files/patch-shared.gpr create mode 100644 devel/gps/pkg-plist create mode 100644 lang/asis/files/asis.gpr delete mode 100644 lang/asis/files/patch-no-OpenVMS.diff create mode 100644 lang/asis/pkg-plist rename www/aws/files/{patch-makefile => patch-Makefile} (90%) rename www/aws/files/{patch-gps_makefile => patch-gps_Makefile} (74%) delete mode 100644 www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb create mode 100644 www/aws/files/patch-src_extended_aws-services-web__block-context.ads create mode 100644 x11-toolkits/gtkada3/files/patch-Makefile.in delete mode 100644 x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk index a3fdb26dd38b..64eb89f64e38 100644 --- a/Mk/Uses/ada.mk +++ b/Mk/Uses/ada.mk @@ -6,7 +6,7 @@ # # Feature: ada # Usage: USES=ada -# Valid ARGS: 49, 5 +# Valid ARGS: 49, 5, run # # MAINTAINER: marino@FreeBSD.org @@ -20,13 +20,17 @@ ADAXX= gcc . elif ${ada_ARGS:M5} ADAXX= gcc5 . else -. if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 5 -ADAXX= gcc5 -. else +. if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 49 ADAXX= gcc +. else +ADAXX= gcc5 . endif . endif +. if ${ada_ARGS:Mrun} +RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux +. endif + BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux MAKE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \ ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile index e0e05237feed..23766c23cd72 100644 --- a/devel/gnatcoll/Makefile +++ b/devel/gnatcoll/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gnatcoll -PORTVERSION= 2014 -PORTREVISION= 4 +PORTVERSION= 2015 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src @@ -15,32 +14,34 @@ LICENSE= GPLv3 BUILD_DEPENDS= gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \ gnat_util>=20140422:${PORTSDIR}/lang/gnat_util -LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp +LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 \ + libgmp.so:${PORTSDIR}/math/gmp -USES= ada gmake +USES= ada gmake pkgconfig python +USE_GNOME= pygobject3 +PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py GNU_CONFIGURE= yes -LDFLAGS+= -lm PORTDOCS= html gnatcoll.pdf PORTEXAMPLES= * -OPTIONS_DEFINE= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV \ - DOCS EXAMPLES -OPTIONS_DEFAULT= READLINE SYSLOG SQLITE PYTHON GTK PGSQL +MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} \ + Gnatcoll_Build=Production + +OPTIONS_DEFINE= READLINE SYSLOG PGSQL ICONV DOCS EXAMPLES +OPTIONS_DEFAULT= READLINE SYSLOG OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx -GTK_LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 -SYSLOG_CONFIGURE_ENABLE=syslog - -GTK_DESC= GTK3 toolkit support +SYSLOG_CONFIGURE_ENABLE= syslog CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL} CONFIGURE_ARGS= --with-gmp=${PREFIX} \ + --with-sqlite=embedded \ + --with-python=${PREFIX} \ + --with-gtk=3.0 \ + --enable-pygobject \ --disable-shared \ --disable-pygtk -MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} -MAKE_ARGS+= Gnatcoll_Build=Production - .include .if ${PORT_OPTIONS:MREADLINE} @@ -50,12 +51,6 @@ CONFIGURE_ARGS+= --enable-gpl CONFIGURE_ARGS+= --disable-readline .endif -.if ${PORT_OPTIONS:MSQLITE} -CONFIGURE_ARGS+= --with-sqlite=embedded -.else -CONFIGURE_ARGS+= --without-sqlite -.endif - .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${PREFIX} @@ -72,24 +67,6 @@ CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX} CONFIGURE_ARGS+= --without-iconv .endif -.if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+= --with-python=${PREFIX} \ - --enable-pygobject -USES+= python -USE_GNOME= pygobject3 -PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py -.else -CONFIGURE_ARGS+= --without-python \ - --disable-pygobject -.endif - -.if ${PORT_OPTIONS:MGTK} -USES+= pkgconfig -CONFIGURE_ARGS+= --with-gtk=3.0 -.else -CONFIGURE_ARGS+= --without-gtk -.endif - post-patch: @${REINPLACE_CMD} -e "s|@PREFIX@|${PREFIX}|g" \ ${WRKSRC}/src/gnatcoll_readline.gpr.in @@ -102,14 +79,11 @@ do-build: ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} post-install: - ${RM} -rf ${STAGEDIR}${DOCSDIR}/html/_sources - ${RM} -rf ${STAGEDIR}${PREFIX}/share/gps + ${RM} -r ${STAGEDIR}${DOCSDIR}/html/_sources + ${RM} -r ${STAGEDIR}${PREFIX}/share/gps + ${RM} -r ${STAGEDIR}${EXAMPLESDIR}/library .if ! ${PORT_OPTIONS:MEXAMPLES} - ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} -.endif -.if ${PORT_OPTIONS:MSQLITE} - # Rename gnatinspect to gnatinspect-xref to avoid GPS conflict - cd ${STAGEDIR}${PREFIX}/bin && ${MV} gnatinspect gnatinspect-xref + ${RM} -r ${STAGEDIR}${EXAMPLESDIR} .endif .include diff --git a/devel/gnatcoll/distinfo b/devel/gnatcoll/distinfo index 3e2e619a64fa..1fe5bfa56dab 100644 --- a/devel/gnatcoll/distinfo +++ b/devel/gnatcoll/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnatcoll-gpl-2014-src.tar.gz) = 3a631c2d6b7569ac6821c91d276c93a09ceaf1caf9441ffca4cbe162b7b533e6 -SIZE (gnatcoll-gpl-2014-src.tar.gz) = 5398895 +SHA256 (gnatcoll-gpl-2015-src.tar.gz) = ed27220497db6e4a540549e739323337427c069e7a1078cb06d0df52001f5b36 +SIZE (gnatcoll-gpl-2015-src.tar.gz) = 5337526 diff --git a/devel/gnatcoll/files/patch-configure b/devel/gnatcoll/files/patch-configure new file mode 100644 index 000000000000..97e3b7c87e28 --- /dev/null +++ b/devel/gnatcoll/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2015-04-30 10:51:26 UTC ++++ configure +@@ -3911,7 +3911,7 @@ $as_echo_n "checking if we can link with + ia64-*hp-hpux11* ) + PYTHON_LIBS="-ldld -ldl -lm -Wl,-E ${PYTHON_LIBS}" + ;; +- *-freebsd* ) ++ *-freebsd* | *-dragonfly* ) + PYTHON_LIBS="-lm -lutil ${PYTHON_LIBS}" + ;; + esac diff --git a/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr b/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr index ac755752cdf6..8452f9324ee9 100644 --- a/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr +++ b/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr @@ -1,4 +1,4 @@ ---- src/gnatcoll_iconv.gpr.orig 2014-04-10 13:47:58.000000000 +0000 +--- src/gnatcoll_iconv.gpr.orig 2015-04-30 10:51:45 UTC +++ src/gnatcoll_iconv.gpr @@ -27,7 +27,8 @@ project GnatColl_Iconv is package Compiler is diff --git a/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in b/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in index db54f3d25baf..10e0014f4bed 100644 --- a/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in +++ b/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in @@ -1,4 +1,4 @@ ---- src/gnatcoll_readline.gpr.in.orig 2014-04-10 13:47:58.000000000 +0000 +--- src/gnatcoll_readline.gpr.in.orig 2015-04-30 10:51:45 UTC +++ src/gnatcoll_readline.gpr.in @@ -6,7 +6,7 @@ project GnatColl_Readline is when "yes" => diff --git a/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c b/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c index 7c0348d53285..94d11d041656 100644 --- a/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c +++ b/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c @@ -1,11 +1,20 @@ ---- src/iconv/with_iconv/iconv_support.c.orig 2013-08-21 12:16:12.000000000 +0000 +--- src/iconv/with_iconv/iconv_support.c.orig 2015-04-30 10:51:47 UTC +++ src/iconv/with_iconv/iconv_support.c -@@ -25,7 +25,7 @@ int gnatcoll_iconv_close(iconv_t cd) { +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + const int gnatcoll_errno_einval = EINVAL; + const int gnatcoll_errno_e2big = E2BIG; +@@ -25,7 +26,8 @@ int gnatcoll_iconv_close(iconv_t cd) { return iconv_close (cd); } -#if _LIBICONV_VERSION >= 0x010D -+#if defined (__FreeBSD__) || defined (__DragonFly__) ++#if defined (__DragonFly__) || \ ++ (defined (__FreeBSD__) && __FreeBSD_version < 1001514) size_t gnatcoll_iconv (iconv_t cd, const char** inbuf, size_t *inbytesleft, char** outbuf, size_t *outbytesleft) diff --git a/devel/gnatcoll/pkg-plist b/devel/gnatcoll/pkg-plist index a4b098206a39..95ca277298ba 100644 --- a/devel/gnatcoll/pkg-plist +++ b/devel/gnatcoll/pkg-plist @@ -1,11 +1,13 @@ bin/gnatcoll_db2ada -%%SQLITE%%bin/gnatinspect-xref -%%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.adb -%%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.ads +bin/gnatinspect +include/gnatcoll/gnatcoll-any_types-python.adb +include/gnatcoll/gnatcoll-any_types-python.ads include/gnatcoll/gnatcoll-any_types.adb include/gnatcoll/gnatcoll-any_types.ads include/gnatcoll/gnatcoll-arg_lists.adb include/gnatcoll/gnatcoll-arg_lists.ads +include/gnatcoll/gnatcoll-atomic.adb +include/gnatcoll/gnatcoll-atomic.ads include/gnatcoll/gnatcoll-boyer_moore.adb include/gnatcoll/gnatcoll-boyer_moore.ads include/gnatcoll/gnatcoll-config.adb @@ -102,7 +104,6 @@ include/gnatcoll/gnatcoll-ravenscar-utils.ads include/gnatcoll/gnatcoll-ravenscar.ads include/gnatcoll/gnatcoll-readline.adb include/gnatcoll/gnatcoll-readline.ads -include/gnatcoll/gnatcoll-refcount-sync_counters.adb include/gnatcoll/gnatcoll-refcount-weakref.adb include/gnatcoll/gnatcoll-refcount-weakref.ads include/gnatcoll/gnatcoll-refcount.adb @@ -110,12 +111,16 @@ include/gnatcoll/gnatcoll-refcount.ads include/gnatcoll/gnatcoll-remote-db.adb include/gnatcoll/gnatcoll-remote-db.ads include/gnatcoll/gnatcoll-remote.ads -%%GTK%%include/gnatcoll/gnatcoll-scripts-gtkada.adb -%%GTK%%include/gnatcoll/gnatcoll-scripts-gtkada.ads +include/gnatcoll/gnatcoll-scripts-files.adb +include/gnatcoll/gnatcoll-scripts-files.ads +include/gnatcoll/gnatcoll-scripts-gtkada.adb +include/gnatcoll/gnatcoll-scripts-gtkada.ads include/gnatcoll/gnatcoll-scripts-impl.adb include/gnatcoll/gnatcoll-scripts-impl.ads -%%GTK%%include/gnatcoll/gnatcoll-scripts-python-gtkada.adb -%%GTK%%include/gnatcoll/gnatcoll-scripts-python-gtkada.ads +include/gnatcoll/gnatcoll-scripts-python-gtkada.adb +include/gnatcoll/gnatcoll-scripts-python-gtkada.ads +include/gnatcoll/gnatcoll-scripts-projects.adb +include/gnatcoll/gnatcoll-scripts-projects.ads include/gnatcoll/gnatcoll-scripts-python.adb include/gnatcoll/gnatcoll-scripts-python.ads include/gnatcoll/gnatcoll-scripts-shell.adb @@ -146,8 +151,8 @@ include/gnatcoll/gnatcoll-sql-sessions.adb include/gnatcoll/gnatcoll-sql-sessions.ads include/gnatcoll/gnatcoll-sql-sqlite-builder.adb include/gnatcoll/gnatcoll-sql-sqlite-builder.ads -%%SQLITE%%include/gnatcoll/gnatcoll-sql-sqlite-gnade.adb -%%SQLITE%%include/gnatcoll/gnatcoll-sql-sqlite-gnade.ads +include/gnatcoll/gnatcoll-sql-sqlite-gnade.adb +include/gnatcoll/gnatcoll-sql-sqlite-gnade.ads include/gnatcoll/gnatcoll-sql-sqlite.adb include/gnatcoll/gnatcoll-sql-sqlite.ads include/gnatcoll/gnatcoll-sql.adb @@ -171,8 +176,8 @@ include/gnatcoll/gnatcoll-tribooleans.adb include/gnatcoll/gnatcoll-tribooleans.ads include/gnatcoll/gnatcoll-utils.adb include/gnatcoll/gnatcoll-utils.ads -%%GTK%%include/gnatcoll/gnatcoll-vfs-gtkada.adb -%%GTK%%include/gnatcoll/gnatcoll-vfs-gtkada.ads +include/gnatcoll/gnatcoll-vfs-gtkada.adb +include/gnatcoll/gnatcoll-vfs-gtkada.ads include/gnatcoll/gnatcoll-vfs.adb include/gnatcoll/gnatcoll-vfs.ads include/gnatcoll/gnatcoll-vfs_types.ads @@ -184,7 +189,7 @@ include/gnatcoll/gnatcoll.ads lib/gnat/gnatcoll.gpr lib/gnat/gnatcoll/gnatcoll.lgpr lib/gnat/gnatcoll/gnatcoll_gmp.lgpr -%%GTK%%lib/gnat/gnatcoll/gnatcoll_gtk.lgpr +lib/gnat/gnatcoll/gnatcoll_gtk.lgpr lib/gnat/gnatcoll/gnatcoll_iconv.lgpr lib/gnat/gnatcoll/gnatcoll_postgres.lgpr lib/gnat/gnatcoll/gnatcoll_python.lgpr @@ -197,9 +202,10 @@ lib/gnat/gnatcoll_postgres.gpr lib/gnat/gnatcoll_python.gpr lib/gnat/gnatcoll_readline.gpr lib/gnat/gnatcoll_sqlite.gpr -%%PYTHON%%lib/gnatcoll/static/gnatcoll-any_types-python.ali +lib/gnatcoll/static/gnatcoll-any_types-python.ali lib/gnatcoll/static/gnatcoll-any_types.ali lib/gnatcoll/static/gnatcoll-arg_lists.ali +lib/gnatcoll/static/gnatcoll-atomic.ali lib/gnatcoll/static/gnatcoll-boyer_moore.ali lib/gnatcoll/static/gnatcoll-config.ali lib/gnatcoll/static/gnatcoll-email-mailboxes.ali @@ -252,9 +258,11 @@ lib/gnatcoll/static/gnatcoll-refcount-weakref.ali lib/gnatcoll/static/gnatcoll-refcount.ali lib/gnatcoll/static/gnatcoll-remote-db.ali lib/gnatcoll/static/gnatcoll-remote.ali -%%GTK%%lib/gnatcoll/static/gnatcoll-scripts-gtkada.ali +lib/gnatcoll/static/gnatcoll-scripts-files.ali +lib/gnatcoll/static/gnatcoll-scripts-gtkada.ali lib/gnatcoll/static/gnatcoll-scripts-impl.ali -%%GTK%%lib/gnatcoll/static/gnatcoll-scripts-python-gtkada.ali +lib/gnatcoll/static/gnatcoll-scripts-python-gtkada.ali +lib/gnatcoll/static/gnatcoll-scripts-projects.ali lib/gnatcoll/static/gnatcoll-scripts-python.ali lib/gnatcoll/static/gnatcoll-scripts-shell.ali lib/gnatcoll/static/gnatcoll-scripts-utils.ali @@ -270,7 +278,7 @@ lib/gnatcoll/static/gnatcoll-sql-postgres-builder.ali lib/gnatcoll/static/gnatcoll-sql-postgres.ali lib/gnatcoll/static/gnatcoll-sql-sessions.ali lib/gnatcoll/static/gnatcoll-sql-sqlite-builder.ali -%%SQLITE%%lib/gnatcoll/static/gnatcoll-sql-sqlite-gnade.ali +lib/gnatcoll/static/gnatcoll-sql-sqlite-gnade.ali lib/gnatcoll/static/gnatcoll-sql-sqlite.ali lib/gnatcoll/static/gnatcoll-sql.ali lib/gnatcoll/static/gnatcoll-sql_impl.ali @@ -283,7 +291,7 @@ lib/gnatcoll/static/gnatcoll-traces-syslog.ali lib/gnatcoll/static/gnatcoll-traces.ali lib/gnatcoll/static/gnatcoll-tribooleans.ali lib/gnatcoll/static/gnatcoll-utils.ali -%%GTK%%lib/gnatcoll/static/gnatcoll-vfs-gtkada.ali +lib/gnatcoll/static/gnatcoll-vfs-gtkada.ali lib/gnatcoll/static/gnatcoll-vfs.ali lib/gnatcoll/static/gnatcoll-vfs_types.ali lib/gnatcoll/static/gnatcoll-vfs_utils.ali @@ -293,7 +301,7 @@ lib/gnatcoll/static/gnatcoll-xref.ali lib/gnatcoll/static/gnatcoll.ali lib/gnatcoll/static/libgnatcoll.a lib/gnatcoll/static/libgnatcoll_gmp.a -%%GTK%%lib/gnatcoll/static/libgnatcoll_gtk.a +lib/gnatcoll/static/libgnatcoll_gtk.a lib/gnatcoll/static/libgnatcoll_iconv.a lib/gnatcoll/static/libgnatcoll_postgres.a lib/gnatcoll/static/libgnatcoll_python.a diff --git a/devel/gps/Makefile b/devel/gps/Makefile index 5e1de7402864..6621d94012b9 100644 --- a/devel/gps/Makefile +++ b/devel/gps/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= gps -PORTVERSION= 6.1.0.0 -PORTREVISION= 4 +PORTVERSION= 6.1.1.0 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ +DISTNAME= gps-6.1.1-src PKGNAMESUFFIX= -ide MAINTAINER= marino@FreeBSD.org @@ -16,22 +16,26 @@ LICENSE= GPLv3 BUILD_DEPENDS= gprbuild>=20140417:${PORTSDIR}/devel/gprbuild \ gnat_util>=20140422_2:${PORTSDIR}/lang/gnat_util \ xmlada>=4.4:${PORTSDIR}/textproc/xmlada \ + gnatcoll>=2015:${PORTSDIR}/devel/gnatcoll \ templates_parser>11:${PORTSDIR}/textproc/templates_parser -LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ - libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 -RUN_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 # See note +LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 +RUN_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ + gnatinspect::${PORTSDIR}/devel/gnatcoll \ + gdb${PORTGDB}:${PORTSDIR}/devel/gdb \ + ${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \ + ${PYTHON_PKGNAMEPREFIX}jedi>0:${PORTSDIR}/devel/py-jedi -GNU_CONFIGURE= yes -USES= ada gmake perl5 pkgconfig python tar:bzip2 -USE_PERL5= build -USE_GNOME= glib20 -USE_GNOME= pygobject3 -PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py -AWKREVDATE= '/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}' -GPSVER= GPS_VERSION=${PORTVERSION} -ALL_TARGET= default -NO_MTREE= yes -SUB_FILES= gps +GNU_CONFIGURE= yes +USES= ada:run gmake perl5 pkgconfig python +USE_PERL5= build +USE_GNOME= glib20 pygobject3 +PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py +AWKREVDATE= '/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}' +GPSVER= GPS_VERSION=${PORTVERSION} +ALL_TARGET= default +NO_MTREE= yes +SUB_FILES= gps +PORTGDB= 791 # note: librsvg2 is needed to display the svg icons in the menu. Actually # needed is lib/gdk-pixbuf-2.0/%%GTK2_VER%%/loaders/libpixbufloader-svg.so , @@ -39,23 +43,17 @@ SUB_FILES= gps # we just request the sole binary to pull in the package which effectively # accomplishes what is desired. -OPTIONS_DEFINE= READLINE SYSLOG PGSQL DEBUG DOCS EXAMPLES -OPTIONS_DEFAULT= READLINE SYSLOG +OPTIONS_DEFINE= DEBUG DOCS EXAMPLES OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx -SYSLOG_CONFIGURE_ENABLE=syslog CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL} CONFIGURE_ENV+= AWK=/usr/bin/awk -CONFIGURE_ARGS= --with-gmp=${PREFIX} \ - --with-gtk=3.0 \ - --with-sqlite=embedded \ - --with-python=${PREFIX} \ - --enable-pygobject \ - --disable-shared \ - --disable-pygtk +CONFIGURE_ARGS= --with-gtk=3.0 MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} MAKE_ARGS+= PYTHON_CMD=${PYTHON_CMD} +PORTDOCS= html pdf +PORTEXAMPLES= demo python remote tutorial xml .include @@ -67,29 +65,6 @@ MAKE_ARGS+= Build=Debug MAKE_ARGS+= Build=Production .endif -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline:port -CONFIGURE_ARGS+= --enable-gpl -.else -CONFIGURE_ARGS+= --disable-readline -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -CONFIGURE_ARGS+= --with-postgresql=${PREFIX} -.else -CONFIGURE_ARGS+= --without-postgresql -.endif - -# Iconv option crashes GPS almost immediately. -# GNATColl needs to be examined before attempting to support Iconv again -.if 0 #${PORT_OPTIONS: MICONV} -USES+= iconv -CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX} -.else -CONFIGURE_ARGS+= --without-iconv -.endif - post-extract: @${MV} ${WRKSRC}/templates_parser ${WRKSRC}/TP.ignore @${MV} ${WRKSRC}/Makefile.gnat ${WRKSRC}/Makefile.gnat.ignore @@ -97,31 +72,34 @@ post-extract: post-patch: @${ECHO} "GNAT_SOURCES=" > ${WRKSRC}/Makefile.gnat @${REINPLACE_CMD} -e 's/^with .*templates_parser\//with "/g' \ - ${WRKSRC}/docgen2/docgen2.gpr \ ${WRKSRC}/gnatdoc/gnatdoc.gpr \ ${WRKSRC}/vcs/vcs.gpr @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \ - ${WRKSRC}/gnatlib/src/gnatcoll_readline.gpr.in \ ${WRKSRC}/widgets/widgets.gpr - @${REINPLACE_CMD} -e 's| gnat/sdefault/sdefault.adb | |' \ - -e 's;freebsd;freebsd*|*-dragonfly;g' \ - ${WRKSRC}/gnatlib/configure \ - ${WRKSRC}/gnatlib/configure.in - @${REINPLACE_CMD} -e 's|gnatlib/gnat_src|distrib|' \ - ${WRKSRC}/distrib/from_impunit.pl + #@${REINPLACE_CMD} -e 's|gnatlib/gnat_src|distrib|' \ + # ${WRKSRC}/distrib/from_impunit.pl @${REINPLACE_CMD} -e 's|, "-fdump-xref"||g' \ - ${WRKSRC}/gnatlib/gnatcoll_shared.gpr.in \ ${WRKSRC}/shared.gpr - @${REINPLACE_CMD} -e "s|GPS_VERSION=.*|${GPSVER}|" \ - ${WRKSRC}/configure - @${AWK} ${AWKREVDATE} ${WRKSRC}/REVISION | ${XARGS} -I sub \ - ${SED} -i.bak -e sub ${WRKSRC}/common/core/src/config.ads.in + #@${REINPLACE_CMD} -e "s|GPS_VERSION=.*|${GPSVER}|" \ + # ${WRKSRC}/configure + #@${AWK} ${AWKREVDATE} ${WRKSRC}/REVISION | ${XARGS} -I sub \ + # ${SED} -i.bak -e sub ${WRKSRC}/common/core/src/config.ads.in @${SED} -i '' -e \ 's|= "gnat"|= "${LOCALBASE}/${ADAXX}-aux/bin/gnat"|' \ ${WRKSRC}/share/support/core/gps_utils/gnat_rules.py - @${REINPLACE_CMD} -e \ - 's|@UTILSHARE@|${LOCALBASE}/share/gnat_util|' \ - ${WRKSRC}/Makefile.in + #@${REINPLACE_CMD} -e 's|@UTILSHARE@|${LOCALBASE}/share/gnat_util|' \ + # ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/gnatcoll_tools/d' ${WRKSRC}/gps/gps.gpr + @${REINPLACE_CMD} -e 's|../gnatlib/src/||' \ + ${WRKSRC}/common/comm* \ + ${WRKSRC}/spark/spark.gpr \ + ${WRKSRC}/kernel/kern*.gpr \ + ${WRKSRC}/language/language.gpr \ + ${WRKSRC}/vsearch/vsearch.gpr \ + ${WRKSRC}/python/py*.gpr + @${REINPLACE_CMD} -e '/Gdb_Command/ s|"gdb"|"gdb${PORTGDB}"|' \ + ${WRKSRC}/gvd/src/debugger-gdb_mi.adb \ + ${WRKSRC}/gvd/src/debugger-gdb.adb do-build: @${CP} ${PREFIX}/include/gnat_util/impunit.* ${WRKSRC}/distrib @@ -133,13 +111,10 @@ do-build: ${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library post-install: - ${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/users_guide/_sources - ${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources + ${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/*/_sources ${INSTALL_SCRIPT} ${WRKDIR}/gps ${STAGEDIR}${PREFIX}/bin echo "This is the GPS GPL Edition for the ${OPSYS} Ports Collection." \ > ${STAGEDIR}${PREFIX}/share/gps/about.txt ${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete - @(cd ${STAGEDIR}${PREFIX} ; \ - ${FIND} * \( -type f -or -type l \) | ${SORT} >> ${TMPPLIST}) .include diff --git a/devel/gps/distinfo b/devel/gps/distinfo index 5ea65a7fae3b..37e679b4195d 100644 --- a/devel/gps/distinfo +++ b/devel/gps/distinfo @@ -1,2 +1,2 @@ -SHA256 (gps-6.1.0.0.tar.bz2) = f930d89a5b69ff8a4562832b5f2902322ad002ef17633556d87f51733ef955c0 -SIZE (gps-6.1.0.0.tar.bz2) = 12034437 +SHA256 (gps-6.1.1-src.tar.gz) = 14ddd84b0e79cc4b426dc314e37e8cf66ea1c48930cdd0c06d171b6094eb325d +SIZE (gps-6.1.1-src.tar.gz) = 28924922 diff --git a/devel/gps/files/patch-Makefile.in b/devel/gps/files/patch-Makefile.in index c538b0ef83d4..c9e004806dcd 100644 --- a/devel/gps/files/patch-Makefile.in +++ b/devel/gps/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2014-05-23 17:24:28 UTC +--- Makefile.in.orig 2014-11-13 18:15:57 UTC +++ Makefile.in @@ -3,16 +3,15 @@ MV = mv MKDIR = mkdir -p @@ -24,24 +24,28 @@ all default: $(MAKE) -C gps default -@@ -49,16 +48,6 @@ ifeq ($(OS),Windows_NT) +@@ -49,20 +48,6 @@ ifeq ($(OS),Windows_NT) share/plug-ins/_subversion_ \ > share/plug-ins/subversion_native_windows.py endif - $(RM) -f $(sharedir)/gps/GPS_old - $(RM) $(sharedir)/gps/library/*.py +- $(RM) $(sharedir)/gps/library/*.pyc - $(RM) $(sharedir)/gps/library/*.xml - $(RM) $(sharedir)/gps/plug-ins/*.py +- $(RM) $(sharedir)/gps/plug-ins/*.pyc - $(RM) $(sharedir)/gps/plug-ins/*.xml - $(RM) -r $(sharedir)/gps/plug-ins/spark - $(RM) $(sharedir)/gps/support/core/*.py +- $(RM) $(sharedir)/gps/support/core/*.pyc - $(RM) $(sharedir)/gps/support/ui/*.py +- $(RM) $(sharedir)/gps/support/ui/*.pyc - ${RM} ${sharedir}/gps/perspectives.xml - $(RMDIR) $(sharedir)/gps/templates # update runtime.xml before copying the plug-ins files. - (cd distrib; $(PERL) from_impunit.pl) + cd distrib; $(PERL) from_impunit.pl # update light icon set -@@ -71,12 +60,11 @@ ifeq ($(OS),Windows_NT) +@@ -75,10 +60,8 @@ ifeq ($(OS),Windows_NT) $(MV) share/plug-ins/_subversion_ share/plug-ins/subversion.py $(RM) share/plug-ins/subversion_native_windows.py endif @@ -50,13 +54,9 @@ (cd share; tar cf - library/*.py) | (cd $(sharedir)/gps; tar xf -) - (cd share; tar cf - library/GPS_old/*.py) | (cd $(sharedir)/gps; tar xf -) (cd share; tar cf - support/) | (cd $(sharedir)/gps; tar xf -) -- $(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > $(sharedir)/gps/support/core/gnat_switches.py -+ $(AWK) -f distrib/gnat_switches.awk < @UTILSHARE@/gnat_ugn.texi \ -+ > $(sharedir)/gps/support/core/gnat_switches.py + -$(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > $(sharedir)/gps/support/core/gnat_switches.py $(RM) $(sharedir)/gps/plug-ins/emacs.xml - $(RM) $(sharedir)/gps/plug-ins/python_doc.py - $(RM) $(sharedir)/gps/plug-ins/python_doc.pyc -@@ -103,7 +91,7 @@ ifeq ($(OS),Windows_NT) +@@ -108,11 +91,10 @@ ifeq ($(OS),Windows_NT) $(INSTALL_PROGRAM) gnatlib/src/obj/gnatinspect.exe $(bindir) $(MAKE) -C common/expect install else @@ -65,3 +65,7 @@ $(INSTALL_PROGRAM) cli/obj/gnatdoc $(bindir) $(INSTALL_PROGRAM) cli/obj/gps_cli $(bindir) $(INSTALL_PROGRAM) spark/obj/gnatspark $(bindir) +- $(INSTALL_PROGRAM) gnatlib/src/obj/gnatinspect $(bindir) + endif + + install-strip: install-common diff --git a/devel/gps/files/patch-browsers_src_browsers-scripts.adb b/devel/gps/files/patch-browsers_src_browsers-scripts.adb deleted file mode 100644 index 90bb48862b83..000000000000 --- a/devel/gps/files/patch-browsers_src_browsers-scripts.adb +++ /dev/null @@ -1,133 +0,0 @@ ---- browsers/src/browsers-scripts.adb.orig 2014-05-23 17:24:28.000000000 +0000 -+++ browsers/src/browsers-scripts.adb -@@ -70,27 +70,27 @@ package body Browsers.Scripts is - P_Font_Color : constant := 10; - P_Font_LS : constant := 11; - P_Font_Halign : constant := 12; -- P_Font_Valign : constant := 13; -- P_Arrow_From_Head : constant := 14; -- P_Arrow_From_Length : constant := 15; -- P_Arrow_From_Angle : constant := 16; -- P_Arrow_From_Stroke : constant := 17; -- P_Arrow_From_Fill : constant := 18; -- P_Arrow_From_Width : constant := 19; -- P_Arrow_To_Head : constant := 20; -- P_Arrow_To_Length : constant := 21; -- P_Arrow_To_Angle : constant := 22; -- P_Arrow_To_Stroke : constant := 23; -- P_Arrow_To_Fill : constant := 24; -- P_Arrow_To_Width : constant := 25; -- P_Symbol_From_Name : constant := 26; -- P_Symbol_From_Stroke : constant := 27; -- P_Symbol_From_Dist : constant := 28; -- P_Symbol_From_Width : constant := 29; -- P_Symbol_To_Name : constant := 30; -- P_Symbol_To_Stroke : constant := 31; -- P_Symbol_To_Dist : constant := 32; -- P_Symbol_To_Width : constant := 33; -+ P_Arrow_From_Head : constant := 13; -+ P_Arrow_From_Length : constant := 14; -+ P_Arrow_From_Angle : constant := 15; -+ P_Arrow_From_Stroke : constant := 16; -+ P_Arrow_From_Fill : constant := 17; -+ P_Arrow_From_Width : constant := 18; -+ P_Arrow_To_Head : constant := 19; -+ P_Arrow_To_Length : constant := 20; -+ P_Arrow_To_Angle : constant := 21; -+ P_Arrow_To_Stroke : constant := 22; -+ P_Arrow_To_Fill : constant := 23; -+ P_Arrow_To_Width : constant := 24; -+ P_Symbol_From_Name : constant := 25; -+ P_Symbol_From_Stroke : constant := 26; -+ P_Symbol_From_Dist : constant := 27; -+ P_Symbol_From_Width : constant := 28; -+ P_Symbol_To_Name : constant := 29; -+ P_Symbol_To_Stroke : constant := 30; -+ P_Symbol_To_Dist : constant := 31; -+ P_Symbol_To_Width : constant := 32; -+ P_Shadow_Color : constant := 33; - -- All the parameters to GPS.Browsers.Style.__init__ - - PA_Item : constant := 2; -@@ -1123,6 +1123,7 @@ package body Browsers.Scripts is - M : Margins := No_Margins; - Item : Container_Item; - X, Y : Gdouble := Gdouble'First; -+ AnchorX, AnchorY : Gdouble; - Pos : Gtkada.Style.Point; - begin - if Command = Constructor_Method then -@@ -1139,7 +1140,20 @@ package body Browsers.Scripts is - Y := Gdouble (Nth_Arg (Data, 3, Float'First)); - end if; - -- Canvas_Item (Get_Item (Inst)).Set_Position ((X, Y)); -+ AnchorX := Gdouble (Nth_Arg (Data, 4, 0.0)); -+ AnchorY := Gdouble (Nth_Arg (Data, 5, 0.0)); -+ -+ Container_Item (Get_Item (Inst)).Set_Position -+ ((X, Y), Anchor_X => AnchorX, Anchor_Y => AnchorY); -+ -+ elsif Command = "parent" then -+ Inst := Nth_Arg (Data, 1); -+ if Get_Item (Inst).Parent /= null then -+ Set_Return_Value -+ (Data, -+ Get_Instance (Python_Item_Access (Get_Item (Inst).Parent), -+ Get_Script (Data))); -+ end if; - - elsif Command = "x" then - Inst := Nth_Arg (Data, 1); -@@ -1383,9 +1397,10 @@ package body Browsers.Scripts is - Line_Spacing => Gint (Nth_Arg (Data, P_Font_LS, 0)), - Halign => Alignment'Val - (Integer'(Nth_Arg (Data, P_Font_Halign, -- Alignment'Pos (Pango_Align_Left)))), -- Valign => Gdouble (Nth_Arg (Data, P_Font_Valign, 0.0)) -- ), -+ Alignment'Pos (Pango_Align_Left))))), -+ Shadow => -+ (Color => Color_From_Param (P_Shadow_Color, Null_RGBA), -+ others => <>), - Arrow_From => - (Head => Arrow_Head'Val - (Nth_Arg (Data, P_Arrow_From_Head, Arrow_Head'Pos (None))), -@@ -1713,7 +1728,6 @@ package body Browsers.Scripts is - P_Font_Color => Param ("fontColor", True), - P_Font_LS => Param ("fontLineSpacing", True), - P_Font_Halign => Param ("fontHalign", True), -- P_Font_Valign => Param ("fontValign", True), - P_Arrow_From_Head => Param ("arrowFrom", True), - P_Arrow_From_Length => Param ("arrowFromLength", True), - P_Arrow_From_Angle => Param ("arrowFromAngle", True), -@@ -1733,7 +1747,8 @@ package body Browsers.Scripts is - P_Symbol_To_Name => Param ("symbolTo", True), - P_Symbol_To_Stroke => Param ("symbolToStroke", True), - P_Symbol_To_Dist => Param ("symbolToDist", True), -- P_Symbol_To_Width => Param ("symbolToWidth", True)), -+ P_Symbol_To_Width => Param ("symbolToWidth", True), -+ P_Shadow_Color => Param ("shadowColor", True)), - Class => Style_Class, - Handler => Style_Handler'Access); - -@@ -1904,11 +1919,18 @@ package body Browsers.Scripts is - (Kernel.Scripts, - "set_position", - Params => (Param ("x", Optional => True), -- Param ("y", Optional => True)), -+ Param ("y", Optional => True), -+ Param ("anchorx", Optional => True), -+ Param ("anchory", Optional => True)), - Class => Module.Item_Class, - Handler => Item_Handler'Access); - Register_Property - (Kernel.Scripts, -+ "parent", -+ Class => Module.Item_Class, -+ Getter => Item_Handler'Access); -+ Register_Property -+ (Kernel.Scripts, - "x", - Class => Module.Item_Class, - Getter => Item_Handler'Access); diff --git a/devel/gps/files/patch-common_core_src_os-utils.c b/devel/gps/files/patch-common_core_src_os-utils.c new file mode 100644 index 000000000000..5722a8090751 --- /dev/null +++ b/devel/gps/files/patch-common_core_src_os-utils.c @@ -0,0 +1,19 @@ +--- common/core/src/os-utils.c.orig 2014-11-13 18:15:57 UTC ++++ common/core/src/os-utils.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #ifdef _WIN32 + #include + #include +@@ -32,7 +33,7 @@ + #endif + + int +-__gps_subdirectories_count (name) ++__gps_subdirectories_count (char *name) + { + struct stat statbuf; + int ret; diff --git a/devel/gps/files/patch-common_tty_terminals.c b/devel/gps/files/patch-common_tty_terminals.c deleted file mode 100644 index 5588a61c0bda..000000000000 --- a/devel/gps/files/patch-common_tty_terminals.c +++ /dev/null @@ -1,12 +0,0 @@ ---- common/tty/terminals.c.orig 2011-09-21 06:29:53.000000000 +0000 -+++ common/tty/terminals.c -@@ -236,7 +236,9 @@ allocate_pty_desc (pty_desc **desc) { - #ifndef NLDLY - #define NLDLY 0 - #define CRDLY 0 -+#ifndef TABDLY - #define TABDLY 0 -+#endif - #define BSDLY 0 - #define VTDLY 0 - #define FFDLY 0 diff --git a/devel/gps/files/patch-docs_Makefile.in b/devel/gps/files/patch-docs_Makefile.in index 64c44b5d574f..97c771799b8b 100644 --- a/devel/gps/files/patch-docs_Makefile.in +++ b/devel/gps/files/patch-docs_Makefile.in @@ -1,4 +1,4 @@ ---- docs/Makefile.in.orig 2014-05-23 09:12:23 UTC +--- docs/Makefile.in.orig 2014-11-13 18:15:57 UTC +++ docs/Makefile.in @@ -1,10 +1,9 @@ prefix = @prefix@ diff --git a/devel/gps/files/patch-gnatlib_src_gnatcoll__iconv.gpr b/devel/gps/files/patch-gnatlib_src_gnatcoll__iconv.gpr deleted file mode 100644 index 5548af139538..000000000000 --- a/devel/gps/files/patch-gnatlib_src_gnatcoll__iconv.gpr +++ /dev/null @@ -1,12 +0,0 @@ ---- gnatlib/src/gnatcoll_iconv.gpr.orig 2014-04-10 13:47:58.000000000 +0000 -+++ gnatlib/src/gnatcoll_iconv.gpr -@@ -27,7 +27,8 @@ project GnatColl_Iconv is - package Compiler is - for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada"); - for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C") -- & GnatColl_Shared.Iconv_Include; -+ & ("-nostdinc") & GnatColl_Shared.Iconv_Include -+ & ("-I/usr/include"); - end Compiler; - - package Builder renames GnatColl_Shared.Builder; diff --git a/devel/gps/files/patch-gnatlib_src_gnatcoll__readline.gpr.in b/devel/gps/files/patch-gnatlib_src_gnatcoll__readline.gpr.in deleted file mode 100644 index f8566f3604b0..000000000000 --- a/devel/gps/files/patch-gnatlib_src_gnatcoll__readline.gpr.in +++ /dev/null @@ -1,21 +0,0 @@ ---- gnatlib/src/gnatcoll_readline.gpr.in.orig 2014-04-10 13:47:58.000000000 +0000 -+++ gnatlib/src/gnatcoll_readline.gpr.in -@@ -6,7 +6,7 @@ project GnatColl_Readline is - when "yes" => - for Languages use ("Ada"); - for Source_Dirs use ("readline", "readline/with_readline"); -- for Library_Options use ("-lreadline"); -+ for Library_Options use ("-L@PREFIX@/lib", "-lreadline"); - when "no" => - for Source_Dirs use ("readline", "readline/no_readline"); - end case; -@@ -26,7 +26,8 @@ project GnatColl_Readline is - package Linker is - -- When linking an executable - case Gnatcoll_Shared.Readline is -- when "yes" => for Linker_Options use ("-lreadline"); -+ when "yes" => for Linker_Options use ("-rpath=@PREFIX@/lib", -+ "-L@PREFIX@/lib", "-lreadline"); - when "no" => null; - end case; - end Linker; diff --git a/devel/gps/files/patch-gnatlib_src_iconv_with__iconv_iconv__support.c b/devel/gps/files/patch-gnatlib_src_iconv_with__iconv_iconv__support.c deleted file mode 100644 index 13f7a686a2cc..000000000000 --- a/devel/gps/files/patch-gnatlib_src_iconv_with__iconv_iconv__support.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gnatlib/src/iconv/with_iconv/iconv_support.c.orig 2013-08-21 12:16:12.000000000 +0000 -+++ gnatlib/src/iconv/with_iconv/iconv_support.c -@@ -25,7 +25,7 @@ int gnatcoll_iconv_close(iconv_t cd) { - return iconv_close (cd); - } - --#if _LIBICONV_VERSION >= 0x010D -+#if defined (__FreeBSD__) || defined (__DragonFly__) - size_t gnatcoll_iconv - (iconv_t cd, const char** inbuf, size_t *inbytesleft, char** outbuf, - size_t *outbytesleft) diff --git a/devel/gps/files/patch-gps_Makefile b/devel/gps/files/patch-gps_Makefile new file mode 100644 index 000000000000..8529a4f5323e --- /dev/null +++ b/devel/gps/files/patch-gps_Makefile @@ -0,0 +1,22 @@ +--- gps/Makefile.orig 2014-11-13 18:15:57 UTC ++++ gps/Makefile +@@ -10,9 +10,9 @@ GPRBUILD_FLAGS= + Build?=Debug + + ifeq ($(Build),Production) +- GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Production -XGnatcoll_Build=Production ++ GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Production + else +- GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Debug -XGnatcoll_Build=Debug ++ GPRBUILD_BUILD_TYPE_FLAGS=-XBuild=Debug + endif + + .PHONY: default resources do_links all clean +@@ -27,7 +27,6 @@ include ../Makefile.gnat + # NOTE: we need to build gnatcoll separately, since we cannot use + # gnat.adc (No_Tasking restriction) on all gnatcoll sources. + all: resources do_links +- $(MAKE) Gnatcoll_Build=${Build} -C ../gnatlib + $(GPRBUILD) $(GPRBUILD_FLAGS) -m -ws -P../spark/spark + $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \ + $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` diff --git a/devel/gps/files/patch-shared.gpr b/devel/gps/files/patch-shared.gpr new file mode 100644 index 000000000000..4c283b59f1c8 --- /dev/null +++ b/devel/gps/files/patch-shared.gpr @@ -0,0 +1,47 @@ +--- shared.gpr.orig 2015-01-19 12:21:19 UTC ++++ shared.gpr +@@ -1,4 +1,6 @@ +-with "gnatlib/gnatcoll_shared"; ++with "gnatcoll_iconv"; ++with "gnatcoll_gtk"; ++with "gnatcoll_python"; + + project Shared is + +@@ -9,8 +11,7 @@ project Shared is + Build : Build_Type := External ("Build", "Production"); + + for Source_Dirs use (); +- for Object_Dir use Gnatcoll_Shared'Object_Dir; +- for Library_Dir use Gnatcoll_Shared'Library_Dir; ++ for Object_Dir use "obj"; + + type VCS_Type is ("Subversion", "Git", "Auto"); + VCS_Kind : VCS_Type := External ("PRJ_VCS", "Subversion"); +@@ -34,7 +35,7 @@ project Shared is + "-gnatwaCJe", "-gnat2012", "-gnateE"); + + for Default_Switches ("C") use +- ("-g", "-O1", "-fdump-xref") & GnatColl_Shared.Gtk_Include; ++ ("-g", "-O1"); + + when "Production" => + for Default_Switches ("Ada") use +@@ -42,7 +43,7 @@ project Shared is + "-gnatT3", -- Temporary, L403-023. + "-gnatws", "-gnat12"); + for Default_Switches ("C") use +- ("-g", "-O2") & GnatColl_Shared.Gtk_Include; ++ ("-g", "-O2"); + end case; + end Compiler; + +@@ -51,7 +52,7 @@ project Shared is + end Binder; + + package Linker is +- for Default_Switches ("Ada") use Gnatcoll_Shared.System_Linker_Flags; ++ for Default_Switches ("Ada") use (); + end Linker; + + end Shared; diff --git a/devel/gps/files/patch-widgets_widgets.gpr b/devel/gps/files/patch-widgets_widgets.gpr index 24304aa3a5d6..a7000cf6bb57 100644 --- a/devel/gps/files/patch-widgets_widgets.gpr +++ b/devel/gps/files/patch-widgets_widgets.gpr @@ -1,4 +1,4 @@ ---- widgets/widgets.gpr.orig 2013-03-05 14:31:25.000000000 +0000 +--- widgets/widgets.gpr.orig 2014-11-13 18:15:57 UTC +++ widgets/widgets.gpr @@ -5,7 +5,10 @@ with "../shared"; project Widgets is @@ -8,7 +8,7 @@ + for Source_Dirs use ("src", "@PREFIX@/include/gtk-3.0", + "@PREFIX@/include/glib-2.0", "@PREFIX@/include/pango-1.0", + "@PREFIX@/include/cairo", "@PREFIX@/include/gdk-pixbuf-2.0", -+ "@PREFIX@/include/atk-1.0"); ++ "@PREFIX@/include/atk-1.0", "@PREFIX@/lib/glib-2.0/include"); for Object_Dir use Shared'Object_Dir; package Compiler renames Shared.Compiler; diff --git a/devel/gps/pkg-plist b/devel/gps/pkg-plist new file mode 100644 index 000000000000..710e1ead27b5 --- /dev/null +++ b/devel/gps/pkg-plist @@ -0,0 +1,641 @@ +bin/gnatdoc +bin/gnatspark +bin/gps +bin/gps_cli +bin/gps_exe +share/gps/about.txt +share/gps/activity_log.tmplt +share/gps/default.gpr +share/gps/gnatdoc/html/compile.sh +share/gps/gnatdoc/html/static/blank.html +share/gps/gnatdoc/html/static/gnatdoc.css +share/gps/gnatdoc/html/static/gnatdoc.js +share/gps/gnatdoc/html/static/index.html +share/gps/gnatdoc/html/static/inheritance_index.html +share/gps/gnatdoc/html/templates/documentation.html.tmpl +share/gps/gnatdoc/html/templates/documentation.js.tmpl +share/gps/gnatdoc/html/templates/documentation_index.js.tmpl +share/gps/gnatdoc/html/templates/entities_categories_index.js.tmpl +share/gps/gnatdoc/html/templates/entities_category.html.tmpl +share/gps/gnatdoc/html/templates/entities_category.js.tmpl +share/gps/gnatdoc/html/templates/index.js.tmpl +share/gps/gnatdoc/html/templates/inheritance_index.js.tmpl +share/gps/gnatdoc/html/templates/source_file.html.tmpl +share/gps/gnatdoc/html/templates/source_file.js.tmpl +share/gps/gnatdoc/html/templates/source_file_index.js.tmpl +share/gps/gnatdoc/simple/entities.tmpl +share/gps/gnatdoc/simple/files_index.tmpl +share/gps/gnatdoc/simple/index.tmpl +share/gps/gnatdoc/simple/prj_index.tmpl +share/gps/gnatdoc/simple/src.tmpl +share/gps/gnatdoc/simple/support/Makefile +share/gps/gnatdoc/simple/support/conf.py +share/gps/gnatdoc/simple/support/make.bat +share/gps/gps-Adwaita (Dark).css +share/gps/gps-Adwaita.css +share/gps/gps-gtk-win32-xp.css +share/gps/gps-gtk-win32.css +share/gps/gps-splash.png +share/gps/gps.css +share/gps/icons/dark/16px/box.png +share/gps/icons/dark/16px/build_main_16.png +share/gps/icons/dark/16px/cleanup_16.png +share/gps/icons/dark/16px/clear_entry_16.png +share/gps/icons/dark/16px/compile_16.png +share/gps/icons/dark/16px/compute_xref_16.png +share/gps/icons/dark/16px/custom_build_16.png +share/gps/icons/dark/16px/debug_break.png +share/gps/icons/dark/16px/debug_indicator.png +share/gps/icons/dark/16px/entities/circle.png +share/gps/icons/dark/16px/entities/circle_p.png +share/gps/icons/dark/16px/entities/circle_ps.png +share/gps/icons/dark/16px/entities/circle_s.png +share/gps/icons/dark/16px/entities/circle_x.png +share/gps/icons/dark/16px/entities/circle_xs.png +share/gps/icons/dark/16px/entities/diamond.png +share/gps/icons/dark/16px/entities/diamond_p.png +share/gps/icons/dark/16px/entities/diamond_ps.png +share/gps/icons/dark/16px/entities/diamond_s.png +share/gps/icons/dark/16px/entities/diamond_x.png +share/gps/icons/dark/16px/entities/diamond_x_blue.png +share/gps/icons/dark/16px/entities/diamond_xs.png +share/gps/icons/dark/16px/entities/dot.png +share/gps/icons/dark/16px/entities/dot_p.png +share/gps/icons/dark/16px/entities/dot_ps.png +share/gps/icons/dark/16px/entities/dot_s.png +share/gps/icons/dark/16px/entities/dot_x.png +share/gps/icons/dark/16px/entities/dot_xs.png +share/gps/icons/dark/16px/entities/square.png +share/gps/icons/dark/16px/entities/square_p.png +share/gps/icons/dark/16px/entities/square_ps.png +share/gps/icons/dark/16px/entities/square_s.png +share/gps/icons/dark/16px/entities/square_x.png +share/gps/icons/dark/16px/entities/square_xs.png +share/gps/icons/dark/16px/entities/triangle.png +share/gps/icons/dark/16px/entities/triangle_p.png +share/gps/icons/dark/16px/entities/triangle_ps.png +share/gps/icons/dark/16px/entities/triangle_s.png +share/gps/icons/dark/16px/entities/triangle_x.png +share/gps/icons/dark/16px/entities/triangle_xs.png +share/gps/icons/dark/16px/error.png +share/gps/icons/dark/16px/file.png +share/gps/icons/dark/16px/file_altered.png +share/gps/icons/dark/16px/file_error.png +share/gps/icons/dark/16px/file_pencil.png +share/gps/icons/dark/16px/file_warning.png +share/gps/icons/dark/16px/finish_16.png +share/gps/icons/dark/16px/folder_closed.png +share/gps/icons/dark/16px/folder_e_closed.png +share/gps/icons/dark/16px/folder_e_open.png +share/gps/icons/dark/16px/folder_o_closed.png +share/gps/icons/dark/16px/folder_o_open.png +share/gps/icons/dark/16px/folder_open.png +share/gps/icons/dark/16px/gps_16.png +share/gps/icons/dark/16px/negate.png +share/gps/icons/dark/16px/newfile_16.png +share/gps/icons/dark/16px/newfile_b_16.png +share/gps/icons/dark/16px/next_16.png +share/gps/icons/dark/16px/play_16.png +share/gps/icons/dark/16px/project_box.png +share/gps/icons/dark/16px/project_box_altered.png +share/gps/icons/dark/16px/project_box_error.png +share/gps/icons/dark/16px/project_box_open.png +share/gps/icons/dark/16px/project_box_open_altered.png +share/gps/icons/dark/16px/project_box_pencil.png +share/gps/icons/dark/16px/project_box_warning.png +share/gps/icons/dark/16px/project_root_box.png +share/gps/icons/dark/16px/project_runtime.png +share/gps/icons/dark/16px/regexp.png +share/gps/icons/dark/16px/semantic_check_16.png +share/gps/icons/dark/16px/stack_down_16.png +share/gps/icons/dark/16px/stack_up_16.png +share/gps/icons/dark/16px/step_16.png +share/gps/icons/dark/16px/stop_16.png +share/gps/icons/dark/16px/sync_to_local.png +share/gps/icons/dark/16px/sync_to_remote.png +share/gps/icons/dark/16px/syntax_check_16.png +share/gps/icons/dark/16px/warning.png +share/gps/icons/dark/18px/build_main_18.png +share/gps/icons/dark/18px/cleanup_18.png +share/gps/icons/dark/18px/compile_18.png +share/gps/icons/dark/18px/compute_xref_18.png +share/gps/icons/dark/18px/custom_build_18.png +share/gps/icons/dark/18px/finish_18.png +share/gps/icons/dark/18px/newfile_18.png +share/gps/icons/dark/18px/next_18.png +share/gps/icons/dark/18px/play_18.png +share/gps/icons/dark/18px/semantic_check_18.png +share/gps/icons/dark/18px/stack_down_18.png +share/gps/icons/dark/18px/stack_up_18.png +share/gps/icons/dark/18px/step_18.png +share/gps/icons/dark/18px/stop_18.png +share/gps/icons/dark/18px/syntax_check_18.png +share/gps/icons/dark/20px/vcs-added.png +share/gps/icons/dark/20px/vcs-has-conflicts.png +share/gps/icons/dark/20px/vcs-modified.png +share/gps/icons/dark/20px/vcs-needs-merge.png +share/gps/icons/dark/20px/vcs-needs-update.png +share/gps/icons/dark/20px/vcs-not-registered.png +share/gps/icons/dark/20px/vcs-removed.png +share/gps/icons/dark/20px/vcs-unknown.png +share/gps/icons/dark/20px/vcs-up-to-date.png +share/gps/icons/dark/24px/build_main_24.png +share/gps/icons/dark/24px/cleanup_24.png +share/gps/icons/dark/24px/compile_24.png +share/gps/icons/dark/24px/compute_xref_24.png +share/gps/icons/dark/24px/custom_build_24.png +share/gps/icons/dark/24px/finish_24.png +share/gps/icons/dark/24px/newfile_24.png +share/gps/icons/dark/24px/next_24.png +share/gps/icons/dark/24px/play_24.png +share/gps/icons/dark/24px/semantic_check_24.png +share/gps/icons/dark/24px/stack_down_24.png +share/gps/icons/dark/24px/stack_up_24.png +share/gps/icons/dark/24px/step_24.png +share/gps/icons/dark/24px/stop_24.png +share/gps/icons/dark/24px/syntax_check_24.png +share/gps/icons/dark/32px/gps_32.png +share/gps/icons/dark/48px/gps_48.png +share/gps/icons/dark/9px/build_error.png +share/gps/icons/dark/9px/build_error_fixable.png +share/gps/icons/dark/9px/build_style.png +share/gps/icons/dark/9px/build_style_fixable.png +share/gps/icons/dark/9px/build_warning.png +share/gps/icons/dark/9px/build_warning_fixable.png +share/gps/icons/dark/9px/collapse_12.png +share/gps/icons/dark/9px/executed_code.png +share/gps/icons/dark/9px/expand_12.png +share/gps/icons/dark/9px/line_has_code.png +share/gps/icons/dark/9px/line_might_have_code.png +share/gps/icons/dark/9px/non_executed_code.png +share/gps/icons/dark/9px/partially_covered_code.png +share/gps/icons/dark/9px/remove_unselected_12.png +share/gps/icons/dark/9px/toggle_links_12.png +share/gps/icons/dark/9px/wrench.png +share/gps/icons/dark/9px/wrench_multi.png +share/gps/icons/dark/other/adacore_logo.png +share/gps/icons/dark/other/button_guide.png +share/gps/icons/dark/other/button_guide_over.png +share/gps/icons/dark/other/button_overview.png +share/gps/icons/dark/other/button_overview_over.png +share/gps/icons/dark/other/button_tutorial.png +share/gps/icons/dark/other/button_tutorial_over.png +share/gps/icons/dark/other/get_started.png +share/gps/icons/dark/other/welcome_header.png +share/gps/icons/dark/svg/build.svg +share/gps/icons/dark/svg/buildall.svg +share/gps/icons/dark/svg/buildcustom.svg +share/gps/icons/dark/svg/buildmain.svg +share/gps/icons/dark/svg/circle.svg +share/gps/icons/dark/svg/circle_s.svg +share/gps/icons/dark/svg/circle_x.svg +share/gps/icons/dark/svg/circle_xs.svg +share/gps/icons/dark/svg/clean-12.svg +share/gps/icons/dark/svg/clean.svg +share/gps/icons/dark/svg/clear_entry.svg +share/gps/icons/dark/svg/close.svg +share/gps/icons/dark/svg/compile.svg +share/gps/icons/dark/svg/copy.svg +share/gps/icons/dark/svg/cut.svg +share/gps/icons/dark/svg/diamond.svg +share/gps/icons/dark/svg/diamond_s.svg +share/gps/icons/dark/svg/diamond_x.svg +share/gps/icons/dark/svg/diamond_x_blue.svg +share/gps/icons/dark/svg/diamond_xs.svg +share/gps/icons/dark/svg/document.svg +share/gps/icons/dark/svg/dot.svg +share/gps/icons/dark/svg/dot_s.svg +share/gps/icons/dark/svg/dot_x.svg +share/gps/icons/dark/svg/dot_xs.svg +share/gps/icons/dark/svg/double_arrow.svg +share/gps/icons/dark/svg/edit.svg +share/gps/icons/dark/svg/environment.svg +share/gps/icons/dark/svg/error.svg +share/gps/icons/dark/svg/folder-12.svg +share/gps/icons/dark/svg/folder.svg +share/gps/icons/dark/svg/gnatcheck.svg +share/gps/icons/dark/svg/gnatmetric.svg +share/gps/icons/dark/svg/gnatprove-path.svg +share/gps/icons/dark/svg/gnattest.svg +share/gps/icons/dark/svg/gps-fold-block.svg +share/gps/icons/dark/svg/gps-unfold-block.svg +share/gps/icons/dark/svg/info.svg +share/gps/icons/dark/svg/left.svg +share/gps/icons/dark/svg/lock-12.svg +share/gps/icons/dark/svg/lock.svg +share/gps/icons/dark/svg/menu-12.svg +share/gps/icons/dark/svg/menu.svg +share/gps/icons/dark/svg/messages.svg +share/gps/icons/dark/svg/minus.svg +share/gps/icons/dark/svg/newdocument.svg +share/gps/icons/dark/svg/paste.svg +share/gps/icons/dark/svg/plus.svg +share/gps/icons/dark/svg/power.svg +share/gps/icons/dark/svg/print.svg +share/gps/icons/dark/svg/project.svg +share/gps/icons/dark/svg/redo.svg +share/gps/icons/dark/svg/refresh.svg +share/gps/icons/dark/svg/right.svg +share/gps/icons/dark/svg/run.svg +share/gps/icons/dark/svg/run_blue.svg +share/gps/icons/dark/svg/run_blue_d.svg +share/gps/icons/dark/svg/run_green.svg +share/gps/icons/dark/svg/run_green_d.svg +share/gps/icons/dark/svg/save-12.svg +share/gps/icons/dark/svg/save.svg +share/gps/icons/dark/svg/search-and-menu.svg +share/gps/icons/dark/svg/search.svg +share/gps/icons/dark/svg/settings.svg +share/gps/icons/dark/svg/square.svg +share/gps/icons/dark/svg/square_s.svg +share/gps/icons/dark/svg/square_x.svg +share/gps/icons/dark/svg/square_xs.svg +share/gps/icons/dark/svg/triangle.svg +share/gps/icons/dark/svg/triangle_s.svg +share/gps/icons/dark/svg/triangle_x.svg +share/gps/icons/dark/svg/triangle_xs.svg +share/gps/icons/dark/svg/undo.svg +share/gps/icons/dark/svg/unlock-12.svg +share/gps/icons/dark/svg/unlock.svg +share/gps/icons/dark/svg/warning.svg +share/gps/icons/dark/svg/zip.svg +share/gps/icons/dark/svg/zoom.svg +share/gps/icons/dark/svg/zoomout.svg +share/gps/icons/light/svg/build.svg +share/gps/icons/light/svg/buildall.svg +share/gps/icons/light/svg/buildcustom.svg +share/gps/icons/light/svg/buildmain.svg +share/gps/icons/light/svg/circle.svg +share/gps/icons/light/svg/circle_s.svg +share/gps/icons/light/svg/circle_x.svg +share/gps/icons/light/svg/circle_xs.svg +share/gps/icons/light/svg/clean-12.svg +share/gps/icons/light/svg/clean.svg +share/gps/icons/light/svg/clear_entry.svg +share/gps/icons/light/svg/close.svg +share/gps/icons/light/svg/compile.svg +share/gps/icons/light/svg/copy.svg +share/gps/icons/light/svg/cut.svg +share/gps/icons/light/svg/diamond.svg +share/gps/icons/light/svg/diamond_s.svg +share/gps/icons/light/svg/diamond_x.svg +share/gps/icons/light/svg/diamond_x_blue.svg +share/gps/icons/light/svg/diamond_xs.svg +share/gps/icons/light/svg/document.svg +share/gps/icons/light/svg/dot.svg +share/gps/icons/light/svg/dot_s.svg +share/gps/icons/light/svg/dot_x.svg +share/gps/icons/light/svg/dot_xs.svg +share/gps/icons/light/svg/double_arrow.svg +share/gps/icons/light/svg/edit.svg +share/gps/icons/light/svg/environment.svg +share/gps/icons/light/svg/error.svg +share/gps/icons/light/svg/folder-12.svg +share/gps/icons/light/svg/folder.svg +share/gps/icons/light/svg/gnatcheck.svg +share/gps/icons/light/svg/gnatmetric.svg +share/gps/icons/light/svg/gnatprove-path.svg +share/gps/icons/light/svg/gnattest.svg +share/gps/icons/light/svg/gps-fold-block.svg +share/gps/icons/light/svg/gps-unfold-block.svg +share/gps/icons/light/svg/info.svg +share/gps/icons/light/svg/left.svg +share/gps/icons/light/svg/lock-12.svg +share/gps/icons/light/svg/lock.svg +share/gps/icons/light/svg/menu-12.svg +share/gps/icons/light/svg/menu.svg +share/gps/icons/light/svg/messages.svg +share/gps/icons/light/svg/minus.svg +share/gps/icons/light/svg/newdocument.svg +share/gps/icons/light/svg/paste.svg +share/gps/icons/light/svg/plus.svg +share/gps/icons/light/svg/power.svg +share/gps/icons/light/svg/print.svg +share/gps/icons/light/svg/project.svg +share/gps/icons/light/svg/redo.svg +share/gps/icons/light/svg/refresh.svg +share/gps/icons/light/svg/right.svg +share/gps/icons/light/svg/run.svg +share/gps/icons/light/svg/run_blue.svg +share/gps/icons/light/svg/run_blue_d.svg +share/gps/icons/light/svg/run_green.svg +share/gps/icons/light/svg/run_green_d.svg +share/gps/icons/light/svg/save-12.svg +share/gps/icons/light/svg/save.svg +share/gps/icons/light/svg/search-and-menu.svg +share/gps/icons/light/svg/search.svg +share/gps/icons/light/svg/settings.svg +share/gps/icons/light/svg/square.svg +share/gps/icons/light/svg/square_s.svg +share/gps/icons/light/svg/square_x.svg +share/gps/icons/light/svg/square_xs.svg +share/gps/icons/light/svg/triangle.svg +share/gps/icons/light/svg/triangle_s.svg +share/gps/icons/light/svg/triangle_x.svg +share/gps/icons/light/svg/triangle_xs.svg +share/gps/icons/light/svg/undo.svg +share/gps/icons/light/svg/unlock-12.svg +share/gps/icons/light/svg/unlock.svg +share/gps/icons/light/svg/warning.svg +share/gps/icons/light/svg/zip.svg +share/gps/icons/light/svg/zoom.svg +share/gps/icons/light/svg/zoomout.svg +share/gps/key_themes/default.xml +share/gps/key_themes/emacs.xml +share/gps/key_themes/include/common.xml +share/gps/library/addr2line.py +share/gps/library/auto_changelog.py +share/gps/library/autoformat.py +share/gps/library/autognatpp.py +share/gps/library/clang_support.py +share/gps/library/copy_paste.py +share/gps/library/copy_paste_toolbar.py +share/gps/library/cov_export.py +share/gps/library/create_missing_dirs.py +share/gps/library/createfile.py +share/gps/library/debugger.py +share/gps/library/dependencies.py +share/gps/library/eclipse.py +share/gps/library/emacs.py +share/gps/library/enter.py +share/gps/library/filedeps.py +share/gps/library/filepos.py +share/gps/library/first_subtype.py +share/gps/library/formatfile.py +share/gps/library/gnatfind.py +share/gps/library/gnatpp_switches.py +share/gps/library/gnatr.py +share/gps/library/ispell.py +share/gps/library/local_history.py +share/gps/library/occurrences.py +share/gps/library/open_file.py +share/gps/library/parasail.py +share/gps/library/ppc.py +share/gps/library/prevent_project_edition.py +share/gps/library/remote_rsh.py +share/gps/library/save_on_compile.py +share/gps/library/separate.py +share/gps/library/simple_project.py +share/gps/library/skeleton.py +share/gps/library/treemove.py +share/gps/library/unicode.py +share/gps/library/unused_entities.py +share/gps/library/vi.py +share/gps/library/vim.py +share/gps/menus.xml +share/gps/perspectives6.xml +share/gps/plug-ins/ada_support.py +share/gps/plug-ins/ada_support.pyc +share/gps/plug-ins/align.py +share/gps/plug-ins/align.pyc +share/gps/plug-ins/auto_highlight_occurrences.py +share/gps/plug-ins/auto_highlight_occurrences.pyc +share/gps/plug-ins/block_completion.py +share/gps/plug-ins/block_completion.pyc +share/gps/plug-ins/board_support.py +share/gps/plug-ins/board_support.pyc +share/gps/plug-ins/c_support.py +share/gps/plug-ins/c_support.pyc +share/gps/plug-ins/changelog.py +share/gps/plug-ins/changelog.pyc +share/gps/plug-ins/clearcase.py +share/gps/plug-ins/clearcase.pyc +share/gps/plug-ins/codepeer.py +share/gps/plug-ins/codepeer.pyc +share/gps/plug-ins/csharp.py +share/gps/plug-ins/csharp.pyc +share/gps/plug-ins/cvs.py +share/gps/plug-ins/cvs.pyc +share/gps/plug-ins/dispatching.py +share/gps/plug-ins/dispatching.pyc +share/gps/plug-ins/editors.py +share/gps/plug-ins/editors.pyc +share/gps/plug-ins/expanded_code.py +share/gps/plug-ins/expanded_code.pyc +share/gps/plug-ins/gcov.py +share/gps/plug-ins/gcov.pyc +share/gps/plug-ins/git.py +share/gps/plug-ins/git.pyc +share/gps/plug-ins/gnatcheck.py +share/gps/plug-ins/gnatcheck.pyc +share/gps/plug-ins/gnatcov.py +share/gps/plug-ins/gnatcov.pyc +share/gps/plug-ins/gnatdist.py +share/gps/plug-ins/gnatdist.pyc +share/gps/plug-ins/gnatdoc.py +share/gps/plug-ins/gnatdoc.pyc +share/gps/plug-ins/gnatname.py +share/gps/plug-ins/gnatname.pyc +share/gps/plug-ins/gnatpp.py +share/gps/plug-ins/gnatpp.pyc +share/gps/plug-ins/gnatpsta.py +share/gps/plug-ins/gnatpsta.pyc +share/gps/plug-ins/gnatstack.py +share/gps/plug-ins/gnatstack.pyc +share/gps/plug-ins/gnatstub.py +share/gps/plug-ins/gnatstub.pyc +share/gps/plug-ins/gnattest.py +share/gps/plug-ins/gnattest.pyc +share/gps/plug-ins/gpr.py +share/gps/plug-ins/gpr.pyc +share/gps/plug-ins/images/tip_all_occurrences.png +share/gps/plug-ins/images/tip_build_menu.png +share/gps/plug-ins/images/tip_insert_spaces_with_tab.png +share/gps/plug-ins/images/tip_jump_to_first_location.png +share/gps/plug-ins/images/tip_keyboard_macro.png +share/gps/plug-ins/images/tip_makefile_support.png +share/gps/plug-ins/images/tip_multi_language_builder.png +share/gps/plug-ins/images/tip_multiple_views.png +share/gps/plug-ins/images/tip_notebook_tabs_position.png +share/gps/plug-ins/images/tip_os_shell.png +share/gps/plug-ins/images/tip_task_manager.png +share/gps/plug-ins/isearch.py +share/gps/plug-ins/isearch.pyc +share/gps/plug-ins/jedi_support.py +share/gps/plug-ins/jedi_support.pyc +share/gps/plug-ins/listvars.py +share/gps/plug-ins/listvars.pyc +share/gps/plug-ins/makefile.py +share/gps/plug-ins/makefile.pyc +share/gps/plug-ins/matlab_support.py +share/gps/plug-ins/matlab_support.pyc +share/gps/plug-ins/mercurial.py +share/gps/plug-ins/mercurial.pyc +share/gps/plug-ins/methods.py +share/gps/plug-ins/methods.pyc +share/gps/plug-ins/modeling.py +share/gps/plug-ins/modeling.pyc +share/gps/plug-ins/pep8_integration.py +share/gps/plug-ins/pep8_integration.pyc +share/gps/plug-ins/pipe.py +share/gps/plug-ins/pipe.pyc +share/gps/plug-ins/python_support.py +share/gps/plug-ins/python_support.pyc +share/gps/plug-ins/rectangles.py +share/gps/plug-ins/rectangles.pyc +share/gps/plug-ins/shell.py +share/gps/plug-ins/shell.pyc +share/gps/plug-ins/sort_selection.py +share/gps/plug-ins/sort_selection.pyc +share/gps/plug-ins/spark.py +share/gps/plug-ins/spark.pyc +share/gps/plug-ins/spark2014.py +share/gps/plug-ins/spark2014.pyc +share/gps/plug-ins/subversion.py +share/gps/plug-ins/subversion.pyc +share/gps/plug-ins/tab.py +share/gps/plug-ins/tab.pyc +share/gps/plug-ins/tip_of_the_day.py +share/gps/plug-ins/tip_of_the_day.pyc +share/gps/plug-ins/url.py +share/gps/plug-ins/url.pyc +share/gps/plug-ins/xml_support.py +share/gps/plug-ins/xml_support.pyc +share/gps/plug-ins/zoom.py +share/gps/plug-ins/zoom.pyc +share/gps/predefined_ada.xml +share/gps/readonly.gpr +share/gps/show_coverage.xsl +share/gps/support/core/GPS_help.py +share/gps/support/core/GPS_old/__init__.py +share/gps/support/core/__init__.py +share/gps/support/core/aliases.py +share/gps/support/core/auto_load.py +share/gps/support/core/build.py +share/gps/support/core/color_utils.py +share/gps/support/core/completion.py +share/gps/support/core/console_utils.py +share/gps/support/core/constructs.py +share/gps/support/core/constructs.pyc +share/gps/support/core/cross_references.py +share/gps/support/core/customFiles.xsd +share/gps/support/core/extensions/__init__.py +share/gps/support/core/extensions/__init__.pyc +share/gps/support/core/extensions/private/__init__.py +share/gps/support/core/extensions/private/__init__.pyc +share/gps/support/core/extensions/private/xml.py +share/gps/support/core/extensions/private/xml.pyc +share/gps/support/core/gnat_switches.py +share/gps/support/core/gps_utils/__init__.py +share/gps/support/core/gps_utils/__init__.pyc +share/gps/support/core/gps_utils/console_process.py +share/gps/support/core/gps_utils/console_process.pyc +share/gps/support/core/gps_utils/gnat_rules.py +share/gps/support/core/gps_utils/gnatcheck_default.py +share/gps/support/core/gps_utils/gnatcheck_rules_editor.py +share/gps/support/core/gps_utils/highlighter.py +share/gps/support/core/gps_utils/highlighter.pyc +share/gps/support/core/gps_utils/promises.py +share/gps/support/core/gps_utils/switches.py +share/gps/support/core/gps_utils/workflow.py +share/gps/support/core/languages.py +share/gps/support/core/modules.py +share/gps/support/core/modules.pyc +share/gps/support/core/navigation_utils.py +share/gps/support/core/os_utils.py +share/gps/support/core/projects.py +share/gps/support/core/protocols.py +share/gps/support/core/protocols.py.in +share/gps/support/core/runtime.py +share/gps/support/core/search.py +share/gps/support/core/text_utils.py +share/gps/support/core/tool_output.py +share/gps/support/core/toolchains.py +share/gps/support/core/vcs.py +share/gps/support/ui/GPS_doc/Browsers.py +share/gps/support/ui/GPS_doc/Browsers.pyc +share/gps/support/ui/GPS_doc/__init__.py +share/gps/support/ui/GPS_doc/__init__.pyc +share/gps/support/ui/c_highlighter.py +share/gps/support/ui/colorschemes.py +share/gps/support/ui/colorschemes.pyc +share/gps/support/ui/console.py +share/gps/support/ui/gnatmetric.py +share/gps/support/ui/gpsbrowsers.py +share/gps/support/ui/highlighter/__init__.py +share/gps/support/ui/highlighter/__init__.pyc +share/gps/support/ui/highlighter/common.py +share/gps/support/ui/highlighter/common.pyc +share/gps/support/ui/highlighter/engine.py +share/gps/support/ui/highlighter/engine.pyc +share/gps/support/ui/highlighter/interface.py +share/gps/support/ui/highlighter/interface.pyc +share/gps/support/ui/icons.py +share/gps/support/ui/locations_view_utils.py +share/gps/support/ui/multi_cursors.py +share/gps/support/ui/pygps/__init__.py +share/gps/support/ui/pygps/__init__.pyc +share/gps/support/ui/pygps/notebook.py +share/gps/support/ui/pygps/project.py +share/gps/support/ui/pygps/tree.py +share/gps/support/ui/python_highlighter.py +share/gps/support/ui/reloadcss.py +share/gps/support/ui/task_manager.py +share/gps/templates/ajis_hello/@_project_name_@.gpr +share/gps/templates/ajis_hello/Makefile +share/gps/templates/ajis_hello/ajis_hello.gpt +share/gps/templates/ajis_hello/src_ada/hello.adb +share/gps/templates/ajis_hello/src_ada/hello.ads +share/gps/templates/ajis_hello/src_java/com/adacore/example/@_Main_Name_@.java +share/gps/templates/aws_simple_web_server/@_project_name_@.gpr +share/gps/templates/aws_simple_web_server/simple_web_server.gpt +share/gps/templates/aws_simple_web_server/src/@_project_name_@-callbacks.adb +share/gps/templates/aws_simple_web_server/src/@_project_name_@-callbacks.ads +share/gps/templates/aws_simple_web_server/src/@_project_name_@-main.adb +share/gps/templates/aws_simple_web_server/src/@_project_name_@.ads +share/gps/templates/aws_web_server/@_project_name_@.gpr +share/gps/templates/aws_web_server/css/style.css +share/gps/templates/aws_web_server/img/gps_logo.png +share/gps/templates/aws_web_server/src/@_project_name_@-dispatchers.adb +share/gps/templates/aws_web_server/src/@_project_name_@-dispatchers.ads +share/gps/templates/aws_web_server/src/@_project_name_@-main.adb +share/gps/templates/aws_web_server/src/@_project_name_@.ads +share/gps/templates/aws_web_server/tmplt/main.thtml +share/gps/templates/aws_web_server/web_server.gpt +share/gps/templates/aws_web_server_blocks/@_project_name_@.gpr +share/gps/templates/aws_web_server_blocks/README +share/gps/templates/aws_web_server_blocks/css/style.css +share/gps/templates/aws_web_server_blocks/gen/templates.tada +share/gps/templates/aws_web_server_blocks/img/gps_logo.png +share/gps/templates/aws_web_server_blocks/js/ajax_api.tjs +share/gps/templates/aws_web_server_blocks/js/aws.tjs +share/gps/templates/aws_web_server_blocks/js/aws_kernel.tjs +share/gps/templates/aws_web_server_blocks/js/behaviour.js +share/gps/templates/aws_web_server_blocks/js/prototype.js +share/gps/templates/aws_web_server_blocks/js/scriptaculous.js +share/gps/templates/aws_web_server_blocks/makefile +share/gps/templates/aws_web_server_blocks/open_readme.py +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-ajax.adb +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-ajax.ads +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-dispatchers.adb +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-dispatchers.ads +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-main.adb +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-web_blocks.adb +share/gps/templates/aws_web_server_blocks/src/@_project_name_@-web_blocks.ads +share/gps/templates/aws_web_server_blocks/src/@_project_name_@.ads +share/gps/templates/aws_web_server_blocks/tmplt/main.thtml +share/gps/templates/aws_web_server_blocks/tmplt/r_widget_counter.txml +share/gps/templates/aws_web_server_blocks/tmplt/widget_counter.thtml +share/gps/templates/aws_web_server_blocks/web_server_blocks.gpt +share/gps/templates/gtkada_minimal/@_project_name_@.gpr +share/gps/templates/gtkada_minimal/gtkada_minimal.gpt +share/gps/templates/gtkada_minimal/src/@_main_name_@.adb +share/gps/templates/simple_project/@_project_name_@.gpr +share/gps/templates/simple_project/simple_project.gpt +share/gps/templates/simple_project/src/@_main_name_@.adb +share/gps/templates/stm32f_leds/@_project_name_@.gpr +share/gps/templates/stm32f_leds/src/@_main_name_@.adb +share/gps/templates/stm32f_leds/src/button.adb +share/gps/templates/stm32f_leds/src/button.ads +share/gps/templates/stm32f_leds/src/driver.adb +share/gps/templates/stm32f_leds/src/driver.ads +share/gps/templates/stm32f_leds/src/last_chance_handler.adb +share/gps/templates/stm32f_leds/src/last_chance_handler.ads +share/gps/templates/stm32f_leds/src/leds.adb +share/gps/templates/stm32f_leds/src/leds.ads +share/gps/templates/stm32f_leds/src/registers.ads +share/gps/templates/stm32f_leds/src/stm32f4-gpio.ads +share/gps/templates/stm32f_leds/src/stm32f4-reset_clock_control.ads +share/gps/templates/stm32f_leds/src/stm32f4-sysconfig_control.ads +share/gps/templates/stm32f_leds/src/stm32f4.ads +share/gps/templates/stm32f_leds/stm32f_leds.gpt diff --git a/lang/asis/Makefile b/lang/asis/Makefile index 31546987e9c1..79800dd44084 100644 --- a/lang/asis/Makefile +++ b/lang/asis/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= asis -PORTVERSION= 2014 -PORTREVISION= 2 +PORTVERSION= 2015 CATEGORIES= lang MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src @@ -22,6 +21,7 @@ USES= ada gmake NO_MTREE= yes MAKE_ENV= PROCESSORS=${MAKE_JOBS_NUMBER} GUSTATIC= ${LOCALBASE}/lib/gnat_util/libgnat_util.a +PORTDOCS= html pdf *.txt post-extract: @${REINPLACE_CMD} -e 's|OPSYS|ASISOPSYS|g' \ @@ -29,24 +29,36 @@ post-extract: ${WRKSRC}/Makefile \ ${WRKSRC}/Makefile.stub \ ${WRKSRC}/common.gpr - @${REINPLACE_CMD} -e 's|Hostparm.OpenVMS|False|' \ - ${WRKSRC}/asis/a4g-a_types.adb \ - ${WRKSRC}/tools/gnatmetric/asis_ul-env* \ - ${WRKSRC}/tools/tool_utils/asis_ul-environment.adb \ - ${WRKSRC}/tools/tool_utils/asis_ul-projects.adb \ - ${WRKSRC}/tools/tool_utils/asis_ul-common.adb \ - ${WRKSRC}/tools/gnatpp/gnatpp-processing.adb \ - ${WRKSRC}/tools/gnatpp/gnatpp-output.ad[sb] - @${RM} -rf ${WRKSRC}/gnat do-build: # This target is recreated because -j cannot be set, but - # MAKE_JOBS_SAFE=yes is needed for PROCESSORS value + # MAKE_JOBS_UNSAFE=yes would break PROCESSORS value (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) -post-install: - @(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ - ${SORT} >> ${TMPPLIST}) +do-install: + # gprinstall seems to be malfunctioning, just install manually + ${MKDIR} ${STAGEDIR}${PREFIX}/bin \ + ${STAGEDIR}${PREFIX}/include/asis \ + ${STAGEDIR}${PREFIX}/lib/asis \ + ${STAGEDIR}${PREFIX}/lib/gnat \ + ${STAGEDIR}${PREFIX}/share/gps/plug-ins \ + ${STAGEDIR}${DOCSDIR}/html \ + ${STAGEDIR}${DOCSDIR}/pdf + ${INSTALL_PROGRAM} ${WRKSRC}/tools/asistant/asistant \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/asis/*.ad[bs] \ + ${STAGEDIR}${PREFIX}/include/asis + ${INSTALL_DATA} ${WRKSRC}/lib/*.ali ${STAGEDIR}${PREFIX}/lib/asis + ${INSTALL_DATA} ${WRKSRC}/lib/*.a ${STAGEDIR}${PREFIX}/lib/asis + ${INSTALL_DATA} ${WRKSRC}/documentation/*.html \ + ${STAGEDIR}${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/documentation/*.pdf \ + ${STAGEDIR}${DOCSDIR}/pdf + ${INSTALL_DATA} ${WRKSRC}/documentation/*.txt \ + ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/documentation/asis.xml \ + ${STAGEDIR}${PREFIX}/share/gps/plug-ins + ${INSTALL_DATA} ${FILESDIR}/asis.gpr ${STAGEDIR}${PREFIX}/lib/gnat .include diff --git a/lang/asis/distinfo b/lang/asis/distinfo index 8bde0b533143..f1973304c197 100644 --- a/lang/asis/distinfo +++ b/lang/asis/distinfo @@ -1,2 +1,2 @@ -SHA256 (asis-gpl-2014-src.tar.gz) = 429d3ff2c8c72397c1cf3c39bb49cbe2268bd1b0353ff81b56734fed273a2324 -SIZE (asis-gpl-2014-src.tar.gz) = 4830531 +SHA256 (asis-gpl-2015-src.tar.gz) = 5c011786ed4173d14bda2194c5f0255dfcde4c102ee7b428567014f6c5c87bbb +SIZE (asis-gpl-2015-src.tar.gz) = 4792357 diff --git a/lang/asis/files/asis.gpr b/lang/asis/files/asis.gpr new file mode 100644 index 000000000000..33b259049bb9 --- /dev/null +++ b/lang/asis/files/asis.gpr @@ -0,0 +1,12 @@ +with "gnat_util"; +Library project Asis is + + for Languages use ("Ada"); + + for Source_Dirs use ("../../include/asis"); + for Library_Dir use "../../lib/asis"; + for Library_Name use "asis"; + for Library_Kind use "static"; + for Externally_Built use "True"; + +end Asis; diff --git a/lang/asis/files/patch-Makefile.stub b/lang/asis/files/patch-Makefile.stub index 5dba238cedfc..af0a5f244b7b 100644 --- a/lang/asis/files/patch-Makefile.stub +++ b/lang/asis/files/patch-Makefile.stub @@ -1,4 +1,4 @@ ---- Makefile.stub.orig 2014-05-15 18:18:09.000000000 +0000 +--- Makefile.stub.orig 2015-06-22 09:23:18 UTC +++ Makefile.stub @@ -3,8 +3,7 @@ host := $(shell gcc -dumpmachine) @@ -8,5 +8,5 @@ -prefix=$(INSTALL_DIR) +prefix=$(PREFIX) - # Asis specific directories - GNAT_DIR=../gnat + # System commands + LN = ln -s diff --git a/lang/asis/files/patch-asis_a4g-gnat__int.adb b/lang/asis/files/patch-asis_a4g-gnat__int.adb index 78cc9c1a985f..84ad94c17e8b 100644 --- a/lang/asis/files/patch-asis_a4g-gnat__int.adb +++ b/lang/asis/files/patch-asis_a4g-gnat__int.adb @@ -1,6 +1,6 @@ ---- asis/a4g-gnat_int.adb.orig 2014-04-10 13:38:35.000000000 +0000 +--- asis/a4g-gnat_int.adb.orig 2015-05-06 10:56:06 UTC +++ asis/a4g-gnat_int.adb -@@ -229,40 +229,10 @@ package body A4G.GNAT_Int is +@@ -231,40 +231,10 @@ package body A4G.GNAT_Int is Opt.Tree_Read; if Strong_Version_Check then diff --git a/lang/asis/files/patch-no-OpenVMS.diff b/lang/asis/files/patch-no-OpenVMS.diff deleted file mode 100644 index 847aed3e3fed..000000000000 --- a/lang/asis/files/patch-no-OpenVMS.diff +++ /dev/null @@ -1,70 +0,0 @@ -OpenVMS Support was removed from gcc5-aux, so remove Name_AST_Entry -This patch can be applied to gcc-aux version too. - ---- asis/a4g-a_sem.adb.orig 2014-04-10 13:38:35 UTC -+++ asis/a4g-a_sem.adb -@@ -1317,14 +1317,12 @@ package body A4G.A_Sem is - Name_Complex_Representation | - Name_CPP_Class | - Name_CPP_Constructor | -- Name_Export_Exception | - Name_Export_Function | - Name_Export_Object | - Name_Export_Procedure | - Name_Export_Valued_Procedure | - Name_Favor_Top_Level | - Name_Finalize_Storage_Only | -- Name_Import_Exception | - Name_Import_Function | - Name_Import_Object | - Name_Import_Procedure | -@@ -1371,22 +1369,6 @@ package body A4G.A_Sem is - end if; - - -- Cases when a specific processing is needed -- when Name_Float_Representation => -- Pragma_Arg := First (Pragma_Argument_Associations (Pragma_Node)); -- -- if Present (Next (Pragma_Arg)) then -- Pragma_Arg := Next (Pragma_Arg); -- end if; -- -- Pragma_Arg := Sinfo.Expression (Pragma_Arg); -- -- if Entity (Pragma_Arg) = Entity_Node -- or else -- Chars (Pragma_Arg) = Chars (Entity_Node) -- then -- Result := True; -- end if; -- - when Name_Obsolescent => - - if Is_Obsolescent (Entity_Node) then -@@ -1633,8 +1615,6 @@ package body A4G.A_Sem is - if not ( - N in First_Pragma_Name .. Last_Pragma_Name - or else -- N = Name_AST_Entry -- or else - N = Name_CPU - or else - N = Name_Interface ---- asis/a4g-mapping.adb.orig 2014-04-10 13:38:35 UTC -+++ asis/a4g-mapping.adb -@@ -1884,7 +1884,6 @@ package body A4G.Mapping is - Attribute_Chars = Name_Address_Size or else - Attribute_Chars = Name_Asm_Input or else - Attribute_Chars = Name_Asm_Output or else -- Attribute_Chars = Name_AST_Entry or else -- VMS - Attribute_Chars = Name_Bit or else - Attribute_Chars = Name_Bit_Position or else - Attribute_Chars = Name_Code_Address or else -@@ -3169,7 +3168,6 @@ package body A4G.Mapping is - - elsif Pragma_Chars in - First_Pragma_Name .. Last_Pragma_Name | -- Name_AST_Entry | - Name_Interface - then - -- We have already checked for all the standard pragma names, so diff --git a/lang/asis/pkg-plist b/lang/asis/pkg-plist new file mode 100644 index 000000000000..d02b7d1458bd --- /dev/null +++ b/lang/asis/pkg-plist @@ -0,0 +1,211 @@ +bin/asistant +include/asis/a4g-a_alloc.ads +include/asis/a4g-a_debug.adb +include/asis/a4g-a_debug.ads +include/asis/a4g-a_elists.adb +include/asis/a4g-a_elists.ads +include/asis/a4g-a_opt.adb +include/asis/a4g-a_opt.ads +include/asis/a4g-a_osint.adb +include/asis/a4g-a_osint.ads +include/asis/a4g-a_output.adb +include/asis/a4g-a_output.ads +include/asis/a4g-a_sem.adb +include/asis/a4g-a_sem.ads +include/asis/a4g-a_sinput.adb +include/asis/a4g-a_sinput.ads +include/asis/a4g-a_stand.ads +include/asis/a4g-a_types.adb +include/asis/a4g-a_types.ads +include/asis/a4g-asis_tables.adb +include/asis/a4g-asis_tables.ads +include/asis/a4g-contt-dp.adb +include/asis/a4g-contt-dp.ads +include/asis/a4g-contt-sd.adb +include/asis/a4g-contt-sd.ads +include/asis/a4g-contt-tt.adb +include/asis/a4g-contt-tt.ads +include/asis/a4g-contt-ut.adb +include/asis/a4g-contt-ut.ads +include/asis/a4g-contt.adb +include/asis/a4g-contt.ads +include/asis/a4g-cu_info2.adb +include/asis/a4g-cu_info2.ads +include/asis/a4g-dda_aux.adb +include/asis/a4g-dda_aux.ads +include/asis/a4g-decl_sem.adb +include/asis/a4g-decl_sem.ads +include/asis/a4g-defaults.adb +include/asis/a4g-defaults.ads +include/asis/a4g-ee_cache.adb +include/asis/a4g-ee_cache.ads +include/asis/a4g-encl_el.adb +include/asis/a4g-encl_el.ads +include/asis/a4g-expr_sem.adb +include/asis/a4g-expr_sem.ads +include/asis/a4g-get_unit.adb +include/asis/a4g-get_unit.ads +include/asis/a4g-gnat_int.adb +include/asis/a4g-gnat_int.ads +include/asis/a4g-int_knds.ads +include/asis/a4g-itests.adb +include/asis/a4g-itests.ads +include/asis/a4g-knd_conv.adb +include/asis/a4g-knd_conv.ads +include/asis/a4g-mapping.adb +include/asis/a4g-mapping.ads +include/asis/a4g-norm.adb +include/asis/a4g-norm.ads +include/asis/a4g-queries.adb +include/asis/a4g-queries.ads +include/asis/a4g-skip_tb.adb +include/asis/a4g-skip_tb.ads +include/asis/a4g-span_beginning.adb +include/asis/a4g-span_beginning.ads +include/asis/a4g-span_end.adb +include/asis/a4g-span_end.ads +include/asis/a4g-stand.adb +include/asis/a4g-stand.ads +include/asis/a4g-tree_rec.ads +include/asis/a4g-u_conv.adb +include/asis/a4g-u_conv.ads +include/asis/a4g-unit_rec.ads +include/asis/a4g-vcheck.adb +include/asis/a4g-vcheck.ads +include/asis/a4g.ads +include/asis/asis-ada_environments-containers.adb +include/asis/asis-ada_environments-containers.ads +include/asis/asis-ada_environments.adb +include/asis/asis-ada_environments.ads +include/asis/asis-clauses.adb +include/asis/asis-clauses.ads +include/asis/asis-compilation_units-relations.adb +include/asis/asis-compilation_units-relations.ads +include/asis/asis-compilation_units-times.adb +include/asis/asis-compilation_units-times.ads +include/asis/asis-compilation_units.adb +include/asis/asis-compilation_units.ads +include/asis/asis-data_decomposition-aux.adb +include/asis/asis-data_decomposition-aux.ads +include/asis/asis-data_decomposition-debug.adb +include/asis/asis-data_decomposition-debug.ads +include/asis/asis-data_decomposition-extensions.adb +include/asis/asis-data_decomposition-extensions.ads +include/asis/asis-data_decomposition-set_get.adb +include/asis/asis-data_decomposition-set_get.ads +include/asis/asis-data_decomposition-vcheck.adb +include/asis/asis-data_decomposition-vcheck.ads +include/asis/asis-data_decomposition.adb +include/asis/asis-data_decomposition.ads +include/asis/asis-declarations.adb +include/asis/asis-declarations.ads +include/asis/asis-definitions.adb +include/asis/asis-definitions.ads +include/asis/asis-elements.adb +include/asis/asis-elements.ads +include/asis/asis-errors.ads +include/asis/asis-exceptions.ads +include/asis/asis-expressions.adb +include/asis/asis-expressions.ads +include/asis/asis-extensions-flat_kinds.adb +include/asis/asis-extensions-flat_kinds.ads +include/asis/asis-extensions-iterator.adb +include/asis/asis-extensions-iterator.ads +include/asis/asis-extensions-strings.adb +include/asis/asis-extensions-strings.ads +include/asis/asis-extensions.adb +include/asis/asis-extensions.ads +include/asis/asis-ids.adb +include/asis/asis-ids.ads +include/asis/asis-implementation-permissions.adb +include/asis/asis-implementation-permissions.ads +include/asis/asis-implementation.adb +include/asis/asis-implementation.ads +include/asis/asis-iterator.adb +include/asis/asis-iterator.ads +include/asis/asis-limited_views.adb +include/asis/asis-limited_views.ads +include/asis/asis-set_get.adb +include/asis/asis-set_get.ads +include/asis/asis-statements.adb +include/asis/asis-statements.ads +include/asis/asis-text-set_get.adb +include/asis/asis-text-set_get.ads +include/asis/asis-text.adb +include/asis/asis-text.ads +include/asis/asis.ads +lib/asis/a4g-a_alloc.ali +lib/asis/a4g-a_debug.ali +lib/asis/a4g-a_elists.ali +lib/asis/a4g-a_opt.ali +lib/asis/a4g-a_osint.ali +lib/asis/a4g-a_output.ali +lib/asis/a4g-a_sem.ali +lib/asis/a4g-a_sinput.ali +lib/asis/a4g-a_stand.ali +lib/asis/a4g-a_types.ali +lib/asis/a4g-asis_tables.ali +lib/asis/a4g-contt-dp.ali +lib/asis/a4g-contt-sd.ali +lib/asis/a4g-contt-tt.ali +lib/asis/a4g-contt-ut.ali +lib/asis/a4g-contt.ali +lib/asis/a4g-cu_info2.ali +lib/asis/a4g-dda_aux.ali +lib/asis/a4g-decl_sem.ali +lib/asis/a4g-defaults.ali +lib/asis/a4g-ee_cache.ali +lib/asis/a4g-encl_el.ali +lib/asis/a4g-expr_sem.ali +lib/asis/a4g-get_unit.ali +lib/asis/a4g-gnat_int.ali +lib/asis/a4g-int_knds.ali +lib/asis/a4g-itests.ali +lib/asis/a4g-knd_conv.ali +lib/asis/a4g-mapping.ali +lib/asis/a4g-norm.ali +lib/asis/a4g-queries.ali +lib/asis/a4g-skip_tb.ali +lib/asis/a4g-span_beginning.ali +lib/asis/a4g-span_end.ali +lib/asis/a4g-stand.ali +lib/asis/a4g-tree_rec.ali +lib/asis/a4g-u_conv.ali +lib/asis/a4g-unit_rec.ali +lib/asis/a4g-vcheck.ali +lib/asis/a4g.ali +lib/asis/asis-ada_environments-containers.ali +lib/asis/asis-ada_environments.ali +lib/asis/asis-clauses.ali +lib/asis/asis-compilation_units-relations.ali +lib/asis/asis-compilation_units-times.ali +lib/asis/asis-compilation_units.ali +lib/asis/asis-data_decomposition-aux.ali +lib/asis/asis-data_decomposition-debug.ali +lib/asis/asis-data_decomposition-extensions.ali +lib/asis/asis-data_decomposition-set_get.ali +lib/asis/asis-data_decomposition-vcheck.ali +lib/asis/asis-data_decomposition.ali +lib/asis/asis-declarations.ali +lib/asis/asis-definitions.ali +lib/asis/asis-elements.ali +lib/asis/asis-errors.ali +lib/asis/asis-exceptions.ali +lib/asis/asis-expressions.ali +lib/asis/asis-extensions-flat_kinds.ali +lib/asis/asis-extensions-iterator.ali +lib/asis/asis-extensions-strings.ali +lib/asis/asis-extensions.ali +lib/asis/asis-ids.ali +lib/asis/asis-implementation-permissions.ali +lib/asis/asis-implementation.ali +lib/asis/asis-iterator.ali +lib/asis/asis-limited_views.ali +lib/asis/asis-set_get.ali +lib/asis/asis-statements.ali +lib/asis/asis-text-set_get.ali +lib/asis/asis-text.ali +lib/asis/asis.ali +lib/asis/libasis.a +lib/gnat/asis.gpr +share/gps/plug-ins/asis.xml diff --git a/lang/gnat_util/Makefile b/lang/gnat_util/Makefile index d34be6752534..18f0eafb7684 100644 --- a/lang/gnat_util/Makefile +++ b/lang/gnat_util/Makefile @@ -22,10 +22,10 @@ MAKE_ENV= MAKEOBJDIR=${WRKSRC}/obj .include "${.CURDIR}/Makefile.sources" -.if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 5 -.include "${.CURDIR}/../gcc5-aux/Makefile.version" -.else +.if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 49 .include "${.CURDIR}/../gcc-aux/Makefile.version" +.else +.include "${.CURDIR}/../gcc5-aux/Makefile.version" .endif post-extract: diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile index b2c82288869c..945de385e9a5 100644 --- a/www/aws-demos/Makefile +++ b/www/aws-demos/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= aws -PORTVERSION= 3.2.0.0 -PORTREVISION= 1 +PORTVERSION= 3.3.0.0 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ PKGNAMESUFFIX= -demos @@ -78,7 +77,7 @@ DEMO_DIRS+= test_ldap post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \ ${WRKSRC}/demos/test_ldap/test_ldap.gpr - @${REINPLACE_CMD} -e 's| setup_tp | |' ${WRKSRC}/makefile + @${REINPLACE_CMD} -e 's| setup_tp | |' ${WRKSRC}/Makefile do-configure: ${MKDIR} ${WRKSRC}/.build/native/debug/static/obj diff --git a/www/aws/Makefile b/www/aws/Makefile index 346e4b881465..b805c4bd53ca 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= aws -PORTVERSION= 3.2.0.0 -PORTREVISION= 4 +PORTVERSION= 3.3.0.0 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ @@ -47,8 +46,6 @@ NOSSL_DESC= Disable SSL support SHARED_DESC= Build shared libraries in addition to static ones IP6_DESC= Support IPv6 instead of IPv4 -MAKEFILE= makefile - CONF_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} CONF_ARGS+= GCC=ada CONF_ARGS+= PYTHON=python${PYTHON_VER} @@ -139,9 +136,8 @@ post-patch: ${WRKSRC}/aws.gpr \ ${WRKSRC}/src/src.gpr \ ${WRKSRC}/include/include.gpr - @(${CAT} ${FILESDIR}/temparse.gpr.in | \ - ${SED} -e 's|@PREFIX@|${LOCALBASE}|g' \ - > ${WRKSRC}/templates_parser/temparse.gpr) + @${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/temparse.gpr.in \ + > ${WRKSRC}/templates_parser/temparse.gpr do-configure: # If we want to do templates_parser copy in an earlier target then @@ -172,7 +168,9 @@ test: .endif post-install: - ${RM} -rf ${STAGEDIR}${PREFIX}/share/gpr/manifests + ${RM} -r ${STAGEDIR}${PREFIX}/share/gpr/manifests + ${RM} ${STAGEDIR}${PREFIX}/include/aws.relocatable/Makefile + ${RM} ${STAGEDIR}${PREFIX}/include/aws/Makefile ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \ ${STAGEDIR}${PREFIX}/share/gps/plug-ins ${CAT} ${FILESDIR}/aws.gpr.in | ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ diff --git a/www/aws/distinfo b/www/aws/distinfo index be243877645e..59238a25a386 100644 --- a/www/aws/distinfo +++ b/www/aws/distinfo @@ -1,2 +1,2 @@ -SHA256 (aws-3.2.0.0.tar.bz2) = 21b396003e1e925954b73a0206e3dcc5978369147de926eac4eda352c9ad0c52 -SIZE (aws-3.2.0.0.tar.bz2) = 1443916 +SHA256 (aws-3.3.0.0.tar.bz2) = aba7a8e44de6f4f75b3fc51ad1e61857cf37f4f74d92eaa117ae8b3356a3b2ba +SIZE (aws-3.3.0.0.tar.bz2) = 1548511 diff --git a/www/aws/files/patch-makefile b/www/aws/files/patch-Makefile similarity index 90% rename from www/aws/files/patch-makefile rename to www/aws/files/patch-Makefile index 88d3ca23cc4e..56dbe65363ee 100644 --- a/www/aws/files/patch-makefile +++ b/www/aws/files/patch-Makefile @@ -1,5 +1,5 @@ ---- makefile.orig 2014-05-15 19:48:07.000000000 +0000 -+++ makefile +--- Makefile.orig 2015-06-22 10:52:10 UTC ++++ Makefile @@ -61,15 +61,14 @@ ALL_OPTIONS = $(MAKE_OPT) SOCKET="$(SOCK GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \ prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \ @@ -18,7 +18,7 @@ run_regtests: echo "" -@@ -343,4 +342,5 @@ gen_setup: +@@ -347,4 +346,5 @@ gen_setup: setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE) setup_tp: diff --git a/www/aws/files/patch-aws.gpr b/www/aws/files/patch-aws.gpr index dcb33c019d51..36abec267e22 100644 --- a/www/aws/files/patch-aws.gpr +++ b/www/aws/files/patch-aws.gpr @@ -1,4 +1,4 @@ ---- aws.gpr.orig 2014-05-15 19:48:07.000000000 +0000 +--- aws.gpr.orig 2014-11-15 19:27:52 UTC +++ aws.gpr @@ -44,7 +44,8 @@ aggregate library project AWS is when "Windows_NT" => diff --git a/www/aws/files/patch-gps_makefile b/www/aws/files/patch-gps_Makefile similarity index 74% rename from www/aws/files/patch-gps_makefile rename to www/aws/files/patch-gps_Makefile index b58d1885dc6d..2c7bf888349b 100644 --- a/www/aws/files/patch-gps_makefile +++ b/www/aws/files/patch-gps_Makefile @@ -1,5 +1,5 @@ ---- gps/makefile.orig 2014-05-15 19:48:07.000000000 +0000 -+++ gps/makefile +--- gps/Makefile.orig 2015-06-22 10:52:10 UTC ++++ gps/Makefile @@ -20,7 +20,7 @@ ALL_API = $(sort $(shell ls ../src/core/*.ads ../src/extended/*.ads \ diff --git a/www/aws/files/patch-include_include.gpr b/www/aws/files/patch-include_include.gpr index 04eaca066d29..e5bce0c3081c 100644 --- a/www/aws/files/patch-include_include.gpr +++ b/www/aws/files/patch-include_include.gpr @@ -1,10 +1,10 @@ ---- include/include.gpr.orig 2014-05-15 19:48:07.000000000 +0000 +--- include/include.gpr.orig 2015-06-22 10:52:10 UTC +++ include/include.gpr @@ -31,6 +31,7 @@ library project Include is for Library_Name use "aws_include"; for Library_Kind use Shared.Library_Type; + for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@"); + for Leading_Library_Options use Shared.Leading_Library_Options; --------- - -- Ide -- diff --git a/www/aws/files/patch-regtests_0043__check__mem_test.opt b/www/aws/files/patch-regtests_0043__check__mem_test.opt index 8e38b77a18fe..e229301688c1 100644 --- a/www/aws/files/patch-regtests_0043__check__mem_test.opt +++ b/www/aws/files/patch-regtests_0043__check__mem_test.opt @@ -1,4 +1,4 @@ ---- regtests/0043_check_mem/test.opt.orig 2014-05-15 19:48:07.000000000 +0000 +--- regtests/0043_check_mem/test.opt.orig 2014-11-15 19:27:52 UTC +++ regtests/0043_check_mem/test.opt @@ -1,3 +1,11 @@ !ssl DEAD diff --git a/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt b/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt index 054d5fae5aeb..42436535e6e7 100644 --- a/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt +++ b/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt @@ -1,4 +1,4 @@ ---- regtests/0213_check_mem_nossl/test.opt.orig 2014-05-15 19:48:07.000000000 +0000 +--- regtests/0213_check_mem_nossl/test.opt.orig 2014-11-15 19:27:52 UTC +++ regtests/0213_check_mem_nossl/test.opt @@ -1,3 +1,11 @@ !xmlada DEAD diff --git a/www/aws/files/patch-src_core_aws-net.adb b/www/aws/files/patch-src_core_aws-net.adb index 2df8ea26f328..0d20c6c887bd 100644 --- a/www/aws/files/patch-src_core_aws-net.adb +++ b/www/aws/files/patch-src_core_aws-net.adb @@ -1,6 +1,6 @@ ---- src/core/aws-net.adb.orig 2014-05-15 19:48:07.000000000 +0000 +--- src/core/aws-net.adb.orig 2015-06-22 10:52:10 UTC +++ src/core/aws-net.adb -@@ -552,7 +552,7 @@ package body AWS.Net is +@@ -553,7 +553,7 @@ package body AWS.Net is -- to be shure that it is S1 and S2 connected together diff --git a/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb b/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb deleted file mode 100644 index 34373bacb4f5..000000000000 --- a/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb +++ /dev/null @@ -1,37 +0,0 @@ ---- src/extended/aws-services-dispatchers-timer.adb.orig 2014-05-15 19:48:07 UTC -+++ src/extended/aws-services-dispatchers-timer.adb -@@ -480,7 +480,11 @@ package body AWS.Services.Dispatchers.Ti - - procedure Unregister - (Dispatcher : in out Handler; -- Name : String) is -+ Name : String) -+ is -+ use type Period_Table.Cursor; -+ -+ Pos : Period_table.Cursor := Period_Table.No_Element; - begin - for Cursor in Dispatcher.Table.Iterate loop - declare -@@ -488,13 +492,18 @@ package body AWS.Services.Dispatchers.Ti - begin - if To_String (Item.Name) = Name then - Unchecked_Free (Item); -- Period_Table.Delete (Dispatcher.Table, Cursor); -- return; -+ Pos := Cursor; -+ exit; - end if; - end; - end loop; - -- raise Constraint_Error with "Timer distpatcher " & Name & " not found"; -+ if Pos = Period_Table.No_Element then -+ raise Constraint_Error -+ with "Timer distpatcher " & Name & " not found"; -+ else -+ Period_Table.Delete (Dispatcher.Table, Pos); -+ end if; - end Unregister; - - ------------ diff --git a/www/aws/files/patch-src_extended_aws-services-web__block-context.ads b/www/aws/files/patch-src_extended_aws-services-web__block-context.ads new file mode 100644 index 000000000000..3cf3927cccdc --- /dev/null +++ b/www/aws/files/patch-src_extended_aws-services-web__block-context.ads @@ -0,0 +1,11 @@ +--- src/extended/aws-services-web_block-context.ads.orig 2015-06-22 10:52:10 UTC ++++ src/extended/aws-services-web_block-context.ads +@@ -95,7 +95,7 @@ private + use Ada; + use GNAT; + +- pragma Suppress (Tampering_Check); ++ -- pragma Suppress (Tampering_Check); + -- Suppress Tampering_Check until O608-005 fixed. + + package KV is new Containers.Indefinite_Hashed_Maps diff --git a/www/aws/files/patch-src_src.gpr b/www/aws/files/patch-src_src.gpr index 8854955864dc..d2d760cea269 100644 --- a/www/aws/files/patch-src_src.gpr +++ b/www/aws/files/patch-src_src.gpr @@ -1,4 +1,4 @@ ---- src/src.gpr.orig 2014-05-15 19:48:07.000000000 +0000 +--- src/src.gpr.orig 2015-06-22 10:52:10 UTC +++ src/src.gpr @@ -21,13 +21,14 @@ with "../.build/projects/aws_xmlada"; with "../shared"; @@ -8,7 +8,7 @@ library project Src is - for Languages use ("Ada", "Project file", "makefile"); + for Languages use ("Ada", "Project file", "Makefile"); for Source_Dirs use - ("core", "extended", "../templates_parser/src", "../config/src", @@ -25,7 +25,7 @@ when "Disabled" => null; end case; -@@ -67,7 +68,7 @@ library project Src is +@@ -68,7 +69,7 @@ library project Src is when "Windows_NT" => for Library_Options use ("-lwsock32", "-lws2_32"); when others => @@ -34,7 +34,7 @@ end case; case Shared.LDAP is -@@ -78,7 +79,7 @@ library project Src is +@@ -79,7 +80,7 @@ library project Src is Project'Library_Options & ("-lwldap32"); when others => for Library_Options use @@ -43,9 +43,9 @@ end case; when "Disabled" => -@@ -123,17 +124,6 @@ library project Src is - for Implementation_Suffix ("makefile") use ".txt"; - for Implementation_Exceptions ("makefile") use ("makefile"); +@@ -124,17 +125,6 @@ library project Src is + for Implementation_Suffix ("Makefile") use ".txt"; + for Implementation_Exceptions ("Makefile") use ("Makefile"); - -- Templates Parser - diff --git a/www/aws/files/patch-ssl__crypto_lib.gpr b/www/aws/files/patch-ssl__crypto_lib.gpr index 05a87618f62e..0738957a270c 100644 --- a/www/aws/files/patch-ssl__crypto_lib.gpr +++ b/www/aws/files/patch-ssl__crypto_lib.gpr @@ -1,6 +1,6 @@ ---- ssl/crypto_lib.gpr.orig 2010-12-20 12:41:17 +0000 +--- ssl/crypto_lib.gpr.orig 2014-11-15 19:27:52 UTC +++ ssl/crypto_lib.gpr -@@ -29,7 +29,6 @@ +@@ -20,7 +20,6 @@ with "../.build/projects/aws_config"; with "../.build/projects/aws_lib_shared"; diff --git a/www/aws/files/patch-tools_tools.gpr b/www/aws/files/patch-tools_tools.gpr index 66e5397f3178..6abe82675e3b 100644 --- a/www/aws/files/patch-tools_tools.gpr +++ b/www/aws/files/patch-tools_tools.gpr @@ -1,8 +1,8 @@ ---- tools/tools.gpr.orig 2014-05-15 19:48:07.000000000 +0000 +--- tools/tools.gpr.orig 2015-06-22 10:52:10 UTC +++ tools/tools.gpr -@@ -29,8 +29,7 @@ project Tools is - (".", "../templates_parser/tools", - "../" & Shared.Target_Dir & "/setup/tsrc"); +@@ -27,8 +27,7 @@ project Tools is + + for Source_Dirs use (".", "../templates_parser/tools"); - for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb", - "webxref.adb", "templatespp.adb"); diff --git a/www/aws/pkg-plist b/www/aws/pkg-plist index bc7b05161cbd..70853cc3710b 100644 --- a/www/aws/pkg-plist +++ b/www/aws/pkg-plist @@ -1,8 +1,55 @@ -bin/ada2wsdl -bin/aws_password -bin/awsres -bin/webxref -bin/wsdl2aws +%%GNUTLS%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__gnutls.adb +%%GNUTLS%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__gnutls.ads +%%GNUTLS%%%%SHARED%%include/aws.relocatable/aws-net-ssl__gnutls.adb +%%GNUTLS%%%%SHARED%%include/aws.relocatable/ssl-thin__gnutls.ads +%%GNUTLS%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__gnutls.ali +%%GNUTLS%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__gnutls.ali +%%GNUTLS%%%%SHARED%%lib/aws.relocatable/ssl-thin__gnutls.ali +%%GNUTLS%%include/aws/aws-net-ssl-certificate-impl__gnutls.adb +%%GNUTLS%%include/aws/aws-net-ssl-certificate-impl__gnutls.ads +%%GNUTLS%%include/aws/aws-net-ssl__gnutls.adb +%%GNUTLS%%include/aws/ssl-thin__gnutls.ads +%%GNUTLS%%lib/aws/aws-net-ssl-certificate-impl__gnutls.ali +%%GNUTLS%%lib/aws/aws-net-ssl__gnutls.ali +%%GNUTLS%%lib/aws/ssl-thin__gnutls.ali +%%IP6%%%%SHARED%%include/aws.relocatable/aws-net-std__ipv6.adb +%%IP6%%%%SHARED%%lib/aws.relocatable/aws-net-std__ipv6.ali +%%IP6%%include/aws/aws-net-std__ipv6.adb +%%IP6%%lib/aws/aws-net-std__ipv6.ali +%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-client.adb +%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-client.ads +%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-thin.adb +%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-thin.ads +%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap.ads +%%LDAP%%%%SHARED%%lib/aws.relocatable/aws-ldap-client.ali +%%LDAP%%%%SHARED%%lib/aws.relocatable/aws-ldap-thin.ali +%%LDAP%%%%SHARED%%lib/aws.relocatable/aws-ldap.ali +%%LDAP%%include/aws/aws-ldap-client.adb +%%LDAP%%include/aws/aws-ldap-client.ads +%%LDAP%%include/aws/aws-ldap-thin.adb +%%LDAP%%include/aws/aws-ldap-thin.ads +%%LDAP%%include/aws/aws-ldap.ads +%%LDAP%%lib/aws/aws-ldap-client.ali +%%LDAP%%lib/aws/aws-ldap-thin.ali +%%LDAP%%lib/aws/aws-ldap.ali +%%NOSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__dummy.adb +%%NOSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__dummy.ads +%%NOSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl__dummy.adb +%%NOSSL%%%%SHARED%%include/aws.relocatable/ssl-thin__dummy.ads +%%NOSSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__dummy.ali +%%NOSSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__dummy.ali +%%NOSSL%%%%SHARED%%lib/aws.relocatable/ssl-thin__dummy.ali +%%NOSSL%%include/aws/aws-net-ssl-certificate-impl__dummy.adb +%%NOSSL%%include/aws/aws-net-ssl-certificate-impl__dummy.ads +%%NOSSL%%include/aws/aws-net-ssl__dummy.adb +%%NOSSL%%include/aws/ssl-thin__dummy.ads +%%NOSSL%%lib/aws/aws-net-ssl-certificate-impl__dummy.ali +%%NOSSL%%lib/aws/aws-net-ssl__dummy.ali +%%NOSSL%%lib/aws/ssl-thin__dummy.ali +%%NO_IP6%%%%SHARED%%include/aws.relocatable/aws-net-std__gnat.adb +%%NO_IP6%%%%SHARED%%lib/aws.relocatable/aws-net-std__gnat.ali +%%NO_IP6%%include/aws/aws-net-std__gnat.adb +%%NO_IP6%%lib/aws/aws-net-std__gnat.ali %%SHARED%%include/aws.relocatable/aws-attachments.adb %%SHARED%%include/aws.relocatable/aws-attachments.ads %%SHARED%%include/aws.relocatable/aws-client-hotplug.ads @@ -30,6 +77,7 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/aws-containers.ads %%SHARED%%include/aws.relocatable/aws-cookie.ads %%SHARED%%include/aws.relocatable/aws-default.ads +%%SHARED%%include/aws.relocatable/aws-digest.adb %%SHARED%%include/aws.relocatable/aws-digest.ads %%SHARED%%include/aws.relocatable/aws-dispatchers-callback.adb %%SHARED%%include/aws.relocatable/aws-dispatchers-callback.ads @@ -46,11 +94,6 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/aws-jabber-client.ads %%SHARED%%include/aws.relocatable/aws-jabber-digest_md5.ads %%SHARED%%include/aws.relocatable/aws-jabber.ads -%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-client.adb -%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-client.ads -%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-thin.adb -%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap-thin.ads -%%LDAP%%%%SHARED%%include/aws.relocatable/aws-ldap.ads %%SHARED%%include/aws.relocatable/aws-log.ads %%SHARED%%include/aws.relocatable/aws-messages.adb %%SHARED%%include/aws.relocatable/aws-messages.ads @@ -67,22 +110,11 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/aws-net-poll_events-wait__native.adb %%SHARED%%include/aws.relocatable/aws-net-poll_events.ads %%SHARED%%include/aws.relocatable/aws-net-sets.ads -%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.adb -%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ads -%%GNUTLS%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__gnutls.adb -%%GNUTLS%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__gnutls.ads -%%NOSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__dummy.adb -%%NOSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__dummy.ads %%SHARED%%include/aws.relocatable/aws-net-ssl-certificate.adb %%SHARED%%include/aws.relocatable/aws-net-ssl-certificate.ads %%SHARED%%include/aws.relocatable/aws-net-ssl-rsa_dh_generators.ads %%SHARED%%include/aws.relocatable/aws-net-ssl.ads -%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl__openssl.adb -%%GNUTLS%%%%SHARED%%include/aws.relocatable/aws-net-ssl__gnutls.adb -%%NOSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl__dummy.adb %%SHARED%%include/aws.relocatable/aws-net-std.ads -%%NO_IP6%%%%SHARED%%include/aws.relocatable/aws-net-std__gnat.adb -%%IP6%%%%SHARED%%include/aws.relocatable/aws-net-std__ipv6.adb %%SHARED%%include/aws.relocatable/aws-net-stream_io.adb %%SHARED%%include/aws.relocatable/aws-net-stream_io.ads %%SHARED%%include/aws.relocatable/aws-net-websocket-handshake_error.adb @@ -91,13 +123,14 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/aws-net-websocket-protocol-rfc6455.ads %%SHARED%%include/aws.relocatable/aws-net-websocket-protocol.ads %%SHARED%%include/aws.relocatable/aws-net-websocket-registry-control.ads -%%SHARED%%include/aws.relocatable/aws-net-websocket-registry-watch.ads +%%SHARED%%include/aws.relocatable/aws-net-websocket-registry-utils.ads %%SHARED%%include/aws.relocatable/aws-net-websocket-registry.ads %%SHARED%%include/aws.relocatable/aws-net-websocket.ads %%SHARED%%include/aws.relocatable/aws-net.adb %%SHARED%%include/aws.relocatable/aws-net.ads %%SHARED%%include/aws.relocatable/aws-os_lib.ads %%SHARED%%include/aws.relocatable/aws-parameters-set.ads +%%SHARED%%include/aws.relocatable/aws-parameters.adb %%SHARED%%include/aws.relocatable/aws-parameters.ads %%SHARED%%include/aws.relocatable/aws-pop.adb %%SHARED%%include/aws.relocatable/aws-pop.ads @@ -186,7 +219,6 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/aws-utils.adb %%SHARED%%include/aws.relocatable/aws-utils.ads %%SHARED%%include/aws.relocatable/aws.ads -%%SHARED%%include/aws.relocatable/makefile %%SHARED%%include/aws.relocatable/memory_streams.adb %%SHARED%%include/aws.relocatable/memory_streams.ads %%SHARED%%include/aws.relocatable/soap-client.ads @@ -207,14 +239,14 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/soap-types.ads %%SHARED%%include/aws.relocatable/soap-utils.adb %%SHARED%%include/aws.relocatable/soap-utils.ads +%%SHARED%%include/aws.relocatable/soap-wsdl-name_spaces.ads %%SHARED%%include/aws.relocatable/soap-wsdl-parameters.ads %%SHARED%%include/aws.relocatable/soap-wsdl-parser.ads +%%SHARED%%include/aws.relocatable/soap-wsdl-schema.ads +%%SHARED%%include/aws.relocatable/soap-wsdl-types.ads %%SHARED%%include/aws.relocatable/soap-wsdl.ads %%SHARED%%include/aws.relocatable/soap-xml.ads %%SHARED%%include/aws.relocatable/soap.ads -%%SSL%%%%SHARED%%include/aws.relocatable/ssl-thin__openssl.ads -%%GNUTLS%%%%SHARED%%include/aws.relocatable/ssl-thin__gnutls.ads -%%NOSSL%%%%SHARED%%include/aws.relocatable/ssl-thin__dummy.ads %%SHARED%%include/aws.relocatable/ssl.ads %%SHARED%%include/aws.relocatable/zlib-streams.adb %%SHARED%%include/aws.relocatable/zlib-streams.ads @@ -222,6 +254,179 @@ bin/wsdl2aws %%SHARED%%include/aws.relocatable/zlib-thin.ads %%SHARED%%include/aws.relocatable/zlib.adb %%SHARED%%include/aws.relocatable/zlib.ads +%%SHARED%%lib/aws.relocatable/aws-attachments.ali +%%SHARED%%lib/aws.relocatable/aws-client-hotplug.ali +%%SHARED%%lib/aws.relocatable/aws-client-http_utils.ali +%%SHARED%%lib/aws.relocatable/aws-client-xml-input_sources.ali +%%SHARED%%lib/aws.relocatable/aws-client-xml.ali +%%SHARED%%lib/aws.relocatable/aws-client.ali +%%SHARED%%lib/aws.relocatable/aws-communication-client.ali +%%SHARED%%lib/aws.relocatable/aws-communication-server.ali +%%SHARED%%lib/aws.relocatable/aws-communication.ali +%%SHARED%%lib/aws.relocatable/aws-config-ini.ali +%%SHARED%%lib/aws.relocatable/aws-config-set.ali +%%SHARED%%lib/aws.relocatable/aws-config-utils.ali +%%SHARED%%lib/aws.relocatable/aws-config.ali +%%SHARED%%lib/aws.relocatable/aws-containers-key_value.ali +%%SHARED%%lib/aws.relocatable/aws-containers-memory_streams.ali +%%SHARED%%lib/aws.relocatable/aws-containers-string_vectors.ali +%%SHARED%%lib/aws.relocatable/aws-containers-tables-set.ali +%%SHARED%%lib/aws.relocatable/aws-containers-tables.ali +%%SHARED%%lib/aws.relocatable/aws-containers.ali +%%SHARED%%lib/aws.relocatable/aws-cookie.ali +%%SHARED%%lib/aws.relocatable/aws-default.ali +%%SHARED%%lib/aws.relocatable/aws-digest.ali +%%SHARED%%lib/aws.relocatable/aws-dispatchers-callback.ali +%%SHARED%%lib/aws.relocatable/aws-dispatchers.ali +%%SHARED%%lib/aws.relocatable/aws-exceptions.ali +%%SHARED%%lib/aws.relocatable/aws-headers-set.ali +%%SHARED%%lib/aws.relocatable/aws-headers-values.ali +%%SHARED%%lib/aws.relocatable/aws-headers.ali +%%SHARED%%lib/aws.relocatable/aws-hotplug-get_status.ali +%%SHARED%%lib/aws.relocatable/aws-hotplug.ali +%%SHARED%%lib/aws.relocatable/aws-jabber-client.ali +%%SHARED%%lib/aws.relocatable/aws-jabber-digest_md5.ali +%%SHARED%%lib/aws.relocatable/aws-jabber.ali +%%SHARED%%lib/aws.relocatable/aws-log.ali +%%SHARED%%lib/aws.relocatable/aws-messages.ali +%%SHARED%%lib/aws.relocatable/aws-mime.ali +%%SHARED%%lib/aws.relocatable/aws-net-acceptors.ali +%%SHARED%%lib/aws.relocatable/aws-net-buffered.ali +%%SHARED%%lib/aws.relocatable/aws-net-generic_sets.ali +%%SHARED%%lib/aws.relocatable/aws-net-log-callbacks.ali +%%SHARED%%lib/aws.relocatable/aws-net-log.ali +%%SHARED%%lib/aws.relocatable/aws-net-poll_events.ali +%%SHARED%%lib/aws.relocatable/aws-net-sets.ali +%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate.ali +%%SHARED%%lib/aws.relocatable/aws-net-ssl-rsa_dh_generators.ali +%%SHARED%%lib/aws.relocatable/aws-net-stream_io.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-handshake_error.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-protocol-draft76.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-protocol-rfc6455.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-protocol.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-registry-control.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-registry-utils.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket-registry.ali +%%SHARED%%lib/aws.relocatable/aws-net-websocket.ali +%%SHARED%%lib/aws.relocatable/aws-net.ali +%%SHARED%%lib/aws.relocatable/aws-os_lib.ali +%%SHARED%%lib/aws.relocatable/aws-parameters-set.ali +%%SHARED%%lib/aws.relocatable/aws-parameters.ali +%%SHARED%%lib/aws.relocatable/aws-pop.ali +%%SHARED%%lib/aws.relocatable/aws-resources-embedded.ali +%%SHARED%%lib/aws.relocatable/aws-resources-files.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams-disk-once.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams-disk.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams-memory-zlib.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams-memory.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams-pipe.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams-zlib.ali +%%SHARED%%lib/aws.relocatable/aws-resources-streams.ali +%%SHARED%%lib/aws.relocatable/aws-resources.ali +%%SHARED%%lib/aws.relocatable/aws-response-set.ali +%%SHARED%%lib/aws.relocatable/aws-response.ali +%%SHARED%%lib/aws.relocatable/aws-server-get_status.ali +%%SHARED%%lib/aws.relocatable/aws-server-hotplug.ali +%%SHARED%%lib/aws.relocatable/aws-server-http_utils.ali +%%SHARED%%lib/aws.relocatable/aws-server-log.ali +%%SHARED%%lib/aws.relocatable/aws-server-push.ali +%%SHARED%%lib/aws.relocatable/aws-server-status.ali +%%SHARED%%lib/aws.relocatable/aws-server.ali +%%SHARED%%lib/aws.relocatable/aws-services-callbacks.ali +%%SHARED%%lib/aws.relocatable/aws-services-directory.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-linker.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-method.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-timer.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-transient_pages.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-uri.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-virtual_host.ali +%%SHARED%%lib/aws.relocatable/aws-services-dispatchers.ali +%%SHARED%%lib/aws.relocatable/aws-services-download.ali +%%SHARED%%lib/aws.relocatable/aws-services-page_server.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages-alpha-bounded.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages-alpha.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages-shared.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages-uniform-alpha.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages-uniform-overlapping.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages-uniform.ali +%%SHARED%%lib/aws.relocatable/aws-services-split_pages.ali +%%SHARED%%lib/aws.relocatable/aws-services-transient_pages-control.ali +%%SHARED%%lib/aws.relocatable/aws-services-transient_pages.ali +%%SHARED%%lib/aws.relocatable/aws-services-web_block-context.ali +%%SHARED%%lib/aws.relocatable/aws-services-web_block-registry.ali +%%SHARED%%lib/aws.relocatable/aws-services-web_block.ali +%%SHARED%%lib/aws.relocatable/aws-services-web_mail.ali +%%SHARED%%lib/aws.relocatable/aws-services.ali +%%SHARED%%lib/aws.relocatable/aws-session-control.ali +%%SHARED%%lib/aws.relocatable/aws-session.ali +%%SHARED%%lib/aws.relocatable/aws-smtp-authentication-plain.ali +%%SHARED%%lib/aws.relocatable/aws-smtp-authentication.ali +%%SHARED%%lib/aws.relocatable/aws-smtp-client.ali +%%SHARED%%lib/aws.relocatable/aws-smtp-messages-set.ali +%%SHARED%%lib/aws.relocatable/aws-smtp-messages.ali +%%SHARED%%lib/aws.relocatable/aws-smtp-server.ali +%%SHARED%%lib/aws.relocatable/aws-smtp.ali +%%SHARED%%lib/aws.relocatable/aws-status-set.ali +%%SHARED%%lib/aws.relocatable/aws-status-translate_set.ali +%%SHARED%%lib/aws.relocatable/aws-status-translate_table.ali +%%SHARED%%lib/aws.relocatable/aws-status.ali +%%SHARED%%lib/aws.relocatable/aws-templates.ali +%%SHARED%%lib/aws.relocatable/aws-translator.ali +%%SHARED%%lib/aws.relocatable/aws-url-raise_url_error.ali +%%SHARED%%lib/aws.relocatable/aws-url-set.ali +%%SHARED%%lib/aws.relocatable/aws-url.ali +%%SHARED%%lib/aws.relocatable/aws-utils-streams.ali +%%SHARED%%lib/aws.relocatable/aws-utils.ali +%%SHARED%%lib/aws.relocatable/aws.ali +%%SHARED%%lib/aws.relocatable/libaws.so +%%SHARED%%lib/aws.relocatable/memory_streams.ali +%%SHARED%%lib/aws.relocatable/soap-client.ali +%%SHARED%%lib/aws.relocatable/soap-dispatchers-callback.ali +%%SHARED%%lib/aws.relocatable/soap-dispatchers.ali +%%SHARED%%lib/aws.relocatable/soap-generator.ali +%%SHARED%%lib/aws.relocatable/soap-message-payload.ali +%%SHARED%%lib/aws.relocatable/soap-message-reader.ali +%%SHARED%%lib/aws.relocatable/soap-message-response-error.ali +%%SHARED%%lib/aws.relocatable/soap-message-response.ali +%%SHARED%%lib/aws.relocatable/soap-message-xml.ali +%%SHARED%%lib/aws.relocatable/soap-message.ali +%%SHARED%%lib/aws.relocatable/soap-name_space.ali +%%SHARED%%lib/aws.relocatable/soap-parameters.ali +%%SHARED%%lib/aws.relocatable/soap-types-untyped.ali +%%SHARED%%lib/aws.relocatable/soap-types.ali +%%SHARED%%lib/aws.relocatable/soap-utils.ali +%%SHARED%%lib/aws.relocatable/soap-wsdl-name_spaces.ali +%%SHARED%%lib/aws.relocatable/soap-wsdl-parameters.ali +%%SHARED%%lib/aws.relocatable/soap-wsdl-parser.ali +%%SHARED%%lib/aws.relocatable/soap-wsdl-schema.ali +%%SHARED%%lib/aws.relocatable/soap-wsdl-types.ali +%%SHARED%%lib/aws.relocatable/soap-wsdl.ali +%%SHARED%%lib/aws.relocatable/soap-xml.ali +%%SHARED%%lib/aws.relocatable/soap.ali +%%SHARED%%lib/aws.relocatable/ssl.ali +%%SHARED%%lib/aws.relocatable/zlib-streams.ali +%%SHARED%%lib/aws.relocatable/zlib-thin.ali +%%SHARED%%lib/aws.relocatable/zlib.ali +%%SHARED%%lib/libaws.so +%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.adb +%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ads +%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl__openssl.adb +%%SSL%%%%SHARED%%include/aws.relocatable/ssl-thin__openssl.ads +%%SSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ali +%%SSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__openssl.ali +%%SSL%%%%SHARED%%lib/aws.relocatable/ssl-thin__openssl.ali +%%SSL%%include/aws/aws-net-ssl-certificate-impl__openssl.adb +%%SSL%%include/aws/aws-net-ssl-certificate-impl__openssl.ads +%%SSL%%include/aws/aws-net-ssl__openssl.adb +%%SSL%%include/aws/ssl-thin__openssl.ads +%%SSL%%lib/aws/aws-net-ssl-certificate-impl__openssl.ali +%%SSL%%lib/aws/aws-net-ssl__openssl.ali +%%SSL%%lib/aws/ssl-thin__openssl.ali +bin/ada2wsdl +bin/aws_password +bin/awsres +bin/webxref +bin/wsdl2aws include/aws/aws-attachments.adb include/aws/aws-attachments.ads include/aws/aws-client-hotplug.ads @@ -249,6 +454,7 @@ include/aws/aws-containers-tables.ads include/aws/aws-containers.ads include/aws/aws-cookie.ads include/aws/aws-default.ads +include/aws/aws-digest.adb include/aws/aws-digest.ads include/aws/aws-dispatchers-callback.adb include/aws/aws-dispatchers-callback.ads @@ -265,11 +471,6 @@ include/aws/aws-hotplug.ads include/aws/aws-jabber-client.ads include/aws/aws-jabber-digest_md5.ads include/aws/aws-jabber.ads -%%LDAP%%include/aws/aws-ldap-client.adb -%%LDAP%%include/aws/aws-ldap-client.ads -%%LDAP%%include/aws/aws-ldap-thin.adb -%%LDAP%%include/aws/aws-ldap-thin.ads -%%LDAP%%include/aws/aws-ldap.ads include/aws/aws-log.ads include/aws/aws-messages.adb include/aws/aws-messages.ads @@ -286,22 +487,11 @@ include/aws/aws-net-log.ads include/aws/aws-net-poll_events-wait__native.adb include/aws/aws-net-poll_events.ads include/aws/aws-net-sets.ads -%%SSL%%include/aws/aws-net-ssl-certificate-impl__openssl.adb -%%SSL%%include/aws/aws-net-ssl-certificate-impl__openssl.ads -%%GNUTLS%%include/aws/aws-net-ssl-certificate-impl__gnutls.adb -%%GNUTLS%%include/aws/aws-net-ssl-certificate-impl__gnutls.ads -%%NOSSL%%include/aws/aws-net-ssl-certificate-impl__dummy.adb -%%NOSSL%%include/aws/aws-net-ssl-certificate-impl__dummy.ads include/aws/aws-net-ssl-certificate.adb include/aws/aws-net-ssl-certificate.ads include/aws/aws-net-ssl-rsa_dh_generators.ads include/aws/aws-net-ssl.ads -%%SSL%%include/aws/aws-net-ssl__openssl.adb -%%GNUTLS%%include/aws/aws-net-ssl__gnutls.adb -%%NOSSL%%include/aws/aws-net-ssl__dummy.adb include/aws/aws-net-std.ads -%%NO_IP6%%include/aws/aws-net-std__gnat.adb -%%IP6%%include/aws/aws-net-std__ipv6.adb include/aws/aws-net-stream_io.adb include/aws/aws-net-stream_io.ads include/aws/aws-net-websocket-handshake_error.adb @@ -310,13 +500,14 @@ include/aws/aws-net-websocket-protocol-draft76.ads include/aws/aws-net-websocket-protocol-rfc6455.ads include/aws/aws-net-websocket-protocol.ads include/aws/aws-net-websocket-registry-control.ads -include/aws/aws-net-websocket-registry-watch.ads +include/aws/aws-net-websocket-registry-utils.ads include/aws/aws-net-websocket-registry.ads include/aws/aws-net-websocket.ads include/aws/aws-net.adb include/aws/aws-net.ads include/aws/aws-os_lib.ads include/aws/aws-parameters-set.ads +include/aws/aws-parameters.adb include/aws/aws-parameters.ads include/aws/aws-pop.adb include/aws/aws-pop.ads @@ -412,7 +603,6 @@ include/aws/inffast.h include/aws/inffixed.h include/aws/inflate.h include/aws/inftrees.h -include/aws/makefile include/aws/memory_streams.adb include/aws/memory_streams.ads include/aws/soap-client.ads @@ -433,14 +623,14 @@ include/aws/soap-types.adb include/aws/soap-types.ads include/aws/soap-utils.adb include/aws/soap-utils.ads +include/aws/soap-wsdl-name_spaces.ads include/aws/soap-wsdl-parameters.ads include/aws/soap-wsdl-parser.ads +include/aws/soap-wsdl-schema.ads +include/aws/soap-wsdl-types.ads include/aws/soap-wsdl.ads include/aws/soap-xml.ads include/aws/soap.ads -%%SSL%%include/aws/ssl-thin__openssl.ads -%%GNUTLS%%include/aws/ssl-thin__gnutls.ads -%%NOSSL%%include/aws/ssl-thin__dummy.ads include/aws/ssl.ads include/aws/trees.h include/aws/zconf.h @@ -452,170 +642,6 @@ include/aws/zlib.adb include/aws/zlib.ads include/aws/zlib.h include/aws/zutil.h -%%SHARED%%lib/aws.relocatable/aws-attachments.ali -%%SHARED%%lib/aws.relocatable/aws-client-hotplug.ali -%%SHARED%%lib/aws.relocatable/aws-client-http_utils.ali -%%SHARED%%lib/aws.relocatable/aws-client-xml-input_sources.ali -%%SHARED%%lib/aws.relocatable/aws-client-xml.ali -%%SHARED%%lib/aws.relocatable/aws-client.ali -%%SHARED%%lib/aws.relocatable/aws-communication-client.ali -%%SHARED%%lib/aws.relocatable/aws-communication-server.ali -%%SHARED%%lib/aws.relocatable/aws-communication.ali -%%SHARED%%lib/aws.relocatable/aws-config-ini.ali -%%SHARED%%lib/aws.relocatable/aws-config-set.ali -%%SHARED%%lib/aws.relocatable/aws-config-utils.ali -%%SHARED%%lib/aws.relocatable/aws-config.ali -%%SHARED%%lib/aws.relocatable/aws-containers-key_value.ali -%%SHARED%%lib/aws.relocatable/aws-containers-memory_streams.ali -%%SHARED%%lib/aws.relocatable/aws-containers-string_vectors.ali -%%SHARED%%lib/aws.relocatable/aws-containers-tables-set.ali -%%SHARED%%lib/aws.relocatable/aws-containers-tables.ali -%%SHARED%%lib/aws.relocatable/aws-containers.ali -%%SHARED%%lib/aws.relocatable/aws-cookie.ali -%%SHARED%%lib/aws.relocatable/aws-default.ali -%%SHARED%%lib/aws.relocatable/aws-digest.ali -%%SHARED%%lib/aws.relocatable/aws-dispatchers-callback.ali -%%SHARED%%lib/aws.relocatable/aws-dispatchers.ali -%%SHARED%%lib/aws.relocatable/aws-exceptions.ali -%%SHARED%%lib/aws.relocatable/aws-headers-set.ali -%%SHARED%%lib/aws.relocatable/aws-headers-values.ali -%%SHARED%%lib/aws.relocatable/aws-headers.ali -%%SHARED%%lib/aws.relocatable/aws-hotplug-get_status.ali -%%SHARED%%lib/aws.relocatable/aws-hotplug.ali -%%SHARED%%lib/aws.relocatable/aws-jabber-client.ali -%%SHARED%%lib/aws.relocatable/aws-jabber-digest_md5.ali -%%SHARED%%lib/aws.relocatable/aws-jabber.ali -%%LDAP%%%%SHARED%%lib/aws.relocatable/aws-ldap-client.ali -%%LDAP%%%%SHARED%%lib/aws.relocatable/aws-ldap-thin.ali -%%LDAP%%%%SHARED%%lib/aws.relocatable/aws-ldap.ali -%%SHARED%%lib/aws.relocatable/aws-log.ali -%%SHARED%%lib/aws.relocatable/aws-messages.ali -%%SHARED%%lib/aws.relocatable/aws-mime.ali -%%SHARED%%lib/aws.relocatable/aws-net-acceptors.ali -%%SHARED%%lib/aws.relocatable/aws-net-buffered.ali -%%SHARED%%lib/aws.relocatable/aws-net-generic_sets.ali -%%SHARED%%lib/aws.relocatable/aws-net-log-callbacks.ali -%%SHARED%%lib/aws.relocatable/aws-net-log.ali -%%SHARED%%lib/aws.relocatable/aws-net-poll_events.ali -%%SHARED%%lib/aws.relocatable/aws-net-sets.ali -%%SSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ali -%%GNUTLS%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__gnutls.ali -%%NOSSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__dummy.ali -%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate.ali -%%SHARED%%lib/aws.relocatable/aws-net-ssl-rsa_dh_generators.ali -%%SSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__openssl.ali -%%GNUTLS%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__gnutls.ali -%%NOSSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__dummy.ali -%%NO_IP6%%%%SHARED%%lib/aws.relocatable/aws-net-std__gnat.ali -%%IP6%%%%SHARED%%lib/aws.relocatable/aws-net-std__ipv6.ali -%%SHARED%%lib/aws.relocatable/aws-net-stream_io.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-handshake_error.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-protocol-draft76.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-protocol-rfc6455.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-protocol.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-registry-control.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-registry-watch.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket-registry.ali -%%SHARED%%lib/aws.relocatable/aws-net-websocket.ali -%%SHARED%%lib/aws.relocatable/aws-net.ali -%%SHARED%%lib/aws.relocatable/aws-os_lib.ali -%%SHARED%%lib/aws.relocatable/aws-parameters-set.ali -%%SHARED%%lib/aws.relocatable/aws-parameters.ali -%%SHARED%%lib/aws.relocatable/aws-pop.ali -%%SHARED%%lib/aws.relocatable/aws-resources-embedded.ali -%%SHARED%%lib/aws.relocatable/aws-resources-files.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams-disk-once.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams-disk.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams-memory-zlib.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams-memory.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams-pipe.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams-zlib.ali -%%SHARED%%lib/aws.relocatable/aws-resources-streams.ali -%%SHARED%%lib/aws.relocatable/aws-resources.ali -%%SHARED%%lib/aws.relocatable/aws-response-set.ali -%%SHARED%%lib/aws.relocatable/aws-response.ali -%%SHARED%%lib/aws.relocatable/aws-server-get_status.ali -%%SHARED%%lib/aws.relocatable/aws-server-hotplug.ali -%%SHARED%%lib/aws.relocatable/aws-server-http_utils.ali -%%SHARED%%lib/aws.relocatable/aws-server-log.ali -%%SHARED%%lib/aws.relocatable/aws-server-push.ali -%%SHARED%%lib/aws.relocatable/aws-server-status.ali -%%SHARED%%lib/aws.relocatable/aws-server.ali -%%SHARED%%lib/aws.relocatable/aws-services-callbacks.ali -%%SHARED%%lib/aws.relocatable/aws-services-directory.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-linker.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-method.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-timer.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-transient_pages.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-uri.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers-virtual_host.ali -%%SHARED%%lib/aws.relocatable/aws-services-dispatchers.ali -%%SHARED%%lib/aws.relocatable/aws-services-download.ali -%%SHARED%%lib/aws.relocatable/aws-services-page_server.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages-alpha-bounded.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages-alpha.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages-shared.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages-uniform-alpha.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages-uniform-overlapping.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages-uniform.ali -%%SHARED%%lib/aws.relocatable/aws-services-split_pages.ali -%%SHARED%%lib/aws.relocatable/aws-services-transient_pages-control.ali -%%SHARED%%lib/aws.relocatable/aws-services-transient_pages.ali -%%SHARED%%lib/aws.relocatable/aws-services-web_block-context.ali -%%SHARED%%lib/aws.relocatable/aws-services-web_block-registry.ali -%%SHARED%%lib/aws.relocatable/aws-services-web_block.ali -%%SHARED%%lib/aws.relocatable/aws-services-web_mail.ali -%%SHARED%%lib/aws.relocatable/aws-services.ali -%%SHARED%%lib/aws.relocatable/aws-session-control.ali -%%SHARED%%lib/aws.relocatable/aws-session.ali -%%SHARED%%lib/aws.relocatable/aws-smtp-authentication-plain.ali -%%SHARED%%lib/aws.relocatable/aws-smtp-authentication.ali -%%SHARED%%lib/aws.relocatable/aws-smtp-client.ali -%%SHARED%%lib/aws.relocatable/aws-smtp-messages-set.ali -%%SHARED%%lib/aws.relocatable/aws-smtp-messages.ali -%%SHARED%%lib/aws.relocatable/aws-smtp-server.ali -%%SHARED%%lib/aws.relocatable/aws-smtp.ali -%%SHARED%%lib/aws.relocatable/aws-status-set.ali -%%SHARED%%lib/aws.relocatable/aws-status-translate_set.ali -%%SHARED%%lib/aws.relocatable/aws-status-translate_table.ali -%%SHARED%%lib/aws.relocatable/aws-status.ali -%%SHARED%%lib/aws.relocatable/aws-templates.ali -%%SHARED%%lib/aws.relocatable/aws-translator.ali -%%SHARED%%lib/aws.relocatable/aws-url-raise_url_error.ali -%%SHARED%%lib/aws.relocatable/aws-url-set.ali -%%SHARED%%lib/aws.relocatable/aws-url.ali -%%SHARED%%lib/aws.relocatable/aws-utils-streams.ali -%%SHARED%%lib/aws.relocatable/aws-utils.ali -%%SHARED%%lib/aws.relocatable/aws.ali -%%SHARED%%lib/aws.relocatable/libaws.so -%%SHARED%%lib/aws.relocatable/memory_streams.ali -%%SHARED%%lib/aws.relocatable/soap-client.ali -%%SHARED%%lib/aws.relocatable/soap-dispatchers-callback.ali -%%SHARED%%lib/aws.relocatable/soap-dispatchers.ali -%%SHARED%%lib/aws.relocatable/soap-generator.ali -%%SHARED%%lib/aws.relocatable/soap-message-payload.ali -%%SHARED%%lib/aws.relocatable/soap-message-reader.ali -%%SHARED%%lib/aws.relocatable/soap-message-response-error.ali -%%SHARED%%lib/aws.relocatable/soap-message-response.ali -%%SHARED%%lib/aws.relocatable/soap-message-xml.ali -%%SHARED%%lib/aws.relocatable/soap-message.ali -%%SHARED%%lib/aws.relocatable/soap-name_space.ali -%%SHARED%%lib/aws.relocatable/soap-parameters.ali -%%SHARED%%lib/aws.relocatable/soap-types-untyped.ali -%%SHARED%%lib/aws.relocatable/soap-types.ali -%%SHARED%%lib/aws.relocatable/soap-utils.ali -%%SHARED%%lib/aws.relocatable/soap-wsdl-parameters.ali -%%SHARED%%lib/aws.relocatable/soap-wsdl-parser.ali -%%SHARED%%lib/aws.relocatable/soap-wsdl.ali -%%SHARED%%lib/aws.relocatable/soap-xml.ali -%%SHARED%%lib/aws.relocatable/soap.ali -%%SSL%%%%SHARED%%lib/aws.relocatable/ssl-thin__openssl.ali -%%GNUTLS%%%%SHARED%%lib/aws.relocatable/ssl-thin__gnutls.ali -%%NOSSL%%%%SHARED%%lib/aws.relocatable/ssl-thin__dummy.ali -%%SHARED%%lib/aws.relocatable/ssl.ali -%%SHARED%%lib/aws.relocatable/zlib-streams.ali -%%SHARED%%lib/aws.relocatable/zlib-thin.ali -%%SHARED%%lib/aws.relocatable/zlib.ali lib/aws/aws-attachments.ali lib/aws/aws-client-hotplug.ali lib/aws/aws-client-http_utils.ali @@ -649,9 +675,6 @@ lib/aws/aws-hotplug.ali lib/aws/aws-jabber-client.ali lib/aws/aws-jabber-digest_md5.ali lib/aws/aws-jabber.ali -%%LDAP%%lib/aws/aws-ldap-client.ali -%%LDAP%%lib/aws/aws-ldap-thin.ali -%%LDAP%%lib/aws/aws-ldap.ali lib/aws/aws-log.ali lib/aws/aws-messages.ali lib/aws/aws-mime.ali @@ -662,23 +685,15 @@ lib/aws/aws-net-log-callbacks.ali lib/aws/aws-net-log.ali lib/aws/aws-net-poll_events.ali lib/aws/aws-net-sets.ali -%%SSL%%lib/aws/aws-net-ssl-certificate-impl__openssl.ali -%%GNUTLS%%lib/aws/aws-net-ssl-certificate-impl__gnutls.ali -%%NOSSL%%lib/aws/aws-net-ssl-certificate-impl__dummy.ali lib/aws/aws-net-ssl-certificate.ali lib/aws/aws-net-ssl-rsa_dh_generators.ali -%%SSL%%lib/aws/aws-net-ssl__openssl.ali -%%GNUTLS%%lib/aws/aws-net-ssl__gnutls.ali -%%NOSSL%%lib/aws/aws-net-ssl__dummy.ali -%%NO_IP6%%lib/aws/aws-net-std__gnat.ali -%%IP6%%lib/aws/aws-net-std__ipv6.ali lib/aws/aws-net-stream_io.ali lib/aws/aws-net-websocket-handshake_error.ali lib/aws/aws-net-websocket-protocol-draft76.ali lib/aws/aws-net-websocket-protocol-rfc6455.ali lib/aws/aws-net-websocket-protocol.ali lib/aws/aws-net-websocket-registry-control.ali -lib/aws/aws-net-websocket-registry-watch.ali +lib/aws/aws-net-websocket-registry-utils.ali lib/aws/aws-net-websocket-registry.ali lib/aws/aws-net-websocket.ali lib/aws/aws-net.ali @@ -768,20 +783,19 @@ lib/aws/soap-parameters.ali lib/aws/soap-types-untyped.ali lib/aws/soap-types.ali lib/aws/soap-utils.ali +lib/aws/soap-wsdl-name_spaces.ali lib/aws/soap-wsdl-parameters.ali lib/aws/soap-wsdl-parser.ali +lib/aws/soap-wsdl-schema.ali +lib/aws/soap-wsdl-types.ali lib/aws/soap-wsdl.ali lib/aws/soap-xml.ali lib/aws/soap.ali -%%SSL%%lib/aws/ssl-thin__openssl.ali -%%GNUTLS%%lib/aws/ssl-thin__gnutls.ali -%%NOSSL%%lib/aws/ssl-thin__dummy.ali lib/aws/ssl.ali lib/aws/zlib-streams.ali lib/aws/zlib-thin.ali lib/aws/zlib.ali lib/gnat/aws.gpr -%%SHARED%%lib/libaws.so share/gpr/aws.gpr share/gps/plug-ins/ada2wsdl.xml share/gps/plug-ins/aws.py diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile index ebf746c120e7..71c8b85006f3 100644 --- a/x11-toolkits/gtkada3/Makefile +++ b/x11-toolkits/gtkada3/Makefile @@ -2,69 +2,58 @@ # $FreeBSD$ PORTNAME= gtkada -PORTVERSION= 3.8.3.1 -PORTREVISION= 1 +PORTVERSION= 3.8.3.2 CATEGORIES= x11-toolkits MASTER_SITES= http://downloads.dragonlace.net/src/ PKGNAMESUFFIX= 3 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - gtkada-rm-${RM_VERSION}${EXTRACT_SUFX} +DISTFILES= gtkada-for-gps-6.1.1-src.tar.gz MAINTAINER= marino@FreeBSD.org COMMENT= Ada graphical toolkit based on Gtk3 components LICENSE= GPLv3 -USES= ada gmake perl5 pkgconfig tar:bzip2 +BUILD_DEPENDS= gprbuild:${PORTSDIR}/devel/gprbuild + +USES= ada gmake perl5 pkgconfig USE_PERL5= build USE_GNOME= gtk30 USE_GL= gl glu GNU_CONFIGURE= yes -ALL_TARGET= src +ALL_TARGET= tools static relocatable NO_MTREE= yes +WRKSRC= ${WRKDIR}/gtkada-gpl-2015-src PORTDOCS= gtkada_rm gtkada_ug PORTEXAMPLES= testgtk RM_VERSION= 3.8.3.0 +LDFLAGS= -L${LOCALBASE}/lib -MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} \ - GL_SUPPORT=yes +MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} CONFLICTS_INSTALL= gtkada-* CONFIGURE_ARGS+= --with-GL=auto \ - --disable-gtkextra + --enable-shared \ + --enable-static OPTIONS_DEFINE= DOCS NLS EXAMPLES DEBUG +DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx +DOCS_DISTFILES= gtkada-rm-${RM_VERSION}.tar.bz2 +DOCS_ALL_TARGET= docs +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +EXAMPLES_ALL_TARGET= tests .include -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx -.endif - -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --enable-nls -USES+= gettext -.else -CONFIGURE_ARGS+= --disable-nls -.endif - .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-build=Debug .else CONFIGURE_ARGS+= --enable-build=Production .endif -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= docs -.endif - -.if ${PORT_OPTIONS:MEXAMPLES} -ALL_TARGET+= tests -.endif - post-extract: -.if ${PORTVERSION} != ${RM_VERSION} +.if ${PORT_OPTIONS:MDOCS} ${MV} ${WRKDIR}/gtkada-${RM_VERSION}/docs/* ${WRKSRC}/docs/ .endif @@ -76,7 +65,11 @@ do-build: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libdata - @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/ - ${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources + ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/ + ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources + ${RM} ${STAGEDIR}${PREFIX}/lib/libgtkada* + (cd ${STAGEDIR}${PREFIX}/lib && \ + ${LN} -s gtkada/relocatable/libgtkada.so.3.8.3 libgtkada.so && \ + ${LN} -s gtkada/relocatable/libgtkada_gl.so.3.8.3 libgtkada_gl.so) .include diff --git a/x11-toolkits/gtkada3/distinfo b/x11-toolkits/gtkada3/distinfo index 21c19239c92a..6102fc5fa8ac 100644 --- a/x11-toolkits/gtkada3/distinfo +++ b/x11-toolkits/gtkada3/distinfo @@ -1,4 +1,4 @@ -SHA256 (gtkada-3.8.3.1.tar.bz2) = 7131011c7b6a78f5a944901f1db414f825b38fc696263ce7da442f5edb253058 -SIZE (gtkada-3.8.3.1.tar.bz2) = 3062671 +SHA256 (gtkada-for-gps-6.1.1-src.tar.gz) = 5b7b777bb2f79ca276cf0d4778e21b77462c7066ea52fdf957b482d4699d58b0 +SIZE (gtkada-for-gps-6.1.1-src.tar.gz) = 11298808 SHA256 (gtkada-rm-3.8.3.0.tar.bz2) = 445ed11620108a80ba76787b073f1c7b8931786bebaacc5c07710a35acac0991 SIZE (gtkada-rm-3.8.3.0.tar.bz2) = 3368348 diff --git a/x11-toolkits/gtkada3/files/patch-Makefile.in b/x11-toolkits/gtkada3/files/patch-Makefile.in new file mode 100644 index 000000000000..7589cb3d6a8c --- /dev/null +++ b/x11-toolkits/gtkada3/files/patch-Makefile.in @@ -0,0 +1,26 @@ +--- Makefile.in.orig 2015-06-01 14:38:17 UTC ++++ Makefile.in +@@ -70,7 +70,7 @@ all: tools tests + static: build_library_type/static + relocatable: build_library_type/relocatable + +-tools: ++tools: src/gtkada-intl.adb + @echo "====== Building tools =====" + ${GPRBUILD_FULL} -XLIBRARY_TYPE=static -Psrc/tools/tools.gpr + +@@ -142,11 +142,11 @@ ifeq (${HAVE_OPENGL},True) + endif + + @# install executables +- ${INSTALL_PROGRAM} src/tools/gtkada-config ${bindir} +- ${INSTALL_PROGRAM} src/obj/tools/gtkada-dialog${EXEEXT} ${bindir} ++ ${BSD_INSTALL_SCRIPT} src/tools/gtkada-config ${bindir} ++ ${BSD_INSTALL_PROGRAM} src/obj/tools/gtkada-dialog${EXEEXT} ${bindir} + + @# install testgtk +- -${INSTALL_PROGRAM} testgtk/testgtk${EXEEXT} ${exampledir} ++ -${BSD_INSTALL_PROGRAM} testgtk/testgtk${EXEEXT} ${exampledir} + ${CP} testgtk/*.ad? testgtk/*.xpm testgtk/*.png testgtk/*.gif testgtk/*.lwo testgtk/*.xml testgtk/*.css testgtk/*.ui ${exampledir} + + $(MAKE) -C $(projects_dir) install diff --git a/x11-toolkits/gtkada3/files/patch-configure b/x11-toolkits/gtkada3/files/patch-configure index 259655a19c43..9d210c5d24ea 100644 --- a/x11-toolkits/gtkada3/files/patch-configure +++ b/x11-toolkits/gtkada3/files/patch-configure @@ -1,12 +1,23 @@ ---- configure.orig 2014-05-18 00:52:57.000000000 +0000 +--- configure.orig 2015-06-01 14:38:18 UTC +++ configure -@@ -2158,6 +2158,9 @@ fi +@@ -2107,6 +2107,11 @@ fi ac_GNATLIB=`cd $ac_GNATDIR; ls libgnat-*.dll | sed 's,lib,,;s,.dll,,'` OS_SPECIFIC_LINK_OPTIONS=-Wl,-L$ac_GNATDIR,-l$ac_GNATLIB ;; + *dragonfly*|*bsd*) -+ TARGET_LFLAGS="-lm" ++ if test x$CAN_BUILD_SHARED = xyes ; then ++ BUILD_SHARED=yes ++ fi + ;; *darwin*) SO_EXT=.dylib - if test x$CAN_BUILD_SHARED = xyes ; then + NEED_OBJECTIVE_C=yes +@@ -3605,7 +3610,7 @@ $as_echo_n "checking for GTK - version > + GTK_CFLAGS=`$PKG_CONFIG $GTK --cflags` + GTK_LIBS=`$PKG_CONFIG $GTK gmodule-2.0 --libs` + +- GTK_LIBS="$GTK_LIBS $LDFLAGS" ++ GTK_LIBS="$GTK_LIBS $LDFLAGS -lm -lX11" + + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" diff --git a/x11-toolkits/gtkada3/files/patch-docs_Makefile.in b/x11-toolkits/gtkada3/files/patch-docs_Makefile.in index 7c127e0df0ec..55e6273db50a 100644 --- a/x11-toolkits/gtkada3/files/patch-docs_Makefile.in +++ b/x11-toolkits/gtkada3/files/patch-docs_Makefile.in @@ -1,4 +1,4 @@ ---- docs/Makefile.in.orig 2014-05-18 00:53:01.000000000 +0000 +--- docs/Makefile.in.orig 2015-06-01 14:38:17 UTC +++ docs/Makefile.in @@ -4,14 +4,12 @@ CP=cp -p MKDIR=mkdir -p diff --git a/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads b/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads deleted file mode 100644 index 0a8c460c8a9b..000000000000 --- a/x11-toolkits/gtkada3/files/patch-src_gtkada-canvas__view.ads +++ /dev/null @@ -1,89 +0,0 @@ ---- src/gtkada-canvas_view.ads.orig 2014-05-23 15:49:01 UTC -+++ src/gtkada-canvas_view.ads -@@ -372,7 +372,7 @@ package Gtkada.Canvas_View is - - function Is_Link - (Self : not null access Abstract_Item_Record) -- return Boolean is (False); -+ return Boolean is abstract; - -- Whether this item should be considered as a link between two other - -- items. - -- Such links have a few specific behavior: for instance, they cannot be -@@ -448,7 +448,7 @@ package Gtkada.Canvas_View is - function Edit_Widget - (Self : not null access Abstract_Item_Record; - View : not null access Canvas_View_Record'Class) -- return Gtk.Widget.Gtk_Widget is (null); -+ return Gtk.Widget.Gtk_Widget is abstract; - -- Return the widget to use for in-place editing of the item. - -- null should be returned when the item is not editable in place. - -- It is the responsibility of the returned widget to monitor events and -@@ -463,7 +463,7 @@ package Gtkada.Canvas_View is - - function Parent - (Self : not null access Abstract_Item_Record) -- return Abstract_Item is (null); -+ return Abstract_Item is abstract; - -- Return the item inside which Self is contained. - -- null is returned for toplevel items, in which case the coordinates of - -- the bounding box are model coordinats. Otherwise, the coordinates are -@@ -478,7 +478,7 @@ package Gtkada.Canvas_View is - (Self : not null access Abstract_Item_Record; - At_Point : Model_Point; - Context : Draw_Context) -- return Abstract_Item is (Self); -+ return Abstract_Item is abstract; - -- Return the inner-most item at the specific coordinates in Self (or - -- Self itself). - -@@ -509,7 +509,7 @@ package Gtkada.Canvas_View is - - function Is_Invisible - (Self : not null access Abstract_Item_Record) -- return Boolean is (False); -+ return Boolean is abstract; - -- True if Self has no filling or stroke information (and therefore is - -- invisible even when displayed, although some of its children might be - -- visible). -@@ -526,6 +526,19 @@ package Gtkada.Canvas_View is - -- It is easier to derive from this type when you want to create your own - -- items, unless you want complete control of the data storage. - -+ overriding function Is_Link -+ (Self : not null access Canvas_Item_Record) return Boolean is (False); -+ overriding function Parent -+ (Self : not null access Canvas_Item_Record) -+ return Abstract_Item is (null); -+ overriding function Is_Invisible -+ (Self : not null access Canvas_Item_Record) -+ return Boolean is (False); -+ function Inner_Most_Item -+ (Self : not null access Canvas_Item_Record; -+ At_Point : Model_Point; -+ Context : Draw_Context) -+ return Abstract_Item is (Self); - overriding function Position - (Self : not null access Canvas_Item_Record) return Gtkada.Style.Point; - overriding function Contains -@@ -1583,6 +1596,21 @@ package Gtkada.Canvas_View is - -- Return the computed points for the link. - -- Do not free or store the result - -+ overriding function Is_Invisible -+ (Self : not null access Canvas_Link_Record) -+ return Boolean is (False); -+ overriding function Inner_Most_Item -+ (Self : not null access Canvas_Link_Record; -+ At_Point : Model_Point; -+ Context : Draw_Context) -+ return Abstract_Item is (null); -+ overriding function Parent -+ (Self : not null access Canvas_Link_Record) -+ return Abstract_Item is (null); -+ overriding function Edit_Widget -+ (Self : not null access Canvas_Link_Record; -+ View : not null access Canvas_View_Record'Class) -+ return Gtk.Widget.Gtk_Widget is (null); - overriding procedure Destroy - (Self : not null access Canvas_Link_Record; - In_Model : not null access Canvas_Model_Record'Class); diff --git a/x11-toolkits/gtkada3/pkg-plist b/x11-toolkits/gtkada3/pkg-plist index 4512556c2e29..1b4af741b5c6 100644 --- a/x11-toolkits/gtkada3/pkg-plist +++ b/x11-toolkits/gtkada3/pkg-plist @@ -44,6 +44,8 @@ include/gtkada/gdk-frame_clock.adb include/gtkada/gdk-frame_clock.ads include/gtkada/gdk-frame_timings.adb include/gtkada/gdk-frame_timings.ads +include/gtkada/gdk-gl.adb +include/gtkada/gdk-gl.ads include/gtkada/gdk-input.ads include/gtkada/gdk-keyval.adb include/gtkada/gdk-keyval.ads @@ -69,6 +71,8 @@ include/gtkada/gdk-window.ads include/gtkada/gdk-window_attr.adb include/gtkada/gdk-window_attr.ads include/gtkada/gdk.ads +include/gtkada/gl_h.adb +include/gtkada/gl_h.ads include/gtkada/glib-action.adb include/gtkada/glib-action.ads include/gtkada/glib-action_group.adb @@ -92,6 +96,8 @@ include/gtkada/glib-glist.adb include/gtkada/glib-glist.ads include/gtkada/glib-gnodes.adb include/gtkada/glib-gnodes.ads +include/gtkada/glib-graphs-layouts.adb +include/gtkada/glib-graphs-layouts.ads include/gtkada/glib-graphs.adb include/gtkada/glib-graphs.ads include/gtkada/glib-gslist.adb @@ -137,6 +143,7 @@ include/gtkada/glib-xml.ads include/gtkada/glib-xml_int.ads include/gtkada/glib.adb include/gtkada/glib.ads +include/gtkada/glu_h.ads include/gtkada/gtk-about_dialog.adb include/gtkada/gtk-about_dialog.ads include/gtkada/gtk-accel_group.adb @@ -291,6 +298,8 @@ include/gtkada/gtk-frame.adb include/gtkada/gtk-frame.ads include/gtkada/gtk-gentry.adb include/gtkada/gtk-gentry.ads +include/gtkada/gtk-glarea.adb +include/gtkada/gtk-glarea.ads include/gtkada/gtk-gradient.adb include/gtkada/gtk-gradient.ads include/gtkada/gtk-grange.adb @@ -560,8 +569,14 @@ include/gtkada/gtkada-canvas_view-astar.adb include/gtkada/gtkada-canvas_view-astar.ads include/gtkada/gtkada-canvas_view-links.adb include/gtkada/gtkada-canvas_view-links.ads +include/gtkada/gtkada-canvas_view-models-layers.adb +include/gtkada/gtkada-canvas_view-models-layers.ads +include/gtkada/gtkada-canvas_view-models.adb +include/gtkada/gtkada-canvas_view-models.ads include/gtkada/gtkada-canvas_view-objects.adb include/gtkada/gtkada-canvas_view-objects.ads +include/gtkada/gtkada-canvas_view-rtrees.adb +include/gtkada/gtkada-canvas_view-rtrees.ads include/gtkada/gtkada-canvas_view-views.adb include/gtkada/gtkada-canvas_view-views.ads include/gtkada/gtkada-canvas_view.adb @@ -586,13 +601,6 @@ include/gtkada/gtkada-style.ads include/gtkada/gtkada-types.adb include/gtkada/gtkada-types.ads include/gtkada/gtkada.ads -include/gtkada/opengl/gdk-gl.adb -include/gtkada/opengl/gdk-gl.ads -include/gtkada/opengl/gl_h.adb -include/gtkada/opengl/gl_h.ads -include/gtkada/opengl/glu_h.ads -include/gtkada/opengl/gtk-glarea.adb -include/gtkada/opengl/gtk-glarea.ads include/gtkada/pango-attributes.adb include/gtkada/pango-attributes.ads include/gtkada/pango-cairo.adb @@ -625,7 +633,8 @@ include/gtkada/pango-tabs.adb include/gtkada/pango-tabs.ads include/gtkada/pango.ads lib/gnat/gtkada.gpr -lib/gnat/gtkada_gl.gpr +lib/gnat/gtkada/gtkada.lgpr +lib/gnat/gtkada/gtkada_gl.lgpr lib/gtkada/relocatable/cairo-font_face.ali lib/gtkada/relocatable/cairo-font_options.ali lib/gtkada/relocatable/cairo-image_surface.ali @@ -679,6 +688,7 @@ lib/gtkada/relocatable/glib-g_icon.ali lib/gtkada/relocatable/glib-generic_properties.ali lib/gtkada/relocatable/glib-glist.ali lib/gtkada/relocatable/glib-gnodes.ali +lib/gtkada/relocatable/glib-graphs-layouts.ali lib/gtkada/relocatable/glib-graphs.ali lib/gtkada/relocatable/glib-gslist.ali lib/gtkada/relocatable/glib-key_file.ali @@ -916,7 +926,10 @@ lib/gtkada/relocatable/gtkada-c.ali lib/gtkada/relocatable/gtkada-canvas.ali lib/gtkada/relocatable/gtkada-canvas_view-astar.ali lib/gtkada/relocatable/gtkada-canvas_view-links.ali +lib/gtkada/relocatable/gtkada-canvas_view-models-layers.ali +lib/gtkada/relocatable/gtkada-canvas_view-models.ali lib/gtkada/relocatable/gtkada-canvas_view-objects.ali +lib/gtkada/relocatable/gtkada-canvas_view-rtrees.ali lib/gtkada/relocatable/gtkada-canvas_view-views.ali lib/gtkada/relocatable/gtkada-canvas_view.ali lib/gtkada/relocatable/gtkada-dialogs.ali @@ -930,10 +943,12 @@ lib/gtkada/relocatable/gtkada-printing.ali lib/gtkada/relocatable/gtkada-style.ali lib/gtkada/relocatable/gtkada-types.ali lib/gtkada/relocatable/gtkada.ali -lib/gtkada/relocatable/libgtkada-3.8.so.3 lib/gtkada/relocatable/libgtkada.so +lib/gtkada/relocatable/libgtkada.so.3.8 +lib/gtkada/relocatable/libgtkada.so.3.8.3 lib/gtkada/relocatable/libgtkada_gl.so -lib/gtkada/relocatable/opengl/libgtkada_gl-3.8.so.3 +lib/gtkada/relocatable/libgtkada_gl.so.3.8 +lib/gtkada/relocatable/libgtkada_gl.so.3.8.3 lib/gtkada/relocatable/pango-attributes.ali lib/gtkada/relocatable/pango-cairo.ali lib/gtkada/relocatable/pango-context.ali @@ -1003,6 +1018,7 @@ lib/gtkada/static/glib-g_icon.ali lib/gtkada/static/glib-generic_properties.ali lib/gtkada/static/glib-glist.ali lib/gtkada/static/glib-gnodes.ali +lib/gtkada/static/glib-graphs-layouts.ali lib/gtkada/static/glib-graphs.ali lib/gtkada/static/glib-gslist.ali lib/gtkada/static/glib-key_file.ali @@ -1240,7 +1256,10 @@ lib/gtkada/static/gtkada-c.ali lib/gtkada/static/gtkada-canvas.ali lib/gtkada/static/gtkada-canvas_view-astar.ali lib/gtkada/static/gtkada-canvas_view-links.ali +lib/gtkada/static/gtkada-canvas_view-models-layers.ali +lib/gtkada/static/gtkada-canvas_view-models.ali lib/gtkada/static/gtkada-canvas_view-objects.ali +lib/gtkada/static/gtkada-canvas_view-rtrees.ali lib/gtkada/static/gtkada-canvas_view-views.ali lib/gtkada/static/gtkada-canvas_view.ali lib/gtkada/static/gtkada-dialogs.ali @@ -1255,7 +1274,7 @@ lib/gtkada/static/gtkada-style.ali lib/gtkada/static/gtkada-types.ali lib/gtkada/static/gtkada.ali lib/gtkada/static/libgtkada.a -lib/gtkada/static/opengl/libgtkada_gl.a +lib/gtkada/static/libgtkada_gl.a lib/gtkada/static/pango-attributes.ali lib/gtkada/static/pango-cairo.ali lib/gtkada/static/pango-context.ali @@ -1272,9 +1291,7 @@ lib/gtkada/static/pango-layout.ali lib/gtkada/static/pango-matrix.ali lib/gtkada/static/pango-tabs.ali lib/gtkada/static/pango.ali -lib/libgtkada-3.8.so.3 lib/libgtkada.so -lib/libgtkada_gl-3.8.so.3 lib/libgtkada_gl.so libdata/pkgconfig/gtkada.pc share/gps/plug-ins/gtkada.xml