aboutsummaryrefslogtreecommitdiff
path: root/devel/gnatcoll
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-05-23 08:10:27 +0000
committerJohn Marino <marino@FreeBSD.org>2014-05-23 08:10:27 +0000
commit9e4950a874e24643f01b5294bdec7e25d6bded70 (patch)
tree79fac1fbe787b1329c0cbd9c1d2ccacbd9f99215 /devel/gnatcoll
parent0e7bd0c1c7752d797a479f9c1e016aa0ecd410c8 (diff)
downloadports-9e4950a874e24643f01b5294bdec7e25d6bded70.tar.gz
ports-9e4950a874e24643f01b5294bdec7e25d6bded70.zip
Notes
Diffstat (limited to 'devel/gnatcoll')
-rw-r--r--devel/gnatcoll/Makefile11
-rw-r--r--devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c11
-rw-r--r--devel/gnatcoll/pkg-plist5
3 files changed, 14 insertions, 13 deletions
diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile
index 01b024972b50..365c5ad517b5 100644
--- a/devel/gnatcoll/Makefile
+++ b/devel/gnatcoll/Makefile
@@ -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
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
new file mode 100644
index 000000000000..7c0348d53285
--- /dev/null
+++ b/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c
@@ -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)
diff --git a/devel/gnatcoll/pkg-plist b/devel/gnatcoll/pkg-plist
index 21fa4f9d4b4f..71c3676ff018 100644
--- a/devel/gnatcoll/pkg-plist
+++ b/devel/gnatcoll/pkg-plist
@@ -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%%
-@dirrm share/gps/support/core/gnatcoll
-@dirrmtry share/gps/support/core
-@dirrmtry share/gps/support