From 819035efaf5b136338bb0ce4b61b40155346c891 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Fri, 4 Jul 2014 18:52:25 +0000
Subject: [PATCH] - Convert to USES=libtool pathfix - Use CPPFLAGS/LIBS instead
 of CFLAGS/LDFLAGS - Don't use locale_charset on FreeBSD 10 with
 converters/libiconv installed,   always use nl_langinfo from libc instead

---
 textproc/freexl/Makefile  | 14 +++++---------
 textproc/freexl/pkg-plist |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile
index 30780042b8fe..8b533a5b7387 100644
--- a/textproc/freexl/Makefile
+++ b/textproc/freexl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freexl
 DISTVERSION=	1.0.0g
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/freexl-sources/
 
@@ -10,15 +11,10 @@ MAINTAINER=	coder@tuxfamily.org
 COMMENT=	Library to extract valid data from within an Excel (.xls) spreadsheet
 
 GNU_CONFIGURE=	yes
-USES=		iconv gmake
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
-CONFIGURE_ARGS+=CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	ac_cv_search_locale_charset=no
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake iconv libtool pathfix
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/textproc/freexl/pkg-plist b/textproc/freexl/pkg-plist
index bf8bc0c3f923..190452fd26bc 100644
--- a/textproc/freexl/pkg-plist
+++ b/textproc/freexl/pkg-plist
@@ -1,6 +1,6 @@
 include/freexl.h
 lib/libfreexl.a
-lib/libfreexl.la
 lib/libfreexl.so
 lib/libfreexl.so.1
+lib/libfreexl.so.1.0.0
 libdata/pkgconfig/freexl.pc