From owner-svn-ports-head@FreeBSD.ORG  Thu May  8 14:32:47 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A4F099B8;
 Thu,  8 May 2014 14:32:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 78973857;
 Thu,  8 May 2014 14:32:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s48EWlks047290;
 Thu, 8 May 2014 14:32:47 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s48EWlJS047288;
 Thu, 8 May 2014 14:32:47 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201405081432.s48EWlJS047288@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 8 May 2014 14:32:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353307 - in head/graphics/gphoto2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Thu, 08 May 2014 14:32:47 -0000

Author: amdmi3
Date: Thu May  8 14:32:46 2014
New Revision: 353307
URL: http://svnweb.freebsd.org/changeset/ports/353307
QAT: https://qat.redports.org/buildarchive/r353307/

Log:
  - Convert USE_BZIP2 to USES
  - Fix NLS support

Added:
  head/graphics/gphoto2/files/
  head/graphics/gphoto2/files/patch-configure   (contents, props changed)
Modified:
  head/graphics/gphoto2/Makefile

Modified: head/graphics/gphoto2/Makefile
==============================================================================
--- head/graphics/gphoto2/Makefile	Thu May  8 14:28:43 2014	(r353306)
+++ head/graphics/gphoto2/Makefile	Thu May  8 14:32:46 2014	(r353307)
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 
-USE_BZIP2=	yes
-USES=		gmake pkgconfig
+USES=		tar:bzip2 gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	POPT_CFLAGS="$$(pkg-config --cflags popt)" \
 		POPT_LIBS="$$(pkg-config --libs popt)"
@@ -30,14 +29,15 @@ AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/
 AALIB_CONFIGURE_WITH=	aalib
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
+NLS_CPPFLAGS=		-I${LOCALBASE}/include
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
+NLS_CONFIGURE_ENV=	LIBS="-lintl"
 READLINE_USES=		readline
 READLINE_CONFIGURE_WITH=	readline
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|-lpthread|-pthread|' \
+		's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/configure
 
 post-install:

Added: head/graphics/gphoto2/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gphoto2/files/patch-configure	Thu May  8 14:32:46 2014	(r353307)
@@ -0,0 +1,17 @@
+--- configure.orig	2014-05-08 17:21:32.000000000 +0400
++++ configure	2014-05-08 17:23:08.000000000 +0400
+@@ -12988,13 +12988,11 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("");
+   ;
+   return 0;
+ }