3 files changed, 25 insertions, 22 deletions

diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 9d3c940ea919..9bb77ef675e9 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -7,22 +7,25 @@
 #
 
 PORTNAME=	libparsifal
-PORTVERSION=	0.9.3
+PORTVERSION=	1.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.saunalahti.fi/~samiuus/toni/xmlproc/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight XML Parser
 
+USE_ICONV=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's| -O3||g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|g' ${WRKSRC}/configure
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/textproc/libparsifal/distinfo b/textproc/libparsifal/distinfo
index 5d115ff004ea..efe3b76d4b88 100644
--- a/textproc/libparsifal/distinfo
+++ b/textproc/libparsifal/distinfo
@@ -1,2 +1,2 @@
-MD5 (libparsifal-0.9.3.tar.gz) = 3fa2b785ab38af64e0dae93087c388d9
-SIZE (libparsifal-0.9.3.tar.gz) = 659075
+MD5 (libparsifal-1.0.0.tar.gz) = 04b9d4e894db07bfa37147dc30e9fb49
+SIZE (libparsifal-1.0.0.tar.gz) = 762920
diff --git a/textproc/libparsifal/pkg-plist b/textproc/libparsifal/pkg-plist
index 4782f38d5573..61b81a160faf 100644
--- a/textproc/libparsifal/pkg-plist
+++ b/textproc/libparsifal/pkg-plist
@@ -11,24 +11,7 @@ include/libparsifal/xmlvect.h
 lib/libparsifal-%%VERSION%%.so
 lib/libparsifal.a
 lib/libparsifal.so
-@dirrm include/libparsifal
 %%PORTDOCS%%%%DOCSDIR%%/conformance.html
-%%PORTDOCS%%%%DOCSDIR%%/cvs.html
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/elsewhere.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/links.html
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/news.html
-%%PORTDOCS%%%%DOCSDIR%%/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/parsifal_results.html
-%%PORTDOCS%%%%DOCSDIR%%/parsifal_results_valid.html
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/toc.html
-%%PORTDOCS%%%%DOCSDIR%%/xmlconf_results.html
-%%PORTDOCS%%%%DOCSDIR%%/xmlconf_results_valid.html
-%%PORTDOCS%%%%DOCSDIR%%/xmlplint.html
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/canonxml_c.html
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/datatype_c.html
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/dtddecl_c.html
@@ -43,11 +26,28 @@ lib/libparsifal.so
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/zenstory_c.html
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/zenstory_h.html
 %%PORTDOCS%%%%DOCSDIR%%/csrchtml/zenvalid_c.html
+%%PORTDOCS%%%%DOCSDIR%%/cvs.html
+%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/elsewhere.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/links.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/news.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/parsifal_results.html
+%%PORTDOCS%%%%DOCSDIR%%/parsifal_results_valid.html
 %%PORTDOCS%%%%DOCSDIR%%/pics/backg.gif
 %%PORTDOCS%%%%DOCSDIR%%/pics/semail.gif
 %%PORTDOCS%%%%DOCSDIR%%/pics/testsuite.gif
 %%PORTDOCS%%%%DOCSDIR%%/pics/uetool1.gif
 %%PORTDOCS%%%%DOCSDIR%%/pics/uevalid1.gif
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlconf_results.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlconf_results_valid.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlplint.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pics
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/csrchtml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/libparsifal