From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 25 18:55:02 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4D2B8C30;
 Thu, 25 Jul 2013 18:55:02 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A73229C8;
 Thu, 25 Jul 2013 18:55:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6PIt2E1050347;
 Thu, 25 Jul 2013 18:55:02 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6PIt2hn050346;
 Thu, 25 Jul 2013 18:55:02 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201307251855.r6PIt2hn050346@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Thu, 25 Jul 2013 18:55:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323662 - in head/graphics/libgphoto2: . 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-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: Thu, 25 Jul 2013 18:55:02 -0000

Author: kwm
Date: Thu Jul 25 18:55:01 2013
New Revision: 323662
URL: http://svnweb.freebsd.org/changeset/ports/323662

Log:
  Unbreak after base rev 253637
  While here remove unused patch
  
  PR:             ports/180825
  Submitted by:   rpaulo@

Deleted:
  head/graphics/libgphoto2/files/extra-patch-usb20
Modified:
  head/graphics/libgphoto2/Makefile

Modified: head/graphics/libgphoto2/Makefile
==============================================================================
--- head/graphics/libgphoto2/Makefile	Thu Jul 25 18:53:30 2013	(r323661)
+++ head/graphics/libgphoto2/Makefile	Thu Jul 25 18:55:01 2013	(r323662)
@@ -22,9 +22,7 @@ USE_AUTOTOOLS=	libtool libltdl
 LIBTOOLFILES=	configure libgphoto2_port/configure
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
-		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
-		LIBUSB_CFLAGS="-I/usr/include" \
-		LIBUSB_LIBS="-lusb"
+		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 
 PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 
@@ -32,6 +30,14 @@ MAN3=		libgphoto2.3 libgphoto2_port.3
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 1000040
+CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" \
+		LIBUSB_LIBS="-lusb"
+.else
+# Safe because it's never used
+CFLAGS+=	-DENODATA=0
+.endif
+
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""