diff options
| author | John Marino <marino@FreeBSD.org> | 2014-05-24 21:31:01 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-05-24 21:31:01 +0000 |
| commit | a9ee86fad59448245749e0ea9c4a1fa70c33019b (patch) | |
| tree | 4c3b13282f41f8454b32ae9d9cb09c2d666c68e9 | |
| parent | Update to 3.6,1 (diff) | |
devel/gnatcoll4: Rename gnatinspect and toggle off iconv option default
The GNAT Programming Studio wants to use gnatinspect, so it needs to
build it. At the same time, gnatinspect also belongs to gnatcoll.
Resolve a filename conflict by renaming it to gnatinspect-xref when
it's build by gnatcoll.
Also turn off iconv support by default. It causes GPS to crash
almost immediately and the issue is likely within the gnatcoll code.
Until this is investigated and hopefully fixed, keep it off by default.
Also, devel/gnatcoll will not be a dependency of GPS for two reasons:
GPS is so fluid that it really needs the embedded version to guarantee
that it can be built, and secondly devel/gnatcoll and devel/gps could
easily need different build options. So that leaves devel/gnatcoll as
purely a standalone development library.
| -rw-r--r-- | devel/gnatcoll/Makefile | 10 | ||||
| -rw-r--r-- | devel/gnatcoll/pkg-plist | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile index 365c5ad517b5..ae46bb661fe4 100644 --- a/devel/gnatcoll/Makefile +++ b/devel/gnatcoll/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnatcoll PORTVERSION= 2014 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src @@ -24,7 +24,7 @@ PORTEXAMPLES= * OPTIONS_DEFINE= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV \ DOCS EXAMPLES -OPTIONS_DEFAULT= READLINE SYSLOG SQLITE PYTHON GTK PGSQL ICONV +OPTIONS_DEFAULT= READLINE SYSLOG SQLITE PYTHON GTK PGSQL OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx GTK_LIB_DEPENDS= libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 @@ -62,6 +62,8 @@ CONFIGURE_ARGS+= --with-postgresql=${PREFIX} CONFIGURE_ARGS+= --without-postgresql .endif +# There might be something wrong with iconv support as seen in GPS crash. +# That's why this option is not enabled by default .if ${PORT_OPTIONS:MICONV} USES+= iconv CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX} @@ -104,5 +106,9 @@ post-install: .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 +.endif .include <bsd.port.mk> diff --git a/devel/gnatcoll/pkg-plist b/devel/gnatcoll/pkg-plist index 71c3676ff018..f787747f9c1c 100644 --- a/devel/gnatcoll/pkg-plist +++ b/devel/gnatcoll/pkg-plist @@ -1,5 +1,5 @@ bin/gnatcoll_db2ada -bin/gnatinspect +%%SQLITE%%bin/gnatinspect-xref %%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.adb %%PYTHON%%include/gnatcoll/gnatcoll-any_types-python.ads include/gnatcoll/gnatcoll-any_types.adb |