Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Jul 2014 18:52:25 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360647 - head/textproc/freexl
Message-ID:  <201407041852.s64IqPlU015374@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407041852.s64IqPlU015374>