From owner-svn-ports-all@FreeBSD.ORG  Wed Jul 10 05:21:51 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D30F19DC;
 Wed, 10 Jul 2013 05:21:51 +0000 (UTC)
 (envelope-from danfe@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 C440C1377;
 Wed, 10 Jul 2013 05:21:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6A5Lpt3097093;
 Wed, 10 Jul 2013 05:21:51 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6A5LpqQ097092;
 Wed, 10 Jul 2013 05:21:51 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307100521.r6A5LpqQ097092@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 10 Jul 2013 05:21:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322615 - head/graphics/gphoto2
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: Wed, 10 Jul 2013 05:21:51 -0000

Author: danfe
Date: Wed Jul 10 05:21:51 2013
New Revision: 322615
URL: http://svnweb.freebsd.org/changeset/ports/322615

Log:
  - Fix a stupid typo: AALIB_CONFIGURE_s/ARGS/OFF/
  - Remove pthread-related hacks: everything works fine without them

Modified:
  head/graphics/gphoto2/Makefile

Modified: head/graphics/gphoto2/Makefile
==============================================================================
--- head/graphics/gphoto2/Makefile	Wed Jul 10 05:17:43 2013	(r322614)
+++ head/graphics/gphoto2/Makefile	Wed Jul 10 05:21:51 2013	(r322615)
@@ -19,10 +19,6 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-cdk
 
-# XXX: do we still need to pass PTHREAD_* stuff here?
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
 MAN1=		${PORTNAME}.1
 
 OPTIONS_DEFINE=	AALIB DOCS NLS
@@ -32,17 +28,13 @@ OPTIONS_SUB=	yes
 AALIB_DESC=	Text mode capture preview support
 
 AALIB_LIB_DEPENDS=	aa:${PORTSDIR}/graphics/aalib
-AALIB_CONFIGURE_ARGS=	--without-aalib
+AALIB_CONFIGURE_OFF=	--without-aalib
 
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 .include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREADS_LIBS:S/"//g}|g ; \
-		s|-g -Wall||g' ${WRKSRC}/configure
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}