5 files changed, 46 insertions, 29 deletions

diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index 5afe17412959..db98dfaa3ad1 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -2,41 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	liblouisxml
-PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library Provide Complete Braille Transcription Services
 
-LIB_DEPENDS=	louis.2:${PORTSDIR}/devel/liblouis
+LICENSE=	GPLv3
+
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	liblouis.so:${PORTSDIR}/devel/liblouis
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake
+USES=		pkgconfig gmake libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
+USE_GCC=	yes
 
 INFO=		liblouisxml-guide
-MAN1=		msword2brl.1 xml2brl.1
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-extract:
 	@${REINPLACE_CMD} -e \
 		's#@libdir@#${PREFIX}/libdata#g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's#doc lbx_files#lbx_files#g' ${WRKSRC}/Makefile.in
+
+post-build:
+.for i in msword2brl xml2brl pdf2brl rtf2brl
+	@${REINPLACE_CMD} -e 's#/bin/bash#${LOCALBASE}/bin/bash#g' ${WRKSRC}/tools/${i}
+.endfor
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in liblouisxml-guide.html liblouisxml-guide.txt copyright-notice \
-	example_canonical.cfg example_default.cfg example_html.sem example_math.sem
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR}/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in liblouisxml.html liblouisxml.txt
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-	${INSTALL_MAN} ${WRKSRC}/doc/liblouisxml-guide.info ${PREFIX}/info
-	${INSTALL_MAN} ${WRKSRC}/doc/msword2brl.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/xml2brl.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/liblouisxml.info ${STAGEDIR}${PREFIX}/info
 
 .include <bsd.port.mk>
diff --git a/devel/liblouisxml/distinfo b/devel/liblouisxml/distinfo
index b533f6d54635..32a6f14ec654 100644
--- a/devel/liblouisxml/distinfo
+++ b/devel/liblouisxml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liblouisxml-1.8.0.tar.gz) = 5e3e8e604813a6984090137520ba06bb47ac3f96fd90e447d85e411088c8821f
-SIZE (liblouisxml-1.8.0.tar.gz) = 579479
+SHA256 (liblouisxml-2.4.0.tar.gz) = 7dcfcba2d4918e4c2b2bd2b3ec24a8cf86941c252e2d73f3ac2fa25704794912
+SIZE (liblouisxml-2.4.0.tar.gz) = 769296
diff --git a/devel/liblouisxml/files/patch-Makefile.in b/devel/liblouisxml/files/patch-Makefile.in
new file mode 100644
index 000000000000..8546d99fecce
--- /dev/null
+++ b/devel/liblouisxml/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2014-05-15 20:39:14.000000000 +0800
++++ Makefile.in	2014-05-15 20:39:27.000000000 +0800
+@@ -366,7 +366,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = gnulib doc lbx_files liblouisxml tests tools man m4 python
++SUBDIRS = gnulib lbx_files liblouisxml tests tools m4 python
+ ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = liblouisxml.pc
diff --git a/devel/liblouisxml/pkg-descr b/devel/liblouisxml/pkg-descr
index c4344fcf4448..db12f00915f8 100644
--- a/devel/liblouisxml/pkg-descr
+++ b/devel/liblouisxml/pkg-descr
@@ -5,4 +5,4 @@ sheet and the specifications in the document. A command-line
 program, xml2brl which uses this library is also included.
 The latest version of liblouis is required.
 
-WWW:   http://code.google.com/p/liblouisxml/
+WWW: http://code.google.com/p/liblouisxml/
diff --git a/devel/liblouisxml/pkg-plist b/devel/liblouisxml/pkg-plist
index d9ee93e6f560..1746f8aa66f9 100644
--- a/devel/liblouisxml/pkg-plist
+++ b/devel/liblouisxml/pkg-plist
@@ -1,12 +1,15 @@
-bin/mathml2brl
+bin/lbx_devonly
 bin/msword2brl
 bin/xml2brl
+bin/pdf2brl
+bin/rtf2brl
 include/liblouisxml/liblouisxml.h
 include/liblouisxml/louisxml.h
+info/liblouisxml.info
 lib/liblouisxml.a
-lib/liblouisxml.la
 lib/liblouisxml.so
 lib/liblouisxml.so.1
+lib/liblouisxml.so.1.2.0
 libdata/pkgconfig/liblouisxml.pc
 %%DATADIR%%/lbx_files/marburg.sem
 %%DATADIR%%/lbx_files/article.sem
@@ -14,26 +17,26 @@ libdata/pkgconfig/liblouisxml.pc
 %%DATADIR%%/lbx_files/canonical.cfg
 %%DATADIR%%/lbx_files/chapter.sem
 %%DATADIR%%/lbx_files/default.cfg
+%%DATADIR%%/lbx_files/doc.sem
 %%DATADIR%%/lbx_files/document.sem
 %%DATADIR%%/lbx_files/dtbook.sem
 %%DATADIR%%/lbx_files/dtbook3.sem
 %%DATADIR%%/lbx_files/gutbook.sem
 %%DATADIR%%/lbx_files/html.sem
+%%DATADIR%%/lbx_files/marburg.cfg
+%%DATADIR%%/lbx_files/math.sem
 %%DATADIR%%/lbx_files/nemeth.sem
 %%DATADIR%%/lbx_files/package.sem
 %%DATADIR%%/lbx_files/preface.sem
 %%DATADIR%%/lbx_files/set.sem
 %%DATADIR%%/lbx_files/ThML.sem
+%%DATADIR%%/lbx_files/ukmaths.cfg
+%%DATADIR%%/lbx_files/ukmaths.sem
 %%DATADIR%%/lbx_files/wordDocument.sem
 %%DATADIR%%/lbx_files/Workbook.sem
 %%DATADIR%%/lbx_files/w_wordDocument.sem
-%%PORTDOCS%%%%DOCSDIR%%/liblouisxml-guide.html
-%%PORTDOCS%%%%DOCSDIR%%/liblouisxml-guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/copyright-notice
-%%PORTDOCS%%%%DOCSDIR%%/example_canonical.cfg
-%%PORTDOCS%%%%DOCSDIR%%/example_default.cfg
-%%PORTDOCS%%%%DOCSDIR%%/example_html.sem
-%%PORTDOCS%%%%DOCSDIR%%/example_math.sem
+%%PORTDOCS%%%%DOCSDIR%%/liblouisxml.html
+%%PORTDOCS%%%%DOCSDIR%%/liblouisxml.txt
 @dirrm include/liblouisxml
 @dirrm %%DATADIR%%/lbx_files
 @dirrm %%DATADIR%%