Update textproc/xmlada to version 4.2.0.0

5 files changed, 90 insertions, 60 deletions

diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index de45205e824..4ab614884e1 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/02/03 18:50:53 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2011/10/09 22:29:44 marino Exp $
 #
 
-DISTNAME=	xmlada-${XMLADA_VERS}-${SNAPSHOT}
-PKGNAME=	xmlada-${XMLADA_VERS}
+DISTNAME=	xmlada-${XMLADA_VERS}
 CATEGORIES=	textproc
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
@@ -14,13 +13,11 @@ COMMENT=	Adacore XML suite for the Ada language
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-XMLADA_VERS=		4.1w
-SNAPSHOT=		20101125
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+XMLADA_VERS=		4.2.0.0
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c # ada is not valid enumeration
-USE_TOOLS=		gmake
-#CONFIGURE_ENV+=		CC=gnatgcc
+USE_TOOLS=		gmake makeinfo
+MAKE_JOBS_SAFE=		no
 
 # no special configuration options necessary
 pre-configure:
diff --git a/textproc/xmlada/PLIST b/textproc/xmlada/PLIST
index 52901e2e9b0..c2de18911ae 100644
--- a/textproc/xmlada/PLIST
+++ b/textproc/xmlada/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/03 18:50:55 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/10/09 22:29:44 marino Exp $
 bin/xmlada-config
 lib/gnat/xmlada.gpr
 lib/gnat/xmlada_dom.gpr
@@ -13,15 +13,15 @@ lib/gnat/xmlada/xmlada_sax.lgpr
 lib/gnat/xmlada/xmlada_schema.lgpr
 lib/gnat/xmlada/xmlada_unicode.lgpr
 lib/libxmlada_dom.so.4
-lib/libxmlada_dom.so.4.1w
+lib/libxmlada_dom.so.4.2w
 lib/libxmlada_input_sources.so.4
-lib/libxmlada_input_sources.so.4.1w
+lib/libxmlada_input_sources.so.4.2w
 lib/libxmlada_sax.so.4
-lib/libxmlada_sax.so.4.1w
+lib/libxmlada_sax.so.4.2w
 lib/libxmlada_schema.so.4
-lib/libxmlada_schema.so.4.1w
+lib/libxmlada_schema.so.4.2w
 lib/libxmlada_unicode.so.4
-lib/libxmlada_unicode.so.4.1w
+lib/libxmlada_unicode.so.4.2w
 lib/xmlada/static/dom-core-attrs.ali
 lib/xmlada/static/dom-core-cdata_sections.ali
 lib/xmlada/static/dom-core-character_datas.ali
@@ -40,6 +40,7 @@ lib/xmlada/static/dom-readers.ali
 lib/xmlada/static/dom.ali
 lib/xmlada/static/input_sources-file.ali
 lib/xmlada/static/input_sources-http.ali
+lib/xmlada/static/input_sources-socket.ali
 lib/xmlada/static/input_sources-strings.ali
 lib/xmlada/static/input_sources.ali
 lib/xmlada/static/libxmlada_dom.a
@@ -188,23 +189,24 @@ lib/xmlada/relocatable/dom-readers.ali
 lib/xmlada/relocatable/dom.ali
 lib/xmlada/relocatable/input_sources-file.ali
 lib/xmlada/relocatable/input_sources-http.ali
+lib/xmlada/relocatable/input_sources-socket.ali
 lib/xmlada/relocatable/input_sources-strings.ali
 lib/xmlada/relocatable/input_sources.ali
 lib/xmlada/relocatable/libxmlada_dom.so
 lib/xmlada/relocatable/libxmlada_dom.so.4
-lib/xmlada/relocatable/libxmlada_dom.so.4.1w
+lib/xmlada/relocatable/libxmlada_dom.so.4.2w
 lib/xmlada/relocatable/libxmlada_input_sources.so
 lib/xmlada/relocatable/libxmlada_input_sources.so.4
-lib/xmlada/relocatable/libxmlada_input_sources.so.4.1w
+lib/xmlada/relocatable/libxmlada_input_sources.so.4.2w
 lib/xmlada/relocatable/libxmlada_sax.so
 lib/xmlada/relocatable/libxmlada_sax.so.4
-lib/xmlada/relocatable/libxmlada_sax.so.4.1w
+lib/xmlada/relocatable/libxmlada_sax.so.4.2w
 lib/xmlada/relocatable/libxmlada_schema.so
 lib/xmlada/relocatable/libxmlada_schema.so.4
-lib/xmlada/relocatable/libxmlada_schema.so.4.1w
+lib/xmlada/relocatable/libxmlada_schema.so.4.2w
 lib/xmlada/relocatable/libxmlada_unicode.so
 lib/xmlada/relocatable/libxmlada_unicode.so.4
-lib/xmlada/relocatable/libxmlada_unicode.so.4.1w
+lib/xmlada/relocatable/libxmlada_unicode.so.4.2w
 lib/xmlada/relocatable/sax-attributes.ali
 lib/xmlada/relocatable/sax-encodings.ali
 lib/xmlada/relocatable/sax-exceptions.ali
@@ -358,6 +360,8 @@ include/xmlada/input_sources-file.adb
 include/xmlada/input_sources-file.ads
 include/xmlada/input_sources-http.adb
 include/xmlada/input_sources-http.ads
+include/xmlada/input_sources-socket.adb
+include/xmlada/input_sources-socket.ads
 include/xmlada/input_sources-strings.adb
 include/xmlada/input_sources-strings.ads
 include/xmlada/input_sources.adb
diff --git a/textproc/xmlada/distinfo b/textproc/xmlada/distinfo
index c1ae5af5393..3d8af8d3ef0 100644
--- a/textproc/xmlada/distinfo
+++ b/textproc/xmlada/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/02/10 10:43:41 drochner Exp $
+$NetBSD: distinfo,v 1.3 2011/10/09 22:29:44 marino Exp $
 
-SHA1 (xmlada-4.1w-20101125.tar.bz2) = 350d0c2aa58905c3e3e276f5f83775573178c01a
-RMD160 (xmlada-4.1w-20101125.tar.bz2) = fd6f6e870585376416b35dd5e0d422eee89c6d25
-Size (xmlada-4.1w-20101125.tar.bz2) = 701742 bytes
-SHA1 (patch-aa) = 5b72eef334bd1172c2040af6f7541ec4c62f880c
+SHA1 (xmlada-4.2.0.0.tar.bz2) = b52984f60cf6b1486495ea92ea9dca7d0892ebc3
+RMD160 (xmlada-4.2.0.0.tar.bz2) = 494e4c6a93bbe18251633bb4a7ac452821a38a93
+Size (xmlada-4.2.0.0.tar.bz2) = 668384 bytes
+SHA1 (patch-aa) = 3f5524f211695823c7032f5cf5438b415b9f0a1d
+SHA1 (patch-ab) = 3fa075e307471b09eb5db49972fcb7807d41ac53
diff --git a/textproc/xmlada/patches/patch-aa b/textproc/xmlada/patches/patch-aa
index f36eb8b2d74..b3c9fc42b70 100644
--- a/textproc/xmlada/patches/patch-aa
+++ b/textproc/xmlada/patches/patch-aa
@@ -1,10 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2011/02/10 10:43:41 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2011/10/09 22:29:44 marino Exp $
 
-support DESTDIR
-
---- Makefile.in.orig	2010-11-25 15:44:56.000000000 +0000
+--- Makefile.in.orig	2011-10-08 19:19:00.000000000 +0000
 +++ Makefile.in
-@@ -91,51 +91,49 @@ docs: force
+@@ -52,10 +52,10 @@ MAKE_ARGS=-XMODE=${MODE} -XLIBRARY_TYPE=
+ .PHONY: all obj clean install install_dirs build_library_type install_library_type
+ 
+ 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,51 @@ docs: force
  
  # Rule for installing the modules
  %_inst: force
@@ -14,32 +25,36 @@ support DESTDIR
 -	-${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
-+	-cd $(DESTDIR)${xmllib}; ${CHMOD} ugo+w *.ali
-+	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali   $(DESTDIR)${xmllib}
++	${CP} $*/*.ad[bs]        ${DESTDIR}${includedir}/xmlada
++	cd $*; ls *.ad[bs] > ${DESTDIR}${libdir}/gnat/xmlada/xmlada_$*.lgpr
++	-cd ${DESTDIR}${xmllib}; ${CHMOD} ugo+w *.ali
++	-${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} $*/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} ${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}
++	${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}
  endif
  endif
 -	cd ${xmllib}; ${CHMOD} ugo-w *.ali
-+	cd $(DESTDIR)${xmllib}; ${CHMOD} ugo-w *.ali
++	cd ${DESTDIR}${xmllib}; ${CHMOD} ugo-w *.ali
  
  install_dirs: force
 -	@${MKDIR} ${bindir}
@@ -48,12 +63,12 @@ support DESTDIR
 -	@${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)${datadir}/doc/xmlada
-+	@${MKDIR} $(DESTDIR)${includedir}/xmlada
-+	@${MKDIR} $(DESTDIR)${datadir}/gps/plug-ins/
++	@${MKDIR} ${DESTDIR}${bindir}
++	@${MKDIR} ${DESTDIR}${xmllib}
++	@${MKDIR} ${DESTDIR}${libdir}/gnat/xmlada
++	@${MKDIR} ${DESTDIR}${datadir}/doc/xmlada
++	@${MKDIR} ${DESTDIR}${includedir}/xmlada
++	@${MKDIR} ${DESTDIR}${datadir}/gps/plug-ins/
  
  ## Do the installation for either shared or static, depending on
  ## $LIBRARY_TYPE
@@ -66,22 +81,24 @@ support DESTDIR
 -	${INSTALL} distrib/xmlada_schema.gpr         ${libdir}/gnat/
 -	${INSTALL} distrib/xmlada_unicode.gpr        ${libdir}/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
 -	${CHMOD} +x ${bindir}/xmlada-config
 -	${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
-+	${INSTALL} distrib/xmlada_shared.gpr         $(DESTDIR)${libdir}/gnat
-+	${INSTALL} distrib/xmlada.gpr                $(DESTDIR)${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_dom.gpr            $(DESTDIR)${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_sax.gpr            $(DESTDIR)${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_input.gpr          $(DESTDIR)${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_schema.gpr         $(DESTDIR)${libdir}/gnat/
-+	${INSTALL} distrib/xmlada_unicode.gpr        $(DESTDIR)${libdir}/gnat/
-+	${INSTALL} xmlada-config  $(DESTDIR)${bindir}
-+	-${INSTALL} docs/xml.html $(DESTDIR)${datadir}/doc/xmlada
-+	-${INSTALL} docs/xml.info $(DESTDIR)${datadir}/doc/xmlada
-+	${CHMOD} +x $(DESTDIR)${bindir}/xmlada-config
-+	${INSTALL} distrib/xmlada_gps.py $(DESTDIR)${datadir}/gps/plug-ins/
++	${INSTALL} distrib/xmlada_shared.gpr         ${DESTDIR}${libdir}/gnat
++	${INSTALL} distrib/xmlada.gpr                ${DESTDIR}${libdir}/gnat/
++	${INSTALL} distrib/xmlada_dom.gpr            ${DESTDIR}${libdir}/gnat/
++	${INSTALL} distrib/xmlada_sax.gpr            ${DESTDIR}${libdir}/gnat/
++	${INSTALL} distrib/xmlada_input.gpr          ${DESTDIR}${libdir}/gnat/
++	${INSTALL} distrib/xmlada_schema.gpr         ${DESTDIR}${libdir}/gnat/
++	${INSTALL} distrib/xmlada_unicode.gpr        ${DESTDIR}${libdir}/gnat/
++	${INSTALL} xmlada-config  ${DESTDIR}${bindir}
++	-${INSTALL} docs/xml.html ${DESTDIR}${datadir}/doc/xmlada
++	-${INSTALL} docs/xml.info ${DESTDIR}${datadir}/doc/xmlada
++	${CHMOD} +x ${DESTDIR}${bindir}/xmlada-config
++	${INSTALL} distrib/xmlada_gps.py ${DESTDIR}${datadir}/gps/plug-ins/
  
  ## Do the installation for an explicit target
  install_static: 
diff --git a/textproc/xmlada/patches/patch-ab b/textproc/xmlada/patches/patch-ab
new file mode 100644
index 00000000000..4aa331cfc37
--- /dev/null
+++ b/textproc/xmlada/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2011/10/09 22:29:44 marino Exp $
+
+--- 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@