From owner-svn-ports-head@FreeBSD.ORG  Wed Oct  9 23:52:22 2013
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 ESMTP id 84B5C75B;
 Wed,  9 Oct 2013 23:52:22 +0000 (UTC)
 (envelope-from madpilot@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 7202C2F67;
 Wed,  9 Oct 2013 23:52:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99NqMAB014887;
 Wed, 9 Oct 2013 23:52:22 GMT (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99NqMFY014886;
 Wed, 9 Oct 2013 23:52:22 GMT (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201310092352.r99NqMFY014886@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 9 Oct 2013 23:52:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329941 - head/audio/libmtp
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.14
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, 09 Oct 2013 23:52:22 -0000

Author: madpilot
Date: Wed Oct  9 23:52:21 2013
New Revision: 329941
URL: http://svnweb.freebsd.org/changeset/ports/329941

Log:
  - Convert to staging
  - Use option helpers

Modified:
  head/audio/libmtp/Makefile

Modified: head/audio/libmtp/Makefile
==============================================================================
--- head/audio/libmtp/Makefile	Wed Oct  9 23:51:05 2013	(r329940)
+++ head/audio/libmtp/Makefile	Wed Oct  9 23:52:21 2013	(r329941)
@@ -17,25 +17,17 @@ OPTIONS_DEFAULT=	MTPZ
 MTPZ_DESC=	Enable functionality to connect to MTPZ devices
 
 USES=		pathfix pkgconfig iconv
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMTPZ}
-LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
-.else
-CONFIGURE_ARGS+=--disable-mtpz
-.endif
-
-.include <bsd.port.pre.mk>
-
 CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" LIBUSB_LIBS="-lusb" LIBS="-lusb"
 
+MTPZ_CONFIGURE_ENABLE=	mtpz
+MTPZ_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
@@ -48,4 +40,4 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|__builtin_bswap|bswap|g' ${WRKSRC}/src/mtpz.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>