summaryrefslogtreecommitdiff
path: root/devel/gnatcoll/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnatcoll/files')
-rw-r--r--devel/gnatcoll/files/patch-Makefile40
-rw-r--r--devel/gnatcoll/files/patch-configure11
-rw-r--r--devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr12
-rw-r--r--devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in21
-rw-r--r--devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c20
5 files changed, 0 insertions, 104 deletions
diff --git a/devel/gnatcoll/files/patch-Makefile b/devel/gnatcoll/files/patch-Makefile
deleted file mode 100644
index 1d35ff0a535d..000000000000
--- a/devel/gnatcoll/files/patch-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.orig 2016-05-12 07:45:17 UTC
-+++ Makefile
-@@ -51,7 +51,7 @@ endif
- #######################################################################
- # install
-
--GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
-+GPRINST_OPTS=-p -f --prefix=$(DESTDIR)${prefix} --install-name=gnatcoll \
- --exec-subdir=${bindir} --project-subdir=lib/gnat \
- --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
-
-@@ -71,9 +71,9 @@ endif
- ${GPRINSTALL} --mode=usage ${GPRINST_OPTS} -Psrc/gnatcoll_tools
-
- install_gps_plugin: force
-- mkdir -p $(prefix)/share/gps/plug-ins
-+ mkdir -p $(DESTDIR)$(prefix)/share/gps/plug-ins
- (cd distrib/ ; tar cf - gnatcoll) | \
-- (cd $(prefix)/share/gps/plug-ins ; tar xf -)
-+ (cd $(DESTDIR)$(prefix)/share/gps/plug-ins ; tar xf -)
-
- # Regenerate part of the sources. Unfortunately, this can be run only after
- # we have build GNATCOLL, and then its tools, even though GNATCOLL itself
-@@ -108,7 +108,7 @@ ifeq ($(OS),Windows_NT)
- -cd $(SQLITE_DIR); gcc -O2 -DSQLITE_OMIT_LOAD_EXTENSION -D__EXTENSIONS__ -o sqlite3_for_gps shell.c sqlite3.c
- else
- # If we fail to compile, never mind. Some tests will simply be disabled
-- -cd $(SQLITE_DIR); gcc -O2 -DSQLITE_OMIT_LOAD_EXTENSION -D__EXTENSIONS__ -o sqlite3_for_gps shell.c sqlite3.c -lpthread -ldl
-+ -cd $(SQLITE_DIR); gcc -O2 -DSQLITE_OMIT_LOAD_EXTENSION -D__EXTENSIONS__ -o sqlite3_for_gps shell.c sqlite3.c -lpthread
- endif
-
- ## Only works after installation, so we should install to a local directory
-@@ -149,6 +149,6 @@ clean: clean_library/static clean_librar
- -${MAKE} -C examples $@
-
- docs:
-- ${MAKE} -C docs html latexpdf
-+ ${MAKE} -C docs html
-
- force:
diff --git a/devel/gnatcoll/files/patch-configure b/devel/gnatcoll/files/patch-configure
deleted file mode 100644
index 981de53a3b57..000000000000
--- a/devel/gnatcoll/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2016-05-19 14:39:16 UTC
-+++ configure
-@@ -3910,7 +3910,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
deleted file mode 100644
index 8452f9324ee9..000000000000
--- a/devel/gnatcoll/files/patch-src_gnatcoll__iconv.gpr
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
- 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/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in b/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in
deleted file mode 100644
index 10e0014f4bed..000000000000
--- a/devel/gnatcoll/files/patch-src_gnatcoll__readline.gpr.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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" =>
- 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/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c b/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c
deleted file mode 100644
index 94d11d041656..000000000000
--- a/devel/gnatcoll/files/patch-src_iconv_with__iconv_iconv__support.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/iconv/with_iconv/iconv_support.c.orig 2015-04-30 10:51:47 UTC
-+++ src/iconv/with_iconv/iconv_support.c
-@@ -6,6 +6,7 @@
- #include <iconv.h>
- #include <errno.h>
- #include <locale.h>
-+#include <sys/param.h>
-
- 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 (__DragonFly__) || \
-+ (defined (__FreeBSD__) && __FreeBSD_version < 1001514)
- size_t gnatcoll_iconv
- (iconv_t cd, const char** inbuf, size_t *inbytesleft, char** outbuf,
- size_t *outbytesleft)