Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Sep 2012 14:31:54 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305080 - in head/textproc/libxml2: . files
Message-ID:  <201209301431.q8UEVsZQ046818@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sun Sep 30 14:31:53 2012
New Revision: 305080
URL: http://svn.freebsd.org/changeset/ports/305080

Log:
  - Revert previous change to add -pthread since libxml2 is not threaded, but is
    thread-safe, so -pthread is not needed here, but in threaded programs that
    use libxml2
  
  Pointed out by:	ale@
  Discussed with:	marcus, kwm
  Pointyhat to:	swills

Deleted:
  head/textproc/libxml2/files/extra-patch-threads
Modified:
  head/textproc/libxml2/Makefile

Modified: head/textproc/libxml2/Makefile
==============================================================================
--- head/textproc/libxml2/Makefile	Sun Sep 30 14:22:58 2012	(r305079)
+++ head/textproc/libxml2/Makefile	Sun Sep 30 14:31:53 2012	(r305080)
@@ -13,7 +13,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.7.8
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://gd.tuwien.ac.at/pub/libxml/ \
 		ftp://xmlsoft.org/libxml2/
@@ -54,11 +54,6 @@ CONFIGURE_ARGS+=	--without-schemas
 
 .if defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--without-threads
-.else
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-threads
 .endif
 
 .if defined(WITH_MEM_DEBUG)
@@ -74,10 +69,6 @@ CONFIGURE_ARGS+=	--with-thread-alloc
 .endif
 
 post-patch:
-.if !defined(WITHOUT_THREADS)
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-		${WRKSRC}/xml2-config.in
-.endif
 .for d in . doc doc/devhelp doc/examples
 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
 		${WRKSRC}/${d}/Makefile.in



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