From owner-svn-ports-head@FreeBSD.ORG  Fri May  3 21:15:44 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])
 by hub.freebsd.org (Postfix) with ESMTP id 841C7A84;
 Fri,  3 May 2013 21:15:44 +0000 (UTC)
 (envelope-from bapt@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 75DB5154F;
 Fri,  3 May 2013 21:15:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r43LFimL041361;
 Fri, 3 May 2013 21:15:44 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r43LFiEZ041360;
 Fri, 3 May 2013 21:15:44 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201305032115.r43LFiEZ041360@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 3 May 2013 21:15:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317259 - head/net-p2p/mktorrent
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: Fri, 03 May 2013 21:15:44 -0000

Author: bapt
Date: Fri May  3 21:15:43 2013
New Revision: 317259
URL: http://svnweb.freebsd.org/changeset/ports/317259

Log:
  Fix build with bmake
  While here convert to new options framework

Modified:
  head/net-p2p/mktorrent/Makefile

Modified: head/net-p2p/mktorrent/Makefile
==============================================================================
--- head/net-p2p/mktorrent/Makefile	Fri May  3 21:09:22 2013	(r317258)
+++ head/net-p2p/mktorrent/Makefile	Fri May  3 21:15:43 2013	(r317259)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mktorrent
-# Date created:		9 May 2010
-# Whom:			Damian Gerow <dgerow@afflictions.org>
-#
+# Created by: Damian Gerow <dgerow@afflictions.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mktorrent
 PORTVERSION=	1.0
@@ -11,29 +7,35 @@ CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
 MAINTAINER=	dgerow@afflictions.org
-COMMENT=	A command-line utility for creating BitTorrent metainfo files
+COMMENT=	Command-line utility for creating BitTorrent metainfo files
 
+.if defined(.PARSEDIR)
+USE_GMAKE=	yes
+.else
 MAKEFILE=	BSDmakefile
+.endif
 MAKE_FLAGS=	USE_LONG_OPTIONS=1
 
 PLIST_FILES=	bin/mktorrent
 
-OPTIONS=	THREADS		"Enable support for pthreads"		on \
-		OPENSSL		"Use OpenSSL for hashing"		on \
-		HASHCHECK	"Verify file hashes" 			on
+OPTIONS_DEFINE=	THREADS OPENSSL HASHCHECK
+OPTIONS_DEFAULT=	THREADS OPENSSL HASHCHECK
+THREADS_DESC=	Enable support for pthreads
+OPENSSL_DESC=	Use OpenSSL for hashing
+HASHCHECK_DESC=	Verify file hashes
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 MAKE_FLAGS+=	USE_PTHREADS=1
 .endif
 
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 MAKE_FLAGS+=	USE_OPENSSL=1
 USE_OPENSSL=	yes
 .endif
 
-.if defined(WITHOUT_HASHCHECK)
+.if ! ${PORT_OPTIONS:MHASHCHECK}
 MAKE_FLAGS+=	NO_HASH_CHECK=1
 .endif