From owner-svn-ports-head@FreeBSD.ORG  Wed Feb  5 21:22:13 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTPS id 1612C1AA;
 Wed,  5 Feb 2014 21:22:13 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 005301B37;
 Wed,  5 Feb 2014 21:22:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15LMCP6051539;
 Wed, 5 Feb 2014 21:22:12 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15LMCA7051538;
 Wed, 5 Feb 2014 21:22:12 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201402052122.s15LMCA7051538@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Wed, 5 Feb 2014 21:22:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342859 - head/graphics/libgphoto2
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.17
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: Wed, 05 Feb 2014 21:22:13 -0000

Author: marino
Date: Wed Feb  5 21:22:12 2014
New Revision: 342859
URL: http://svnweb.freebsd.org/changeset/ports/342859
QAT: https://qat.redports.org/buildarchive/r342859/

Log:
  graphics/libgphoto2: Reduce inclusions, qualify OSVERSION

Modified:
  head/graphics/libgphoto2/Makefile

Modified: head/graphics/libgphoto2/Makefile
==============================================================================
--- head/graphics/libgphoto2/Makefile	Wed Feb  5 21:18:20 2014	(r342858)
+++ head/graphics/libgphoto2/Makefile	Wed Feb  5 21:22:12 2014	(r342859)
@@ -48,9 +48,8 @@ XML_LDFLAGS=		$$(pkg-config --libs-only-
 XML_CONFIGURE_WITH=	libxml2
 
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 1000040
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000040
 CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 .endif
 
@@ -72,4 +71,4 @@ post-patch:
 		'/^SUBDIRS/s|linux-hotplug||' \
 		${WRKSRC}/packaging/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>