From owner-svn-ports-head@FreeBSD.ORG  Mon Sep  3 17:12:52 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D3C7106564A;
	Mon,  3 Sep 2012 17:12:52 +0000 (UTC)
	(envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 47C388FC17;
	Mon,  3 Sep 2012 17:12:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q83HCqJw016765;
	Mon, 3 Sep 2012 17:12:52 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q83HCqZg016763;
	Mon, 3 Sep 2012 17:12:52 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201209031712.q83HCqZg016763@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 3 Sep 2012 17:12:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303606 - head/astro/gpsd
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Sep 2012 17:12:52 -0000

Author: amdmi3
Date: Mon Sep  3 17:12:51 2012
New Revision: 303606
URL: http://svn.freebsd.org/changeset/ports/303606

Log:
  - Fix linking with pthreads
  - While here, add IGNORE for specific illegal options combination
  
  PR:		ports/170510
  Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>
  Approved by:	glebius (maintainer)

Modified:
  head/astro/gpsd/Makefile

Modified: head/astro/gpsd/Makefile
==============================================================================
--- head/astro/gpsd/Makefile	Mon Sep  3 16:30:17 2012	(r303605)
+++ head/astro/gpsd/Makefile	Mon Sep  3 17:12:51 2012	(r303606)
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpsd
 PORTVERSION=	3.6
+PORTREVISION=	1
 CATEGORIES=	astro geography
 MASTER_SITES=	SAVANNAH
 
@@ -191,6 +192,10 @@ SCONS_ARGS+=	ntpshm=no
 
 .if defined(WITHOUT_PPS)
 SCONS_ARGS+=	pps=no
+.else
+.	if defined(WITHOUT_NTPSHM)
+IGNORE=		PPS requires NTPSHM
+.	endif
 .endif
 
 .if defined(WITH_PPSONCTS)
@@ -268,6 +273,9 @@ PLIST_SUB+=	CURSES=""
 SCONS_ARGS+=	profiling=yes
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Qgpsmm.pc.in
+
 # generates .py[co] files for installed modules
 # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
 # with these files when module is imported from root user