Date: Sat, 24 May 2014 21:31:01 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355092 - head/devel/gnatcoll Message-ID: <201405242131.s4OLV1qw021521@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat May 24 21:31:01 2014 New Revision: 355092 URL: http://svnweb.freebsd.org/changeset/ports/355092 QAT: https://qat.redports.org/buildarchive/r355092/ Log: 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. Modified: head/devel/gnatcoll/Makefile head/devel/gnatcoll/pkg-plist Modified: head/devel/gnatcoll/Makefile ============================================================================== --- head/devel/gnatcoll/Makefile Sat May 24 21:26:32 2014 (r355091) +++ head/devel/gnatcoll/Makefile Sat May 24 21:31:01 2014 (r355092) @@ -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=${PRE 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> Modified: head/devel/gnatcoll/pkg-plist ============================================================================== --- head/devel/gnatcoll/pkg-plist Sat May 24 21:26:32 2014 (r355091) +++ head/devel/gnatcoll/pkg-plist Sat May 24 21:31:01 2014 (r355092) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405242131.s4OLV1qw021521>