From 50232f1030decc7d17ac9fb180ff9e9667027edd Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 20 Oct 2007 13:05:35 +0000
Subject: [PATCH] fix build: - explicitly choose the xml library you want. -
 give enough details so that libintl is found, *even if xml2 is not used*.

No package change.
---
 net/neon/Makefile                |  9 +++++++--
 net/neon/patches/patch-configure | 12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 net/neon/patches/patch-configure

diff --git a/net/neon/Makefile b/net/neon/Makefile
index fb6ca21508b..42af19e1f7d 100644
--- a/net/neon/Makefile
+++ b/net/neon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2007/09/15 22:36:55 merdely Exp $
+# $OpenBSD: Makefile,v 1.20 2007/10/20 13:05:35 espie Exp $
 
 COMMENT=		HTTP and WebDAV client library, with C interface
 
@@ -24,7 +24,12 @@ MODULES=		devel/gettext
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} --with-ssl --with-xml2 --enable-nls
+CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
+			LDFLAGS=-L${LOCALBASE}/lib
+
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
+			--with-ssl --enable-nls \
+			--with-xml2 --without-expat
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/neon/macros
diff --git a/net/neon/patches/patch-configure b/net/neon/patches/patch-configure
new file mode 100644
index 00000000000..8fd6796e34f
--- /dev/null
+++ b/net/neon/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.3 2007/10/20 13:05:35 espie Exp $
+--- configure.orig	Sat Oct 20 14:57:47 2007
++++ configure	Sat Oct 20 14:58:26 2007
+@@ -30308,7 +30308,7 @@ for lib in intl; do
+     *) ne__code="bindtextdomain();" ;;
+     esac
+ 
+-    LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS"
++    LIBS="$ne_sl_save_LIBS -l$lib -liconv $NEON_LIBS"
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF