summaryrefslogtreecommitdiff
path: root/x11/gtkada/patches
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2011-10-14 14:02:17 +0000
committermarino <marino@pkgsrc.org>2011-10-14 14:02:17 +0000
commitb7a34fc9c959fa2439ecc298c1737dc1d66540be (patch)
tree08ba0b2fe38102134810ce117d2cdee9e5cd3fa5 /x11/gtkada/patches
parentdfef287860826e46910810844ea633e4772f1806 (diff)
downloadpkgsrc-b7a34fc9c959fa2439ecc298c1737dc1d66540be.tar.gz
x11/gtkada: Add user guide and reference manual documentation
The majority of the documentation for gtkada was not getting built. It turns out that the generation step was omitted from the vendor Makefile. For the user guide, simply adding this to the top-level makefile fixes the problem, but the reference manual is the reason it was omitted. The RM requires Gnat Programming Studio built with Python to generate the documentation. This created a circular dependency because GPS requires gtkada to build and python is optional. Secondly, pkgsrc-built python verions 26 and 27 both cause GPS to core dump. FreeBSD doesn't have this issue, but it has a different python problem that prevents the documentation from getting built manually on that system as well. In the end, the latest generated RM was pulled from libre.adacore.com online resources and packaged separately. This is not ideal because it represents gtkada 2.24 which has a couple of API differences from 2.22, but it's the only full html version of the RM that can be located. Rebuilding gtkada will result in the gtkada User Guild and Reference Manual showing up in the <help> menu of GPS. Currently the gtkada submenu item has an empty submenu.
Diffstat (limited to 'x11/gtkada/patches')
-rw-r--r--x11/gtkada/patches/patch-af12
-rw-r--r--x11/gtkada/patches/patch-ag22
-rw-r--r--x11/gtkada/patches/patch-ah22
-rw-r--r--x11/gtkada/patches/patch-be17
-rw-r--r--x11/gtkada/patches/patch-bf17
5 files changed, 70 insertions, 20 deletions
diff --git a/x11/gtkada/patches/patch-af b/x11/gtkada/patches/patch-af
new file mode 100644
index 00000000000..9f44d459057
--- /dev/null
+++ b/x11/gtkada/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2011/10/14 14:02:17 marino Exp $
+
+--- Makefile.in.orig 2011-10-13 16:16:09.000000000 +0000
++++ Makefile.in
+@@ -16,6 +16,7 @@ all: src tests
+
+ src:
+ $(MAKE) -C $(src_dir)
++ $(MAKE) -C $(doc_dir)
+
+ tests: src
+ $(MAKE) -C $(testgtk_dir)
diff --git a/x11/gtkada/patches/patch-ag b/x11/gtkada/patches/patch-ag
new file mode 100644
index 00000000000..c3e97a3623b
--- /dev/null
+++ b/x11/gtkada/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2011/10/14 14:02:17 marino Exp $
+
+--- docs/Makefile.orig 2010-12-01 21:51:08.000000000 +0000
++++ docs/Makefile
+@@ -1,15 +1,13 @@
+ all::
+- ${MAKE} -C gtkada_rm
+ ${MAKE} -C gtkada_ug
+
+ install::
+- ${MAKE} -C gtkada_rm install
+ ${MAKE} -C gtkada_ug install
++ ${MAKE} -C gtkada_rm_pregen install
+
+ clean::
+- ${MAKE} -C gtkada_rm clean
+ ${MAKE} -C gtkada_ug clean
+
+ distclean::
+- ${MAKE} -C gtkada_rm distclean
+ ${MAKE} -C gtkada_ug distclean
++ ${MAKE} -c gtkada_rm_pregen install
diff --git a/x11/gtkada/patches/patch-ah b/x11/gtkada/patches/patch-ah
new file mode 100644
index 00000000000..0c5bb88fa6c
--- /dev/null
+++ b/x11/gtkada/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2011/10/14 14:02:17 marino Exp $
+
+--- configure.orig 2010-12-01 21:51:08.000000000 +0000
++++ configure
+@@ -3834,7 +3834,7 @@ echo "${ECHO_T}yes" >&6
+ EXEC_PREFIX="$prefix"
+
+
+- ac_config_files="$ac_config_files Makefile src/Makefile.common src/Makefile src/tools/gtkada-config src/tools/gate src/tools/Makefile testgtk/Makefile src/gtkextra/Makefile src/opengl/Makefile src/glade/Makefile src/gnome/Makefile docs/gtkada_ug/Makefile docs/gtkada_rm/Makefile po/Makefile src/config.h projects/gtkada.pc projects/gtkada_install_dynamic.gpr projects/gtkada_install_dynamic_gl.gpr"
++ ac_config_files="$ac_config_files Makefile src/Makefile.common src/Makefile src/tools/gtkada-config src/tools/gate src/tools/Makefile testgtk/Makefile src/gtkextra/Makefile src/opengl/Makefile src/glade/Makefile src/gnome/Makefile docs/gtkada_ug/Makefile docs/gtkada_rm_pregen/Makefile po/Makefile src/config.h projects/gtkada.pc projects/gtkada_install_dynamic.gpr projects/gtkada_install_dynamic_gl.gpr"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -4397,7 +4397,7 @@ do
+ "src/glade/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;;
+ "src/gnome/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnome/Makefile" ;;
+ "docs/gtkada_ug/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/gtkada_ug/Makefile" ;;
+- "docs/gtkada_rm/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/gtkada_rm/Makefile" ;;
++ "docs/gtkada_rm_pregen/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/gtkada_rmi_pregen/Makefile" ;;
+ "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+ "src/config.h" ) CONFIG_FILES="$CONFIG_FILES src/config.h" ;;
+ "projects/gtkada.pc" ) CONFIG_FILES="$CONFIG_FILES projects/gtkada.pc" ;;
diff --git a/x11/gtkada/patches/patch-be b/x11/gtkada/patches/patch-be
deleted file mode 100644
index 63caa21521d..00000000000
--- a/x11/gtkada/patches/patch-be
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
-
---- docs/gtkada_rm/Makefile.in.orig 2011-02-02 18:46:10.000000000 +0000
-+++ docs/gtkada_rm/Makefile.in
-@@ -20,10 +20,10 @@ docgen_clean:
- $(RM) -rf log.txt doc_obj/*
-
- install:
-- -$(MKDIR) $(docdir)
-+ -$(MKDIR) $(DESTDIR)$(docdir)
- -for i in gtkada_rm/*; \
- do \
-- $(INSTALL_DATA) $$i $(docdir); \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
- done
-
- clean: docgen_clean
diff --git a/x11/gtkada/patches/patch-bf b/x11/gtkada/patches/patch-bf
index 0b26996e0d2..643f1572bfc 100644
--- a/x11/gtkada/patches/patch-bf
+++ b/x11/gtkada/patches/patch-bf
@@ -1,8 +1,19 @@
-$NetBSD: patch-bf,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
+$NetBSD: patch-bf,v 1.2 2011/10/14 14:02:17 marino Exp $
---- docs/gtkada_ug/Makefile.in.orig 2011-02-02 18:47:06.000000000 +0000
+--- docs/gtkada_ug/Makefile.in.orig 2010-12-01 21:51:07.000000000 +0000
+++ docs/gtkada_ug/Makefile.in
-@@ -17,10 +17,10 @@ all: gtkada_ug.texi gfdl.texi
+@@ -6,21 +6,16 @@ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+
+ all: gtkada_ug.texi gfdl.texi
+- echo x | tex gtkada_ug.texi
+- texindex gtkada_ug.cp
+- tex gtkada_ug.texi
+- tex gtkada_ug.texi
+- dvips gtkada_ug.dvi -o gtkada_ug.ps
+ perl ../texi2html -menu -monolithic gtkada_ug.texi
+ makeinfo --force -o gtkada_ug.info gtkada_ug.texi
+ makeinfo --force --no-headers --no-split -o gtkada_ug.txt gtkada_ug.texi
-$(RM) *.aux *.cp *.cps *.dvi *.fn *.ky *.log *.pg *.toc *.tp *.vr
install: