5 files changed, 52 insertions, 17 deletions

diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index 5901b56ff942..83e8d26449d0 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	xmlada
-PORTVERSION=	4.1w
+PORTVERSION=	4.2.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-${SNAPSHOT}.tar.bz2
 
 MAINTAINER=	draco@marino.st
 COMMENT=	Adacore XML suite for the Ada language
 
-BUILD_DEPENDS=	gnat-aux>=20101204:${PORTSDIR}/lang/gnat-aux
+BUILD_DEPENDS=	gnat-aux>=20110325:${PORTSDIR}/lang/gnat-aux
 
-SNAPSHOT=	20101125
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 CC=		gnatgcc
 
diff --git a/textproc/xmlada/distinfo b/textproc/xmlada/distinfo
index ed913e107741..16fbad4df95a 100644
--- a/textproc/xmlada/distinfo
+++ b/textproc/xmlada/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmlada-4.1w-20101125.tar.bz2) = 3999066bed2be7dcfaaa8ff4058e8c9f0f41ef93340c65662a12f67d179ccb9d
-SIZE (xmlada-4.1w-20101125.tar.bz2) = 701742
+SHA256 (xmlada-4.2.0.0.tar.bz2) = c20700e8eda190e31fcc6384aff69428136a50e9e0d3150999abe57d1977642c
+SIZE (xmlada-4.2.0.0.tar.bz2) = 668384
diff --git a/textproc/xmlada/files/patch-Makefile.in b/textproc/xmlada/files/patch-Makefile.in
new file mode 100644
index 000000000000..6af4d69e4973
--- /dev/null
+++ b/textproc/xmlada/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	2011-10-08 21:19:00.000000000 +0200
++++ Makefile.in	2011-10-09 00:50:05.000000000 +0200
+@@ -52,10 +52,10 @@
+ .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
+ 
+@@ -132,8 +132,6 @@
+ 	${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
diff --git a/textproc/xmlada/files/patch-docs__Makefile.in b/textproc/xmlada/files/patch-docs__Makefile.in
new file mode 100644
index 000000000000..0941e777fd1a
--- /dev/null
+++ b/textproc/xmlada/files/patch-docs__Makefile.in
@@ -0,0 +1,9 @@
+--- 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/pkg-plist b/textproc/xmlada/pkg-plist
index 90960c419ab1..502da337664c 100644
--- a/textproc/xmlada/pkg-plist
+++ b/textproc/xmlada/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/xmlada-config
 lib/gnat/xmlada.gpr
 lib/gnat/xmlada_dom.gpr
@@ -30,6 +29,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
@@ -161,15 +161,15 @@ lib/xmlada/static/unicode-names-yi_syllables.ali
 lib/xmlada/static/unicode-names.ali
 lib/xmlada/static/unicode.ali
 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/relocatable/dom-core-attrs.ali
 lib/xmlada/relocatable/dom-core-cdata_sections.ali
 lib/xmlada/relocatable/dom-core-character_datas.ali
@@ -188,23 +188,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 +359,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