From 547f29c3e28f9cc531be528d15376a4e2f4d304d Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 28 Aug 2012 18:42:30 +0000 Subject: [PATCH] Correct the configure patch to patch the correct location so that the bindtextdomain() check finds libintl as expected and remove the LDFLAGS hack because the patch was not patching the correct location. from Brad --- net/neon/Makefile | 8 ++++---- net/neon/patches/patch-configure | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/neon/Makefile b/net/neon/Makefile index fbf156419e9..ca2faa22ce6 100644 --- a/net/neon/Makefile +++ b/net/neon/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.30 2012/06/27 12:10:19 jasper Exp $ +# $OpenBSD: Makefile,v 1.31 2012/08/28 18:42:30 ajacoutot Exp $ COMMENT= HTTP and WebDAV client library, with C interface DISTNAME= neon-0.29.6 -REVISION= 1 +REVISION= 2 SHARED_LIBS= neon 28.0 # 29.6 CATEGORIES= net www devel @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += asn1 crypto expat gssapi krb5 m proxy ssl stdc++ z +WANTLIB += asn1 crypto expat gssapi krb5 m proxy pthread ssl stdc++ z MASTER_SITES= ${HOMEPAGE} @@ -27,7 +27,7 @@ LIB_DEPENDS = net/libproxy CONFIGURE_STYLE= gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" \ + LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_path_CERTUTIL="" \ ac_cv_path_PK12UTIL="" diff --git a/net/neon/patches/patch-configure b/net/neon/patches/patch-configure index 71d0f8efa5d..d8dff803cf7 100644 --- a/net/neon/patches/patch-configure +++ b/net/neon/patches/patch-configure @@ -1,7 +1,7 @@ ---- configure.orig Tue May 3 14:25:31 2011 -+++ configure Sat Jun 16 10:56:29 2012 -@@ -5469,7 +5469,7 @@ for lib in socket inet ws2_32 network; do - *) ne__code="socket();" ;; +--- configure.orig Tue May 3 08:25:31 2011 ++++ configure Tue Aug 28 13:53:10 2012 +@@ -14967,7 +14967,7 @@ for lib in intl; do + *) ne__code="bindtextdomain();" ;; esac - LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS"