svn commit: r354919 - in head/devel/gnatcoll: . files

[John Marino]

Author: marino
Date: Fri May 23 08:10:27 2014
New Revision: 354919
URL: http://svnweb.freebsd.org/changeset/ports/354919
QAT: https://qat.redports.org/buildarchive/r354919/

Log:
  devel/gnatcoll: Don't install gps files to avoid conflict with gps
  
  The embedded gnatcoll in GPS wants to install the GPS support files and
  it is better that the embedded gnatcoll does it.
  
  While here, bring in iconv warning fix and also allow python 3 as a
  valid python option (I assume it is without actually testing it).

Added:
  head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c   (contents, props changed)
Modified:
  head/devel/gnatcoll/Makefile
  head/devel/gnatcoll/pkg-plist

Modified: head/devel/gnatcoll/Makefile
==============================================================================
--- head/devel/gnatcoll/Makefile	Fri May 23 08:09:36 2014	(r354918)
+++ head/devel/gnatcoll/Makefile	Fri May 23 08:10:27 2014	(r354919)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnatcoll
 PORTVERSION=	2014
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	${PORTNAME}-gpl-${PORTVERSION}-src
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=	--without-iconv
 .if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--with-python=${PREFIX} \
 			--enable-pygobject
-USE_PYTHON=		2
+USE_PYTHON=		yes
 USE_GNOME=		pygobject3
 PYCOMPILE=		${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
 .else
@@ -98,14 +98,9 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
-pre-install:
-.if ${PORT_OPTIONS:MPYTHON}
-	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/plug-ins
-	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/library
-.endif
-
 post-install:
 	${RM} -rf ${STAGEDIR}${DOCSDIR}/html/_sources
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/gps
 .if ! ${PORT_OPTIONS:MEXAMPLES}
 	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}
 .endif

Added: head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c	Fri May 23 08:10:27 2014	(r354919)
@@ -0,0 +1,11 @@
+--- src/iconv/with_iconv/iconv_support.c.orig	2013-08-21 12:16:12.000000000 +0000
++++ 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)

Modified: head/devel/gnatcoll/pkg-plist
==============================================================================
--- head/devel/gnatcoll/pkg-plist	Fri May 23 08:09:36 2014	(r354918)
+++ head/devel/gnatcoll/pkg-plist	Fri May 23 08:10:27 2014	(r354919)
@@ -300,13 +300,8 @@ lib/gnatcoll/static/libgnatcoll_python.a
 lib/gnatcoll/static/libgnatcoll_readline.a
 lib/gnatcoll/static/libgnatcoll_sqlite.a
 %%DATADIR%%/dborm.py
-share/gps/support/core/gnatcoll/__init__.py
-share/gps/support/core/gnatcoll/runtime.py
 @dirrm include/gnatcoll
 @dirrm lib/gnat/gnatcoll
 @dirrm lib/gnatcoll/static
 @dirrm lib/gnatcoll
 @dirrm %%DATADIR%%
- at dirrm share/gps/support/core/gnatcoll
- at dirrmtry share/gps/support/core
- at dirrmtry share/gps/support