Attachment #112639 for bug #154072

View | Details | Raw Unified | Return to bug 154072
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= xmlstarlet	9	PORTNAME= xmlstarlet
10	PORTVERSION= 1.0.3	10	PORTVERSION= 1.0.4
11	CATEGORIES= textproc	11	CATEGORIES= textproc
12	MASTER_SITES= SF/xmlstar/${PORTNAME}/${PORTVERSION}	12	MASTER_SITES= SF/xmlstar/${PORTNAME}/${PORTVERSION}
13		13

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xmlstarlet-1.0.3.tar.gz) = a080bfb178671c6fc68ef25d797e9d21bcfd20fb4e0bcff46f4f1b4e6207f673	1	SHA256 (xmlstarlet-1.0.4.tar.gz) = d9303b59973cb4a7f0df99beac55bf15ee4547fb270161491d8a652b86fe470a
2	SIZE (xmlstarlet-1.0.3.tar.gz) = 379746	2	SIZE (xmlstarlet-1.0.4.tar.gz) = 376406




--- configure.orig	2011-01-16 14:17:40.000000000 -0500
+++ configure	2011-01-16 23:54:22.378194269 -0500
@@ -4231,13 +4231,13 @@
 : ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}
 
 if test "x$STATIC_LIBS" != xno; then :
-  LIBXML_CPPFLAGS="-I$LIBXML_INCDIR -DLIBXML_STATIC"
+  LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
 else
   LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
 fi
-LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"
-LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"
+LIBXML_LIBS="`pkg-config --libs libxml-2.0` -pthread"
+LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
 
 
 
 if test "x$STATIC_LIBS" != xno; then :
-  LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"
+  LIBXML_LIBS="`pkg-config --libs libxml-2.0` -pthread"
 else
   LIBXML_LIBS="-lxml2"
 fi
@@ -4369,12 +4369,12 @@
   LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"
        LIBXSLT_LDFLAGS="-L$LIBXSLT_SRCDIR/libexslt/.libs -L$LIBXSLT_SRCDIR/libxslt/.libs"
        if test "x$STATIC_LIBS" != xno; then :
-  LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"
+  LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
 fi
 else
   LIBXSLT_LDFLAGS="-L$LIBXSLT_LIBDIR"
       if test "x$STATIC_LIBS" != xno; then :
-  LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"
+  LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
 fi
 fi


Return to bug 154072

Lines 1-25 Link Here

(-)files/patch-configure (-17 / +25 lines)
1	--- configure.orig 2010-11-19 02:01:45.000000000 +0900	1	--- configure.orig 2011-01-16 14:17:40.000000000 -0500
2	+++ configure 2011-01-04 17:39:35.000000000 +0900	2	+++ configure 2011-01-16 23:54:22.378194269 -0500
3	@@ -4123,8 +4123,8 @@	3	@@ -4231,13 +4231,13 @@
		4	: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}
		5
		6	if test "x$STATIC_LIBS" != xno; then :
		7	- LIBXML_CPPFLAGS="-I$LIBXML_INCDIR -DLIBXML_STATIC"
		8	+ LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
4	else	9	else
5	: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}	10	LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
6	fi	11	fi
7	-LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"
8	-LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"
9	+LIBXML_LIBS="`pkg-config --libs libxml-2.0` -pthread"
10	+LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
11
12
13		12
14	@@ -4249,9 +4249,9 @@	13	if test "x$STATIC_LIBS" != xno; then :
15	: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}	14	- LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"
16	if test "x$LIBXSLT_SRCDIR" != x; then :	15	+ LIBXML_LIBS="`pkg-config --libs libxml-2.0` -pthread"
		16	else
		17	LIBXML_LIBS="-lxml2"
		18	fi
		19	@@ -4369,12 +4369,12 @@
17	LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"	20	LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"
18	- LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"	21	LIBXSLT_LDFLAGS="-L$LIBXSLT_SRCDIR/libexslt/.libs -L$LIBXSLT_SRCDIR/libxslt/.libs"
19	+ LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"	22	if test "x$STATIC_LIBS" != xno; then :
		23	- LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"
		24	+ LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
		25	fi
20	else	26	else
		27	LIBXSLT_LDFLAGS="-L$LIBXSLT_LIBDIR"
		28	if test "x$STATIC_LIBS" != xno; then :
21	- LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"	29	- LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"
22	+ LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"	30	+ LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
23	fi	31	fi
24	: ${LIBSLT_INCDIR="$LIBXSLT_PREFIX/include"}	32	fi
25	LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"	33