From owner-svn-ports-all@FreeBSD.ORG  Fri Jul  4 18:52:25 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E3DAC4E5;
 Fri,  4 Jul 2014 18:52:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D13482765;
 Fri,  4 Jul 2014 18:52:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64IqPQs015376;
 Fri, 4 Jul 2014 18:52:25 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64IqPlU015374;
 Fri, 4 Jul 2014 18:52:25 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201407041852.s64IqPlU015374@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Fri, 4 Jul 2014 18:52:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360647 - head/textproc/freexl
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jul 2014 18:52:26 -0000

Author: tijl
Date: Fri Jul  4 18:52:25 2014
New Revision: 360647
URL: http://svnweb.freebsd.org/changeset/ports/360647
QAT: https://qat.redports.org/buildarchive/r360647/

Log:
  - 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

Modified:
  head/textproc/freexl/Makefile
  head/textproc/freexl/pkg-plist

Modified: head/textproc/freexl/Makefile
==============================================================================
--- head/textproc/freexl/Makefile	Fri Jul  4 18:49:02 2014	(r360646)
+++ head/textproc/freexl/Makefile	Fri Jul  4 18:52:25 2014	(r360647)
@@ -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>

Modified: head/textproc/freexl/pkg-plist
==============================================================================
--- head/textproc/freexl/pkg-plist	Fri Jul  4 18:49:02 2014	(r360646)
+++ head/textproc/freexl/pkg-plist	Fri Jul  4 18:52:25 2014	(r360647)
@@ -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