aboutsummaryrefslogtreecommitdiff
path: root/textproc/xmlada/files
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/xmlada/files')
-rw-r--r--textproc/xmlada/files/patch-Makefile.in127
-rw-r--r--textproc/xmlada/files/patch-docs__Makefile.in9
-rw-r--r--textproc/xmlada/files/patch-dom_dom.gpr10
-rw-r--r--textproc/xmlada/files/patch-input__sources_input__sources.gpr10
-rw-r--r--textproc/xmlada/files/patch-sax_sax.gpr10
-rw-r--r--textproc/xmlada/files/patch-schema_schema.gpr10
6 files changed, 82 insertions, 94 deletions
diff --git a/textproc/xmlada/files/patch-Makefile.in b/textproc/xmlada/files/patch-Makefile.in
index 6a2dc17265ce..9392fe0230e3 100644
--- a/textproc/xmlada/files/patch-Makefile.in
+++ b/textproc/xmlada/files/patch-Makefile.in
@@ -1,57 +1,63 @@
-$NetBSD: patch-aa,v 1.4 2011/12/03 07:30:48 marino Exp $
-
---- Makefile.in.orig 2011-10-08 19:19:00.000000000 +0000
+--- Makefile.in.orig 2013-06-30 18:36:28.000000000 +0000
+++ Makefile.in
-@@ -52,10 +52,10 @@ MAKE_ARGS=-XMODE=${MODE} -XLIBRARY_TYPE=
- .PHONY: all obj clean install install_dirs build_library_type install_library_type
+@@ -83,72 +83,65 @@ run_test_valgrind: test
+ cd dom/test; valgrind --tool=memcheck --leak-check=full ./testxml -auto
- ifeq (${BUILDS_SHARED},yes)
--all: static relocatable
-+all: static relocatable docs
- install: install_static install_relocatable
- else
--all: static
-+all: static docs
- install: install_static
- endif
-
-@@ -91,53 +91,50 @@ docs: force
+ docs: force
+- -${MAKE} -e -C docs html latexpdf
++ -${MAKE} -e -C docs html
# Rule for installing the modules
%_inst: force
- ${CP} $*/*.ad[bs] ${includedir}/xmlada
-- cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr
+- cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr
- -cd ${xmllib}; ${CHMOD} ugo+w *.ali
- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib}
- ${RM} ${libdir}/libxmlada_$**
- ${RM} ${xmllib}libxmlada_$**
-+ ${CP} $*/*.ad[bs] ${DESTDIR}${includedir}/xmlada
-+ cd $*; ls *.ad[bs] > ${DESTDIR}${libdir}/gnat/xmlada/xmlada_$*.lgpr
++ ${CP} $*/*.ad[bs] ${DESTDIR}${includedir}/xmlada
++ cd $*; ls *.ad[bs] > ${DESTDIR}${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr
+ -cd ${DESTDIR}${xmllib}; ${CHMOD} ugo+w *.ali
-+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}${xmllib}
++ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}${xmllib}
+ ${RM} ${DESTDIR}${libdir}/libxmlada_$**
+ ${RM} ${DESTDIR}${xmllib}libxmlada_$**
ifeq (${LIBRARY_TYPE},static)
- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib}
-+ ${INSTALL} -m 644 $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}${xmllib}
++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}${xmllib}
else
- ifeq (${OS},Windows_NT)
-- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib}
-- cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
-+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${DESTDIR}${xmllib}
-+ cd ${DESTDIR}${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
- else
-- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib}
-- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
-- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
-+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}${xmllib}
-+ cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
-+ cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-+ cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-+ cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
+-ifeq (${LIBEXT},.dll)
+- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} ${xmllib}
+- cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT}
+-else
+- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} ${xmllib}
++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} ${DESTDIR}${xmllib}
+
+ @# prefix/lib/xmlada/relocatable/libxmlada.so -> libxmlada.so.4.4.0w
+- cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}
++ cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}
+
+ @# prefix/lib/xmlada/relocatable/libxmlada.so.4.4 -> libxmlada.so.4.4.0w
+- -cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
++ -cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
+
+ @# prefix/lib/xmlada/relocatable/libxmlada.so.4 -> libxmlada.so.4.4.0w
+ ifneq (${basename ${basename ${VERSION}}},${basename ${VERSION}})
+- cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
++ cd ${DESTDIR}${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
+
+ @# prefix/lib/libxmlada.so.4 -> prefix/lib/xmlada/relocatable/libxmlada.so.4.4.0w
+- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
++ cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${basename ${VERSION}}}
endif
+
+ @# prefix/lib/libxmlada.so.4.4 -> prefix/lib/xmlada/relocatable/libxmlada.so.4.4.0w
+- -cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
++ -cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}}
+
+ @# prefix/lib/libxmlada.so.4.4.0w -> prefix/lib/xmlada/relocatable/libxmlada.so.4.4.0w
+- -cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION}
+-endif
++ -cd ${DESTDIR}${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION}
endif
- cd ${xmllib}; ${CHMOD} ugo-w *.ali
+ cd ${DESTDIR}${xmllib}; ${CHMOD} ugo-w *.ali
@@ -59,13 +65,15 @@ $NetBSD: patch-aa,v 1.4 2011/12/03 07:30:48 marino Exp $
install_dirs: force
- @${MKDIR} ${bindir}
- @${MKDIR} ${xmllib}
-- @${MKDIR} ${libdir}/gnat/xmlada
+- @${MKDIR} ${prefix}/lib/gnat/xmlada
+- @${MKDIR} ${libdir}
- @${MKDIR} ${datadir}/doc/xmlada
- @${MKDIR} ${includedir}/xmlada
- @${MKDIR} ${datadir}/gps/plug-ins/
+ @${MKDIR} ${DESTDIR}${bindir}
+ @${MKDIR} ${DESTDIR}${xmllib}
-+ @${MKDIR} ${DESTDIR}${libdir}/gnat/xmlada
++ @${MKDIR} ${DESTDIR}${prefix}/lib/gnat/xmlada
++ @${MKDIR} ${DESTDIR}${libdir}
+ @${MKDIR} ${DESTDIR}${datadir}/doc/xmlada
+ @${MKDIR} ${DESTDIR}${includedir}/xmlada
+ @${MKDIR} ${DESTDIR}${datadir}/gps/plug-ins/
@@ -73,31 +81,28 @@ $NetBSD: patch-aa,v 1.4 2011/12/03 07:30:48 marino Exp $
## Do the installation for either shared or static, depending on
## $LIBRARY_TYPE
install_library_type: install_dirs ${MODULE_INSTALL}
-- ${INSTALL} distrib/xmlada_shared.gpr ${libdir}/gnat
-- ${INSTALL} distrib/xmlada.gpr ${libdir}/gnat/
-- ${INSTALL} distrib/xmlada_dom.gpr ${libdir}/gnat/
-- ${INSTALL} distrib/xmlada_sax.gpr ${libdir}/gnat/
-- ${INSTALL} distrib/xmlada_input.gpr ${libdir}/gnat/
-- ${INSTALL} distrib/xmlada_schema.gpr ${libdir}/gnat/
-- ${INSTALL} distrib/xmlada_unicode.gpr ${libdir}/gnat/
+- ${INSTALL} distrib/xmlada_shared.gpr ${prefix}/lib/gnat/
+- ${INSTALL} distrib/xmlada.gpr ${prefix}/lib/gnat/
+- ${INSTALL} distrib/xmlada_dom.gpr ${prefix}/lib/gnat/
+- ${INSTALL} distrib/xmlada_sax.gpr ${prefix}/lib/gnat/
+- ${INSTALL} distrib/xmlada_input.gpr ${prefix}/lib/gnat/
+- ${INSTALL} distrib/xmlada_schema.gpr ${prefix}/lib/gnat/
+- ${INSTALL} distrib/xmlada_unicode.gpr ${prefix}/lib/gnat/
- ${INSTALL} xmlada-config ${bindir}
-- -${INSTALL} docs/xml.ps ${datadir}/doc/xmlada 2>/dev/null
-- -${INSTALL} docs/xml.pdf ${datadir}/doc/xmlada
-- -${INSTALL} docs/xml.html ${datadir}/doc/xmlada
-- -${INSTALL} docs/xml.info ${datadir}/doc/xmlada
+- -$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null
+- -$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null
- ${CHMOD} +x ${bindir}/xmlada-config
- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
-+ ${INSTALL} -m 644 distrib/xmlada_shared.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} -m 644 distrib/xmlada.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} -m 644 distrib/xmlada_dom.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} -m 644 distrib/xmlada_sax.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} -m 644 distrib/xmlada_input.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} -m 644 distrib/xmlada_schema.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} -m 644 distrib/xmlada_unicode.gpr ${DESTDIR}${libdir}/gnat/
-+ ${INSTALL} xmlada-config ${DESTDIR}${bindir}
-+ ${INSTALL} -m 644 docs/xml.html ${DESTDIR}${datadir}/doc/xmlada
-+ ${INSTALL} -m 644 docs/xml.info ${DESTDIR}${datadir}/doc/xmlada
-+ ${INSTALL} -m 644 distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
++ ${BSD_INSTALL_DATA} distrib/xmlada_shared.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_DATA} distrib/xmlada.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_DATA} distrib/xmlada_dom.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_DATA} distrib/xmlada_sax.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_DATA} distrib/xmlada_input.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_DATA} distrib/xmlada_schema.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_DATA} distrib/xmlada_unicode.gpr ${DESTDIR}${prefix}/lib/gnat/
++ ${BSD_INSTALL_SCRIPT} xmlada-config ${DESTDIR}${bindir}
++ -$(CP) -r docs/_build/html/* ${DESTDIR}$(datadir)/doc/xmlada/ 2>/dev/null
++ ${BSD_INSTALL_DATA} distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
## Do the installation for an explicit target
install_static:
diff --git a/textproc/xmlada/files/patch-docs__Makefile.in b/textproc/xmlada/files/patch-docs__Makefile.in
deleted file mode 100644
index 0941e777fd1a..000000000000
--- a/textproc/xmlada/files/patch-docs__Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- docs/Makefile.in.orig 2011-10-08 21:18:36.000000000 +0200
-+++ docs/Makefile.in 2011-10-09 00:48:58.000000000 +0200
-@@ -1,5 +1,5 @@
-
--FORMATS=${addprefix xml.,pdf html info txt}
-+FORMATS=${addprefix xml.,html info}
-
- DVIPS= @DVIPS@
- MAKEINFO= @MAKEINFO@
diff --git a/textproc/xmlada/files/patch-dom_dom.gpr b/textproc/xmlada/files/patch-dom_dom.gpr
index fd82668c625c..66d1ad82b44c 100644
--- a/textproc/xmlada/files/patch-dom_dom.gpr
+++ b/textproc/xmlada/files/patch-dom_dom.gpr
@@ -1,11 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- dom/dom.gpr.orig 2011-11-11 12:40:42.991596000 +0000
+--- dom/dom.gpr.orig 2013-06-30 18:36:28.000000000 +0000
+++ dom/dom.gpr
-@@ -10,6 +10,7 @@ project Dom is
- for Object_Dir use "obj/" & Project'Library_Kind;
+@@ -11,6 +11,7 @@ project Dom is
for Library_Dir use "lib/" & Project'Library_Kind;
- for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+ for Library_Version use "lib" & Project'Library_Name
+ & Shared.So_Ext & "." & Shared.Version;
+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
package Builder renames Shared.Builder;
diff --git a/textproc/xmlada/files/patch-input__sources_input__sources.gpr b/textproc/xmlada/files/patch-input__sources_input__sources.gpr
index 7860074a6a20..e7708605a971 100644
--- a/textproc/xmlada/files/patch-input__sources_input__sources.gpr
+++ b/textproc/xmlada/files/patch-input__sources_input__sources.gpr
@@ -1,11 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- input_sources/input_sources.gpr.orig 2011-10-08 19:18:37.000000000 +0000
+--- input_sources/input_sources.gpr.orig 2013-06-30 18:36:28.000000000 +0000
+++ input_sources/input_sources.gpr
-@@ -8,6 +8,7 @@ project Input_Sources is
- for Object_Dir use "obj/" & Project'Library_Kind;
+@@ -9,6 +9,7 @@ project Input_Sources is
for Library_Dir use "lib/" & Project'Library_Kind;
- for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+ for Library_Version use "lib" & Project'Library_Name
+ & Shared.So_Ext & "." & Shared.Version;
+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
package Builder renames Shared.Builder;
diff --git a/textproc/xmlada/files/patch-sax_sax.gpr b/textproc/xmlada/files/patch-sax_sax.gpr
index 729be0672433..8353dabb93ab 100644
--- a/textproc/xmlada/files/patch-sax_sax.gpr
+++ b/textproc/xmlada/files/patch-sax_sax.gpr
@@ -1,11 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- sax/sax.gpr.orig 2011-10-08 19:18:44.000000000 +0000
+--- sax/sax.gpr.orig 2013-06-30 18:36:28.000000000 +0000
+++ sax/sax.gpr
-@@ -9,6 +9,7 @@ project Sax is
- for Object_Dir use "obj/" & Project'Library_Kind;
+@@ -10,6 +10,7 @@ project Sax is
for Library_Dir use "lib/" & Project'Library_Kind;
- for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+ for Library_Version use "lib" & Project'Library_Name
+ & Shared.So_Ext & "." & Shared.Version;
+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
package Builder renames Shared.Builder;
diff --git a/textproc/xmlada/files/patch-schema_schema.gpr b/textproc/xmlada/files/patch-schema_schema.gpr
index 16bd402f056e..640b8f760773 100644
--- a/textproc/xmlada/files/patch-schema_schema.gpr
+++ b/textproc/xmlada/files/patch-schema_schema.gpr
@@ -1,11 +1,9 @@
-$NetBSD: patch-af,v 1.2 2012/07/08 20:03:08 marino Exp $
-
---- schema/schema.gpr.orig 2011-10-08 19:18:59.000000000 +0000
+--- schema/schema.gpr.orig 2013-06-30 18:36:28.000000000 +0000
+++ schema/schema.gpr
-@@ -10,6 +10,7 @@ project Schema is
- for Object_Dir use "obj/" & Project'Library_Kind;
+@@ -11,6 +11,7 @@ project Schema is
for Library_Dir use "lib/" & Project'Library_Kind;
- for Library_Version use "lib" & Project'Library_Name & ".so." & Shared.Version;
+ for Library_Version use "lib" & Project'Library_Name
+ & Shared.So_Ext & "." & Shared.Version;
+ for Library_Options use ("-R", "-Wl,-R,@ADDITIONAL_RPATH@");
package Builder renames Shared.Builder;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 23:27:00 +0000