From owner-svn-ports-all@FreeBSD.ORG  Tue Feb 19 21:54:08 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id ACF2898E;
 Tue, 19 Feb 2013 21:54:08 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 892949DD;
 Tue, 19 Feb 2013 21:54:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JLs8Fv002714;
 Tue, 19 Feb 2013 21:54:08 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JLs87T002713;
 Tue, 19 Feb 2013 21:54:08 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201302192154.r1JLs87T002713@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 19 Feb 2013 21:54:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312605 - head/devel/apr1
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.14
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: Tue, 19 Feb 2013 21:54:08 -0000

Author: ohauer
Date: Tue Feb 19 21:54:07 2013
New Revision: 312605
URL: http://svnweb.freebsd.org/changeset/ports/312605

Log:
  - Revert PTHREAD cleanup, else apr-1-config returns wrong values
    even if build with explicit LDFLAGS set.
  
  Noted on the apache@ list by Geoff Speicher
  http://lists.freebsd.org/pipermail/freebsd-apache/2013-February/003044.html

Modified:
  head/devel/apr1/Makefile

Modified: head/devel/apr1/Makefile
==============================================================================
--- head/devel/apr1/Makefile	Tue Feb 19 21:22:28 2013	(r312604)
+++ head/devel/apr1/Makefile	Tue Feb 19 21:54:07 2013	(r312605)
@@ -203,6 +203,10 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' \
 		${APR_WRKDIR}/build/gen-build.py
 	${REINPLACE_CMD} -e 's/void main/int main/' ${APR_WRKDIR}/build/apr_network.m4
+# Fix pthread: Please do not remove, else apr-1-config returns wrong values
+	${REINPLACE_CMD} -e 's/-lpthread/-pthread/g' \
+		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
+		${APU_WRKDIR}/build/apu-conf.m4
 
 run-autotools::
 	cd ${APR_WRKDIR} ; \