Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Apr 2013 22:40:33 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r316079 - in head/textproc/libxml2: . files
Message-ID:  <201304182240.r3IMeXc0036543@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Apr 18 22:40:33 2013
New Revision: 316079
URL: http://svnweb.freebsd.org/changeset/ports/316079

Log:
  Fix build with LZMA.  All supported versions have liblzma in the base.
  
  Approved by:	gnome (mezz)
  Feature safe:	yes

Added:
  head/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in   (contents, props changed)
  head/textproc/libxml2/files/patch-libxml-2.0.pc.in   (contents, props changed)
Modified:
  head/textproc/libxml2/Makefile

Modified: head/textproc/libxml2/Makefile
==============================================================================
--- head/textproc/libxml2/Makefile	Thu Apr 18 22:20:09 2013	(r316078)
+++ head/textproc/libxml2/Makefile	Thu Apr 18 22:40:33 2013	(r316079)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.8.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/ \
@@ -27,9 +27,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
+		--with-lzma=/usr \
 		--without-python
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(MASTERDIR)
 MAN1=		xml2-config.1 xmllint.1 xmlcatalog.1

Added: head/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in	Thu Apr 18 22:40:33 2013	(r316079)
@@ -0,0 +1,9 @@
+--- libxml-2.0-uninstalled.pc.in.orig	2009-07-30 11:24:34.000000000 -0400
++++ libxml-2.0-uninstalled.pc.in	2013-04-09 15:37:18.000000000 -0400
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
++Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@

Added: head/textproc/libxml2/files/patch-libxml-2.0.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libxml2/files/patch-libxml-2.0.pc.in	Thu Apr 18 22:40:33 2013	(r316079)
@@ -0,0 +1,9 @@
+--- libxml-2.0.pc.in.orig	2010-05-14 11:26:41.000000000 -0400
++++ libxml-2.0.pc.in	2013-04-09 15:35:53.000000000 -0400
+@@ -9,5 +9,5 @@
+ Description: libXML library version2.
+ Requires:
+ Libs: -L${libdir} -lxml2
+-Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
++Libs.private: @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
+ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@



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